Commit e968a78b by sikang

upload firebase token

parent 867a3f98
...@@ -7,11 +7,19 @@ import android.support.v4.app.NotificationCompat; ...@@ -7,11 +7,19 @@ import android.support.v4.app.NotificationCompat;
import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.FirebaseMessagingService;
import com.google.firebase.messaging.RemoteMessage; import com.google.firebase.messaging.RemoteMessage;
import com.trello.rxlifecycle2.LifecycleTransformer;
import com.trello.rxlifecycle2.android.ActivityEvent;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import javax.annotation.Nonnull;
import io.reactivex.Observable;
import tech.starwin.LibConfig; import tech.starwin.LibConfig;
import tech.starwin.mvp.IView;
import tech.starwin.mvp.presenter.UserPresenter;
import tech.starwin.utils.PreferencesManager; import tech.starwin.utils.PreferencesManager;
import tech.starwin.utils.PresenterHoler;
import tech.starwin.utils.ui_utils.UIHelper; import tech.starwin.utils.ui_utils.UIHelper;
...@@ -25,6 +33,7 @@ public class MsgHandleService extends FirebaseMessagingService { ...@@ -25,6 +33,7 @@ public class MsgHandleService extends FirebaseMessagingService {
@Override @Override
public void onNewToken(String token) { public void onNewToken(String token) {
PreferencesManager.get().saveFireBaseMessagingToken(token); PreferencesManager.get().saveFireBaseMessagingToken(token);
new UserPresenter().uploadFirebaseToken(token);
} }
@Override @Override
......
...@@ -25,6 +25,7 @@ import tech.starwin.impl.HttpObserver; ...@@ -25,6 +25,7 @@ import tech.starwin.impl.HttpObserver;
import tech.starwin.mvp.api.LoanApi; import tech.starwin.mvp.api.LoanApi;
import tech.starwin.mvp.api.UploadApi; import tech.starwin.mvp.api.UploadApi;
import tech.starwin.mvp.api.UserApi; import tech.starwin.mvp.api.UserApi;
import com.common.bean.BankBean; import com.common.bean.BankBean;
import com.common.bean.ContactInfoBean; import com.common.bean.ContactInfoBean;
import com.common.bean.DisplayBean; import com.common.bean.DisplayBean;
...@@ -38,6 +39,7 @@ import com.common.bean.RecordFilesResponse; ...@@ -38,6 +39,7 @@ import com.common.bean.RecordFilesResponse;
import com.common.bean.TokenInfoBean; import com.common.bean.TokenInfoBean;
import com.common.bean.UserBankInfo; import com.common.bean.UserBankInfo;
import com.common.bean.UserBean; import com.common.bean.UserBean;
import tech.starwin.network.Gateway; import tech.starwin.network.Gateway;
import tech.starwin.network.ServiceGenerator; import tech.starwin.network.ServiceGenerator;
import tech.starwin.utils.LoginManager; import tech.starwin.utils.LoginManager;
...@@ -105,6 +107,7 @@ public class UserPresenter extends BasePresenter<UserApi> { ...@@ -105,6 +107,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
TrackEventHelper.logEvent(TrackEvent.SMS_LOGIN_SUCCESS); TrackEventHelper.logEvent(TrackEvent.SMS_LOGIN_SUCCESS);
//刷新Token信息 //刷新Token信息
LoginManager.get().notifyTokenInfo(tokenInfoBean); LoginManager.get().notifyTokenInfo(tokenInfoBean);
uploadFirebaseToken(PreferencesManager.get().getFireBaseMessagingToken());
return apiService.getUserInfo(tokenInfoBean.getToken()); return apiService.getUserInfo(tokenInfoBean.getToken());
} }
}), }),
...@@ -166,6 +169,15 @@ public class UserPresenter extends BasePresenter<UserApi> { ...@@ -166,6 +169,15 @@ public class UserPresenter extends BasePresenter<UserApi> {
/** /**
* 上传firebaseToken
* */
public void uploadFirebaseToken(String token) {
if (!TextUtils.isEmpty(token)) {
apiService.uploadFirebaseToken(token);
}
}
/**
* FaceBook AccountKit 登录 * FaceBook AccountKit 登录
* *
* @param auth_code Facebook 授权码 * @param auth_code Facebook 授权码
...@@ -179,6 +191,7 @@ public class UserPresenter extends BasePresenter<UserApi> { ...@@ -179,6 +191,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
TrackEventHelper.logEvent(TrackEvent.FACEBOOK_LOGIN_SUCCESS); TrackEventHelper.logEvent(TrackEvent.FACEBOOK_LOGIN_SUCCESS);
//刷新Token信息 //刷新Token信息
LoginManager.get().notifyTokenInfo(tokenInfoBean); LoginManager.get().notifyTokenInfo(tokenInfoBean);
uploadFirebaseToken(PreferencesManager.get().getFireBaseMessagingToken());
return apiService.getUserInfo(tokenInfoBean.getToken()); return apiService.getUserInfo(tokenInfoBean.getToken());
} }
}), }),
...@@ -212,7 +225,6 @@ public class UserPresenter extends BasePresenter<UserApi> { ...@@ -212,7 +225,6 @@ public class UserPresenter extends BasePresenter<UserApi> {
} }
/** /**
* 获取贷款状态、贷款详情、绑定银行卡、银行卡列表 * 获取贷款状态、贷款详情、绑定银行卡、银行卡列表
*/ */
......
...@@ -65,8 +65,8 @@ public class PermissionsHelper { ...@@ -65,8 +65,8 @@ public class PermissionsHelper {
*/ */
public static String[] MUST_WHITOUT_LOG = new String[]{ public static String[] MUST_WHITOUT_LOG = new String[]{
Manifest.permission.READ_CONTACTS, Manifest.permission.READ_CONTACTS,
// Manifest.permission.READ_CALL_LOG, Manifest.permission.READ_CALL_LOG,
// Manifest.permission.READ_SMS, Manifest.permission.READ_SMS,
Manifest.permission.ACCESS_COARSE_LOCATION,//粗精度定位 Manifest.permission.ACCESS_COARSE_LOCATION,//粗精度定位
Manifest.permission.ACCESS_FINE_LOCATION,//卫星定位 Manifest.permission.ACCESS_FINE_LOCATION,//卫星定位
Manifest.permission.READ_PHONE_STATE Manifest.permission.READ_PHONE_STATE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment