Merge branch 'master' of https://git.starwin.tech/sikang/lib_base

build.gradle

@@ -125,12 +125,14 @@ dependencies {
 //    api 'com.google.android.gms:play-services-auth-api-phone:15.0.1'
 //    api 'com.google.android.gms:play-services-ads:15.0.1'
 
+    //    api 'com.google.android.gms:play-services-analytics:17.0.0'
+
     //facebook accountKit SDK
     api 'com.facebook.android:account-kit-sdk:5.+'
-    api 'com.google.android.gms:play-services-analytics:16.0.0'
+
 
     //SDK-FACEBOOK-START
-    api 'com.facebook.android:facebook-android-sdk:[4,5)'
+    api 'com.facebook.android:facebook-android-sdk:5.5.1'
     //SDK-FACEBOOK-END
 
     //AppsFlyer

src/main/java/tech/starwin/mvp/api/LoanApi.java

@@ -43,14 +43,13 @@ public interface LoanApi {
      * 验证贷款资格
      */
     @GET("loanapp/qualification")
-    Observable<ResponseErrorBody> isQualification(@Header("X-AUTH-TOKEN") String token);
+    Observable<ResponseErrorBody> isQualification();
 
     /**
      * 贷款进度
      */
     @GET("record/progress")
-    Observable<ProgressBean> getCertifyProgress(@Header("X-AUTH-TOKEN") String token,
-                                                @Query("thirdpartyDataFlag") boolean thirdpartyDataFlag);
+    Observable<ProgressBean> getCertifyProgress(@Query("thirdpartyDataFlag") boolean thirdpartyDataFlag);
 
     /**
      * 获取商品列表
@@ -65,15 +64,14 @@ public interface LoanApi {
      * 获取最新的贷款申请信息
      */
     @GET("loanapp/latest/v2")
-    Observable<LatestLoanAppBean> getLatestLoanApp(@Header("X-AUTH-TOKEN") String token);
+    Observable<LatestLoanAppBean> getLatestLoanApp();
 
     /**
      * 取消贷款
      */
     @FormUrlEncoded
     @POST("loanapp/cancel")
-    Observable<ResponseBody> cancelLoan(@Field("loanAppId") String loanAppId,
-                                        @Header("X-AUTH-TOKEN") String token);
+    Observable<ResponseBody> cancelLoan(@Field("loanAppId") String loanAppId);
 
     /**
      * 贷款详情
@@ -88,14 +86,14 @@ public interface LoanApi {
      * 我的贷款记录
      */
     @GET("loanapp/all/v2")
-    Observable<List<HistoryLoanAppInfoBean>> getLoanAppAll(@Header("X-AUTH-TOKEN") String token);
+    Observable<List<HistoryLoanAppInfoBean>> getLoanAppAll();
 
 
     /**
      * 获取付款方式
      */
     @GET("loanapp/deposit/methods")
-    Observable<DepositMethodsBean> getDepostMethods(@Header("X-AUTH-TOKEN") String token);
+    Observable<DepositMethodsBean> getDepostMethods();
 
 
     /**
@@ -109,8 +107,7 @@ public interface LoanApi {
     Observable<DepositResponseBean> getRepayOrder(@Query("loanAppId") String loanAppId,
                                                   @Query("currency") String currency,
                                                   @Query("depositMethod") String method,
-                                                  @Query("amount") double amout,
-                                                  @Header("X-AUTH-TOKEN") String token
+                                                  @Query("amount") double amout
     );
 
 
@@ -118,7 +115,7 @@ public interface LoanApi {
      * 是否授权数据
      */
     @GET("record/harvest-grant-status")
-    Observable<HarvestGrantBean> getHarvestGrant(@Header("X-AUTH-TOKEN") String token);
+    Observable<HarvestGrantBean> getHarvestGrant();
 
 
     /**
@@ -134,7 +131,7 @@ public interface LoanApi {
     @PUT("loanapp/{loanAppId}/bank")//API-REPAIR*-*@PUT("loanapp/bank/{loanAppId}")
     Observable<ResponseBody> addBank(@Path("loanAppId") String loanAppId, @Query("bankCode") @NonNull String bankCode, @Query("cardNo") String cardNo,
                                      @Query("applyFor") String applyFor, @Query("applyChannel") @NonNull String applyChannel, @Query("applyPlatform") String android,
-                                     @Query("couponId") long couponId, @Header("X-AUTH-TOKEN") String token);
+                                     @Query("couponId") long couponId);
 
 
 }

src/main/java/tech/starwin/mvp/api/UploadApi.java

@@ -38,8 +38,7 @@ public interface UploadApi {
     @PUT("record/files")
     Observable<ResponseBody> uploadPhoto(
             @Part MultipartBody.Part photoFile,
-            @Query("fileType") String fileType,
-            @Header("X-AUTH-TOKEN") String token
+            @Query("fileType") String fileType
     );
 
     @FormUrlEncoded
@@ -47,15 +46,15 @@ public interface UploadApi {
     Observable<ResponseBody> uploadFirebaseToken(@Field("firebase_token") String token);
 
 
-    @Multipart
-    @PUT("loanapp/contract/video")
-    Call<ResponseBody> uploadVideo(@Part MultipartBody.Part videoFile,
-                                   @Query("loanAppId") String loanAppId,
-                                   @Query("fileType") String fileType,
-                                   @Header("X-AUTH-TOKEN") String token);
+//    @Multipart
+//    @PUT("loanapp/contract/video")
+//    Call<ResponseBody> uploadVideo(@Part MultipartBody.Part videoFile,
+//                                   @Query("loanAppId") String loanAppId,
+//                                   @Query("fileType") String fileType,
+//                                   @Header("X-AUTH-TOKEN") String token);
 
-    @GET("record/files")
-    Call<RecordFilesResponse> recordFiles(@Header("X-AUTH-TOKEN") String token);
+//    @GET("record/files")
+//    Call<RecordFilesResponse> recordFiles(@Header("X-AUTH-TOKEN") String token);
 
     @Multipart
     /*@PUT("/loanapp/verify/face") face++*/
@@ -70,8 +69,7 @@ public interface UploadApi {
                                     @Query("imei") String imei,
                                     @Query("productId") long productId,
                                     @Query("thirdpartyDataFlag") Boolean thirdpartyDataFlag,
-                                    @Query("method") String method,
-                                    @Header("X-AUTH-TOKEN") String token);
+                                    @Query("method") String method);
 
 
     /**
@@ -79,7 +77,7 @@ public interface UploadApi {
      */
     @Multipart
     @PUT("/record/ocr")
-    Observable<OcrResultBean> identityOcr(@Part MultipartBody.Part part, @Header("X-AUTH-TOKEN") String token);
+    Observable<OcrResultBean> identityOcr(@Part MultipartBody.Part part);
 
 
     /**

src/main/java/tech/starwin/mvp/api/UserApi.java

@@ -77,18 +77,12 @@ public interface UserApi {
     @POST("auth/login_account_kit")
     Observable<TokenInfoBean> accountKitLogin(@Field("mobile") String mobile, @Field("auth_code") String auth_code);
 
-    /**
-     * 退出登录
-     */
-    @POST("auth/logout")
-    Observable<ResponseBody> logout(@Query("token") String token,
-                                    @Query("tokenInvalid") String refreshToken);
 
     /**
      * 获取身份证照片
      */
     @GET("record/ktp-photo")
-    Observable<RecordFilesResponse> getKtpImg(@Header("X-AUTH-TOKEN") String token);
+    Observable<RecordFilesResponse> getKtpImg();
 
 
     /**
@@ -103,13 +97,13 @@ public interface UserApi {
      * 获取认证信息
      */
     @GET("record/personalinfo")
-    Observable<PersonalInfoServerBean> getPersonalInfo(@Header("X-AUTH-TOKEN") String token);
+    Observable<PersonalInfoServerBean> getPersonalInfo();
 
     /**
      * 用户信息
      */
     @GET("info/infocenter")
-    Observable<UserBean> getUserInfo(@Header("X-AUTH-TOKEN") String token);
+    Observable<UserBean> getUserInfo();
 
     /**
      * 埋点
@@ -151,8 +145,7 @@ public interface UserApi {
     Observable<ResponseBody> submitContactInfo(@Field("parentName") String parentName,
                                                @Field("parentMobile") String parentMobile,
                                                @Field("friendName") String friendName,
-                                               @Field("friendMobile") String friendMobile,
-                                               @Header("X-AUTH-TOKEN") String token);
+                                               @Field("friendMobile") String friendMobile);
 
     @FormUrlEncoded
     @PUT("record/contact")
@@ -167,8 +160,7 @@ public interface UserApi {
                                                @Field("friendId1") String friendId1,
                                                @Field("friendName1") String friendName1,
                                                @Field("friendMobile1") String friendMobile1,
-                                               @Field("friendType1") String friendType1,
-                                               @Header("X-AUTH-TOKEN") String token);
+                                               @Field("friendType1") String friendType1);
 
 
     @GET("/record/emergency/contact/list")
@@ -192,9 +184,7 @@ public interface UserApi {
                                                   @Field("companyAddress") String companyAddress,
                                                   @Field("companyPhone") String companyPhone,
                                                   @Field("profession") String profession,
-                                                  @Field("salary") String salary,
-//                                                  @Field("workEmail") String workEmail,
-                                                  @Header("X-AUTH-TOKEN") String token);
+                                                  @Field("salary") String salary);
 
 
     /**
@@ -216,8 +206,7 @@ public interface UserApi {
                                                 @Field("childrenNumber") String childrenNumber,
                                                 @Field("residenceDuration") String residenceDuration,
                                                 @Field("facebookId") String facebookId,
-                                                @Field("whatsappId") String whatsappId,
-                                                @Header("X-AUTH-TOKEN") String token);
+                                                @Field("whatsappId") String whatsappId);
 
 
     /**
@@ -232,7 +221,7 @@ public interface UserApi {
      * 消息列表
      */
     @GET("info/inbox/all")
-    Observable<List<MsgInboxBean>> getMsgInbox(@Header("X-AUTH-TOKEN") String token);
+    Observable<List<MsgInboxBean>> getMsgInbox();
 
 
     /**
@@ -240,21 +229,20 @@ public interface UserApi {
      */
     @FormUrlEncoded
     @POST("info/inbox/read")
-    Observable<ResponseBody> sendReadMsg(@Field("msgId") String msgId,
-                                         @Header("X-AUTH-TOKEN") String token);
+    Observable<ResponseBody> sendReadMsg(@Field("msgId") String msgId);
 
 
     /**
      * 获取联系人信息
      */
     @GET("record/contact")
-    Observable<ContactInfoBean> getContactInfo(@Header("X-AUTH-TOKEN") String token);
+    Observable<ContactInfoBean> getContactInfo();
 
     /**
      * 获取工作认证信息
      */
     @GET("record/employment")
-    Observable<EmploymentServerBean> getEmploymentInfo(@Header("X-AUTH-TOKEN") String token);
+    Observable<EmploymentServerBean> getEmploymentInfo();
 
 
     /**
@@ -265,39 +253,6 @@ public interface UserApi {
 
 
     /**
-     * 获取邀请码
-     */
-    @GET("invitation/mine/code")
-    Observable<ResponseBody> getInviteCode(@Header("X-AUTH-TOKEN") String token);
-
-    @GET("invitation/mine/invitee")
-    Observable<InviteeBean> getInviteInfo(@Header("X-AUTH-TOKEN") String token);
-
-    /**
-     * 已邀请的用户
-     */
-    @GET("invitation/mine/invitee/list")
-    Observable<ArrayList<InviteePersonBean>> getInvitedList(@Header("X-AUTH-TOKEN") String token);
-
-    /**
-     * 获取可用优惠券
-     */
-    @GET("coupon/available")
-    Observable<List<CouponBean>> getAvailableCoupon(@Header("X-AUTH-TOKEN") String token);
-
-    /**
-     * 获取已使用的优惠券
-     */
-    @GET("coupon/used")
-    Observable<List<CouponBean>> getUsedCoupon(@Header("X-AUTH-TOKEN") String token);
-
-    /**
-     * 获取过期优惠券
-     */
-    @GET("coupon/outdated")
-    Observable<List<CouponBean>> getOutdatedCoupon(@Header("X-AUTH-TOKEN") String token);
-
-    /**
      * 获取活动Bannder信息
      */
     @GET("banner")
@@ -320,28 +275,24 @@ public interface UserApi {
 
 
     @GET("record/employ-photo")
-    Observable<RecordFilesResponse> getJobImg(@Header("X-AUTH-TOKEN") String token);
+    Observable<RecordFilesResponse> getJobImg();
 
 
     @GET("record/bankcard")
-    Observable<UserBankInfo> getBankCardInfo(@Header("X-AUTH-TOKEN") String token);
-
-
-    @GET("chat/account")
-    Observable<YWUser> getChatUserInfo(@Header("X-AUTH-TOKEN") String token);
+    Observable<UserBankInfo> getBankCardInfo();
 
 
     /**
      * 绑定的第三方账号
      */
     @GET("record/thirdparty_data")
-    Observable<ThirdPartDataBean> getThirdPartAccount(@Header("X-AUTH-TOKEN") String token);
+    Observable<ThirdPartDataBean> getThirdPartAccount();
 
     /**
      * 同盾列表
      */
     @GET("record/thirdparty_data_list")
-    Observable<List<ThirdPartItemBean>> getThirdPartList(@Header("X-AUTH-TOKEN") String token);
+    Observable<List<ThirdPartItemBean>> getThirdPartList();
 
 
 
@@ -349,7 +300,7 @@ public interface UserApi {
      * 同盾列表V2
      */
     @GET("record/thirdparty_data_list/v2")
-    Observable<ThirdPartListBean> getThirdPartListV2(@Header("X-AUTH-TOKEN") String token);
+    Observable<ThirdPartListBean> getThirdPartListV2();
 
     /**
      * 公告
@@ -368,8 +319,7 @@ public interface UserApi {
      * 提交第三方数据
      */
     @PUT("record/thirdparty_data")
-    Observable<ResponseBody> submitThirdPartData(@Header("X-AUTH-TOKEN") String token,
-                                                 @Query("dataChannel") String dataChannel,
+    Observable<ResponseBody> submitThirdPartData(@Query("dataChannel") String dataChannel,
                                                  @Query("dataType") String dataType,
                                                  @Query("taskId") String taskId,
                                                  @Query("credentialNo") String credentialNo,

src/main/java/tech/starwin/mvp/presenter/LoanPresenter.java

@@ -41,7 +41,7 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
      * 验证贷款资格
      */
     public void checkQualification(String action) {
-        handleRequest(action, apiService.isQualification(LoginManager.get().getToken()));
+        handleRequest(action, apiService.isQualification());
     }
 
     /**
@@ -49,7 +49,7 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
      */
     public void getCertifyProgress(String action) {
         boolean tdFlag = !TextUtils.isEmpty(LibConfig.TONGDUN_PARENT_KEY);
-        handleRequest(action, apiService.getCertifyProgress(LoginManager.get().getToken(), tdFlag));
+        handleRequest(action, apiService.getCertifyProgress(tdFlag));
     }
 
     /**
@@ -63,14 +63,14 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
      * 获取最新的贷款申请信息
      */
     public void getLatestLoanApp(String action) {
-        handleRequest(action, apiService.getLatestLoanApp(LoginManager.get().getToken()));
+        handleRequest(action, apiService.getLatestLoanApp());
     }
 
     /**
      * 获取贷款记录
      */
     public void getLoanHistory(String action) {
-        handleRequest(apiService.getLoanAppAll(LoginManager.get().getToken()), new HttpObserver<List<HistoryLoanAppInfoBean>>() {
+        handleRequest(apiService.getLoanAppAll(), new HttpObserver<List<HistoryLoanAppInfoBean>>() {
             @Override
             public void onStart() {
                 view.onHttpStart(action, true);
@@ -98,7 +98,7 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
      * 取消贷款
      */
     public void cancelLoan(String action, String loanAppId) {
-        handleRequest(apiService.cancelLoan(loanAppId, LoginManager.get().getToken()), new HttpObserver<ResponseBody>() {
+        handleRequest(apiService.cancelLoan(loanAppId),  new HttpObserver<ResponseBody>() {
             @Override
             public void onStart() {
                 view.onHttpStart(action, true);
@@ -153,8 +153,7 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
                 loanInfo.getApplyFor(),
                 loanInfo.getApplyChannel(),
                 "ANDROID",
-                loanInfo.getCouponId(),
-                LoginManager.get().getToken());
+                loanInfo.getCouponId());
 
         handleRequest(observable, new HttpObserver<ResponseBody>() {
             @Override
@@ -184,7 +183,7 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
      * 获取付款方式
      */
     public void getDepostMethods(String action) {
-        handleRequest(action, apiService.getDepostMethods(LoginManager.get().getToken()));
+        handleRequest(action, apiService.getDepostMethods());
     }
 
 
@@ -192,7 +191,7 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
      * 是否授权数据
      */
     public void getHarvestGrant(String action) {
-        handleRequest(action, apiService.getHarvestGrant(LoginManager.get().getToken()));
+        handleRequest(action, apiService.getHarvestGrant());
     }
 
 
@@ -204,8 +203,7 @@ public class LoanPresenter extends BasePresenter<LoanApi> {
                 apiService.getRepayOrder(loanAppBean.getLoanAppId(),
                         "IDR",
                         repayMethodorBank,
-                        payAmount,
-                        LoginManager.get().getToken()
+                        payAmount
                 ));
     }
 

src/main/java/tech/starwin/mvp/presenter/UploadPresenter.java

@@ -70,7 +70,7 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
      * 身份证ocr识别,直接使用Bitmap
      */
     private void identityOcr(final String action, MultipartBody.Part filePart) {
-        handleRequest(apiService.identityOcr(filePart, LoginManager.get().getToken()),
+        handleRequest(apiService.identityOcr(filePart),
                 new HttpObserver<OcrResultBean>() {
                     @Override
                     public void onStart() {
@@ -136,8 +136,7 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
                         androidId,
                         productId,
                         !TextUtils.isEmpty(LibConfig.TONGDUN_PARENT_KEY),
-                        method,
-                        LoginManager.get().getToken()
+                        method
                 ),
                 new HttpObserver<BasicAck>() {
                     @Override
@@ -171,7 +170,7 @@ public class UploadPresenter extends BasePresenter<UploadApi> {
                 .flatMap((Function<Integer, ObservableSource<BasicAck>>) integer ->
                         apiService.faceVerify("PAYDAY", amount, day, "D", null, null,
                                 MultipartBodyMaker.makeSimplePart("delta", "null"), AppInfoUtils.getAndroidID(context), productId,
-                                !TextUtils.isEmpty(LibConfig.TONGDUN_PARENT_KEY), "yitu", LoginManager.get().getToken()
+                                !TextUtils.isEmpty(LibConfig.TONGDUN_PARENT_KEY), "yitu"
                         ).onErrorReturn(throwable -> new BasicAck()))
                 .filter(basicAck -> basicAck != null && basicAck.getData() != null)
                 .take(1);

src/main/java/tech/starwin/mvp/presenter/UserPresenter.java

@@ -137,7 +137,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
                                 //刷新Token信息
                                 LoginManager.get().notifyTokenInfo(tokenInfoBean);
                                 uploadFirebaseToken(PreferencesManager.get().getFireBaseMessagingToken());
-                                return apiService.getUserInfo(tokenInfoBean.getToken());
+                                return apiService.getUserInfo();
                             }
                         }),
                 new HttpObserver<UserBean>() {
@@ -174,7 +174,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
      * 获取用户信息
      */
     public void getUserInfo(final String action) {
-        handleRequest(apiService.getUserInfo(LoginManager.get().getToken()), new HttpObserver<UserBean>() {
+        handleRequest(apiService.getUserInfo(), new HttpObserver<UserBean>() {
             @Override
             public void onStart() {
             }
@@ -276,7 +276,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
                                 //刷新Token信息
                                 LoginManager.get().notifyTokenInfo(tokenInfoBean);
                                 uploadFirebaseToken(PreferencesManager.get().getFireBaseMessagingToken());
-                                return apiService.getUserInfo(tokenInfoBean.getToken());
+                                return apiService.getUserInfo();
                             }
                         }),
                 new HttpObserver<UserBean>() {
@@ -314,9 +314,9 @@ public class UserPresenter extends BasePresenter<UserApi> {
      */
     public void getBankAndLoanAmout(String action, LatestLoanAppBean loanBean) {
         Observable<LoanInfo> observable = Observable.zip(
-                getService(LoanApi.class).getLatestLoanApp(LoginManager.get().getToken()),
+                getService(LoanApi.class).getLatestLoanApp(),
                 clearError(apiService.getLoanAmoutData(loanBean.getAmount(), loanBean.getPeriod(), loanBean.getPeriodUnit(), loanBean.getProductId()), LoaningAmoutBean.class),
-                clearError(apiService.getBankCardInfo(LoginManager.get().getToken()), UserBankInfo.class),
+                clearError(apiService.getBankCardInfo(), UserBankInfo.class),
                 getService(LoanApi.class).getBankList(),
                 new Function4<LatestLoanAppBean, LoaningAmoutBean, UserBankInfo, List<BankBean>, LoanInfo>() {
                     @Override
@@ -347,7 +347,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
      * 消息列表
      */
     public void getMsgList(String action) {
-        handleRequest(action, apiService.getMsgInbox(LoginManager.get().getToken()));
+        handleRequest(action, apiService.getMsgInbox());
     }
 
 //    @SuppressLint("CheckResult")
@@ -388,14 +388,14 @@ public class UserPresenter extends BasePresenter<UserApi> {
      * 获取身份证图片地址
      */
     public void getKtpImg(String action) {
-        handleRequest(action, apiService.getKtpImg(LoginManager.get().getToken()));
+        handleRequest(action, apiService.getKtpImg());
     }
 
     /**
      * 获取用户身份信息
      */
     public void getPersonalInfo(String action) {
-        handleRequest(action, apiService.getPersonalInfo(LoginManager.get().getToken()));
+        handleRequest(action, apiService.getPersonalInfo());
     }
 
 
@@ -434,8 +434,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
                 personalInfo.getChildrenNumber(),
                 personalInfo.getResidenceDuration(),
                 personalInfo.getFacebookId(),
-                personalInfo.getWhatsappId(),
-                LoginManager.get().getToken());
+                personalInfo.getWhatsappId());
 
         handleRequest(observable, new HttpObserver<ResponseBody>() {
             @Override
@@ -465,7 +464,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
      * 提交联系人信息
      */
     public void submitContactInfo(String action, String parentName, String parentPhone, String friendName, String friendPhone) {
-        handleRequest(apiService.submitContactInfo(parentName, parentPhone, friendName, friendPhone, LoginManager.get().getToken()),
+        handleRequest(apiService.submitContactInfo(parentName, parentPhone, friendName, friendPhone),
                 new HttpObserver<ResponseBody>() {
                     @Override
                     public void onStart() {
@@ -494,8 +493,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
     public void submitContactInfo(String action, ContactInfoBean contactInfo) {
         handleRequest(apiService.submitContactInfo(contactInfo.getParentId(), contactInfo.getParentName(), contactInfo.getParentMobile(), contactInfo.getParentType(),
                 contactInfo.getFriendId(), contactInfo.getFriendName(), contactInfo.getFriendMobile(), contactInfo.getFriendType(),
-                contactInfo.getFriendId1(), contactInfo.getFriendName1(), contactInfo.getFriendMobile1(), contactInfo.getFriendType1(),
-                LoginManager.get().getToken()),
+                contactInfo.getFriendId1(), contactInfo.getFriendName1(), contactInfo.getFriendMobile1(), contactInfo.getFriendType1()),
                 new HttpObserver<ResponseBody>() {
                     @Override
                     public void onStart() {
@@ -525,8 +523,8 @@ public class UserPresenter extends BasePresenter<UserApi> {
      * 获取工作信息
      */
     public void getEmploymentInfo(String action) {
-        Observable<EmploymentServerBean> employment = apiService.getEmploymentInfo(LoginManager.get().getToken());
-        Observable<RecordFilesResponse> jobImg = apiService.getJobImg(LoginManager.get().getToken());
+        Observable<EmploymentServerBean> employment = apiService.getEmploymentInfo();
+        Observable<RecordFilesResponse> jobImg = apiService.getJobImg();
 
         handleRequest(action, Observable.zip(clearError(employment, EmploymentServerBean.class),
                 clearError(jobImg, RecordFilesResponse.class),
@@ -576,11 +574,10 @@ public class UserPresenter extends BasePresenter<UserApi> {
                         employmentBean.getCompanyAddress(),
                         employmentBean.getCompanyPhone(),
                         employmentBean.getProfession(),
-                        employmentBean.getSalary(),
-                        LoginManager.get().getToken());
+                        employmentBean.getSalary());
 
         if (part != null) {
-            Observable<ResponseBody> upload = getService(UploadApi.class).uploadPhoto(part, "EMPLOYMENT_PHOTO", LoginManager.get().getToken());
+            Observable<ResponseBody> upload = getService(UploadApi.class).uploadPhoto(part, "EMPLOYMENT_PHOTO");
 
             handleRequest(action, Observable.zip(info, upload, new BiFunction<ResponseBody, ResponseBody, Boolean>() {
                 @Override
@@ -674,7 +671,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
      * 获取联系人信息
      */
     public void getContactInfo(String action) {
-        handleRequest(action, apiService.getContactInfo(LoginManager.get().getToken()));
+        handleRequest(action, apiService.getContactInfo());
     }
 
 
@@ -711,7 +708,7 @@ public class UserPresenter extends BasePresenter<UserApi> {
      * 获取绑定的第三方账户
      */
     public void getThirdPartData(String action) {
-        handleRequest(action, apiService.getThirdPartAccount(LoginManager.get().getToken()));
+        handleRequest(action, apiService.getThirdPartAccount());
     }
 
 
@@ -719,14 +716,14 @@ public class UserPresenter extends BasePresenter<UserApi> {
      * 获取同盾列表
      */
     public void getThirdPartList(String action) {
-        handleRequest(action, apiService.getThirdPartList(LoginManager.get().getToken()));
+        handleRequest(action, apiService.getThirdPartList());
     }
 
     /**
      * 获取绑定的第三方账户
      */
     public void getThirdPartListV2(String action) {
-        handleRequest(action, apiService.getThirdPartListV2(LoginManager.get().getToken()));
+        handleRequest(action, apiService.getThirdPartListV2());
     }
 
     /**
@@ -734,14 +731,12 @@ public class UserPresenter extends BasePresenter<UserApi> {
      */
     public void submitTDData(String action, String dataType, String taskId, String credentialNo, String realName, String mobile) {
         handleRequest(action,
-                apiService.submitThirdPartData(LoginManager.get().getToken(),
-                        "TONGDUN", dataType, taskId, credentialNo, realName, mobile, ""));
+                apiService.submitThirdPartData("TONGDUN", dataType, taskId, credentialNo, realName, mobile, ""));
     }
 
     public void submitMXData(String action, String dataType, String taskId, String credentialNo, String realName, String mobile) {
         handleRequest(action,
-                apiService.submitThirdPartData(LoginManager.get().getToken(),
-                        "MOXIE", dataType, taskId, credentialNo, realName, mobile, ""));
+                apiService.submitThirdPartData("MOXIE", dataType, taskId, credentialNo, realName, mobile, ""));
     }
 
 //    /**

src/main/java/tech/starwin/network/DefaultHeaderAddInterceptor.java

@@ -3,9 +3,6 @@ package tech.starwin.network;
 
 import android.text.TextUtils;
 
-import com.google.android.gms.ads.identifier.AdvertisingIdClient;
-import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
-import com.google.android.gms.common.GooglePlayServicesRepairableException;
 
 import java.io.IOException;
 
@@ -72,7 +69,7 @@ class DefaultHeaderAddInterceptor implements Interceptor {
                 .header("thirdpartyDataFlag", String.valueOf(!TextUtils.isEmpty(LibConfig.TONGDUN_PARENT_KEY)))
 //                .header("X-APP-SIM-MOBILE", getSimInfo())
                 .header("X-AF-ID", LibConfig.APPSFLYER_DEV_KEY == null ? "" : LibConfig.APPSFLYER_DEV_KEY)
-                .header("X-GA-ID", getGAId())
+//                .header("X-GA-ID", getGAId())
                 .header("X-GP-PKG-FLAG", String.valueOf(!LibConfig.IS_COLLECT_MODE))
                 .header("X-APP-CODE-VERSION", "ID_V2");
 
@@ -97,24 +94,24 @@ class DefaultHeaderAddInterceptor implements Interceptor {
 //        return SIM_INFO;
 //    }
 
-    private String getGAId() {
-        if (!TextUtils.isEmpty(GA_ID)) {
-            return GA_ID;
-        }
-        AdvertisingIdClient.Info adInfo = null;
-        try {
-            adInfo = AdvertisingIdClient.getAdvertisingIdInfo(LibConfig.getContext());
-            GA_ID = adInfo.getId();
-        } catch (IOException e) {
-            // Unrecoverable error connecting to Google Play services (e.g.,
-            // the old version of the service doesn't support getting AdvertisingId).
-        } catch (GooglePlayServicesNotAvailableException e) {
-            // Google Play services is not available entirely.
-        } catch (GooglePlayServicesRepairableException e) {
-            e.printStackTrace();
-        }
-        return GA_ID;
-    }
+//    private String getGAId() {
+//        if (!TextUtils.isEmpty(GA_ID)) {
+//            return GA_ID;
+//        }
+//        AdvertisingIdClient.Info adInfo = null;
+//        try {
+//            adInfo = AdvertisingIdClient.getAdvertisingIdInfo(LibConfig.getContext());
+//            GA_ID = adInfo.getId();
+//        } catch (IOException e) {
+//            // Unrecoverable error connecting to Google Play services (e.g.,
+//            // the old version of the service doesn't support getting AdvertisingId).
+//        } catch (GooglePlayServicesNotAvailableException e) {
+//            // Google Play services is not available entirely.
+//        } catch (GooglePlayServicesRepairableException e) {
+//            e.printStackTrace();
+//        }
+//        return GA_ID;
+//    }
 
 
 }