消费者端

头像更新fixd

consumer/src/main/java/com/xx/hbhconsumer/data/http/requst/LoginRequest.kt

@@ -12,8 +12,12 @@ class LoginRequest: BaseRespons() {
 
     fun checkVersion(): Observable<BaseResponse<VersionBean>> {
         return apiService.getLineVersion(
+            /**
+             * appType类型 1-企业端 2-商户端 3-消费者端
+             * terminalType终端版本 1-IOS 2-Android
+             */
             ApiParams<VersionBody>().setParams(
-                VersionBody("2", "2")
+                VersionBody("3", "2")
             )
         )
     }

consumer/src/main/java/com/xx/hbhconsumer/data/staticdata/StaticData.kt

-package com.xx.merchanthbh.data.staticdata
+package com.xx.hbhconsumer.data.staticdata
 
 object StaticData {
     /**

consumer/src/main/java/com/xx/hbhconsumer/ui/login/LoginActivity.kt

@@ -17,6 +17,7 @@ import com.xx.hbhconsumer.data.http.requst.LoginRequest
 import com.xx.hbhconsumer.data.http.respons.CollectionBean
 import com.xx.hbhconsumer.databinding.ActivityLoginBinding
 import com.xx.xxviewlibrary.comm.CommTextAgreeDialog
+import com.xx.xxviewlibrary.comm.CommTextDialog
 import com.xx.xxviewlibrary.comm.RefuseDialogBean
 import me.goldze.mvvmhabit.base.BaseActivity
 import me.goldze.mvvmhabit.utils.SPUtils
@@ -38,6 +39,9 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
     /*声明协议内容*/
     var agreementContext: String = ""
     override fun initData() {
+
+//        检查版本
+        viewModel.rxPermissions = RxPermissions(this)
         // 获得协议内容
         viewModel.getProtocols()
         SPUtils.getInstance().clear()
@@ -52,10 +56,10 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
             viewModel.agreeContent.observe(this) { agreeContent: String? ->
                 if (agreeContent != null) {
                     agreementContext = agreeContent
-                    /*在这里加上隐私协议弹窗*/
+//                    在这里加上隐私协议弹窗
                     showCommTextAgreeDialog(
                         RefuseDialogBean(agreementContext, "同意", "不同意", "隐私条款"),
-                        object : CommTextAgreeDialog.onAcceptCallBack {
+                        object : CommTextDialog.onAcceptCallBack, CommTextAgreeDialog.onAcceptCallBack {
                             override fun refuseBack() {
                                 finish()
                                 val intent = Intent(Intent.ACTION_MAIN)
@@ -69,24 +73,16 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
                                 val editor = preferences.edit()
                                 editor.putBoolean("is_agree_flag", false)
                                 editor.apply()
-                                /*同意隐私协议以后再进行版本检测*/
-                                checkVersions()
+                                viewModel.checkVersion(binding.root.rootView)
                             }
                         })
                 }
             }
         }else{
-            /*不是第一次登录就直接检测版本*/
-            checkVersions()
+            viewModel.checkVersion(binding.root.rootView)
         }
 
 
-    }
-
-    fun checkVersions() {
-        //检查版本
-        viewModel.rxPermissions = RxPermissions(this)
-        viewModel.checkVersion(binding.root.rootView)
         //安装新版本
         viewModel.openInstall.observe(this, Observer<String?> {
             fun onChanged(s: String) {
@@ -106,7 +102,10 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
                     binding.rbLoginAgreement.setSelected(consentAgreementFlag)
                 }
             })
+
+
     }
+
     override fun initViewObservable() {
         super.initViewObservable()
     }

consumer/src/main/java/com/xx/hbhconsumer/ui/login/LoginViewModel.java

@@ -25,6 +25,7 @@ import com.xx.hbhconsumer.data.http.respons.CollectionBean;
 import com.xx.hbhconsumer.data.http.respons.UserInfoBean;
 import com.xx.hbhconsumer.data.http.respons.VersionBean;
 import com.xx.hbhconsumer.data.local.LocalData;
+import com.xx.hbhconsumer.data.staticdata.StaticData;
 import com.xx.hbhconsumer.ui.main.MainActivity;
 import com.xx.hbhconsumer.ui.privacyclause.PrivacyClauseActivity;
 import com.xx.hbhconsumer.ui.pwd.ForgetPwdActivity;
@@ -32,7 +33,6 @@ import com.xx.hbhconsumer.ui.pwd.PwdActivity;
 import com.xx.hbhconsumer.ui.register.RegisterActivity;
 import com.xx.hbhconsumer.ui.useragreement.UserAgreementActivity;
 import com.xx.hbhconsumer.utils.RetrofitClient;
-import com.xx.merchanthbh.data.staticdata.StaticData;
 import com.xx.xxviewlibrary.comm.CommTextDialog;
 import com.xx.xxviewlibrary.comm.RefuseDialogBean;
 import com.xx.xxviewlibrary.utils.CommUtilsKt;

consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java

@@ -235,6 +235,8 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
                         }).subscribe(new ApiDisposableObserver<List<Filebean>>() {
                             @Override
                             public void onSuccess(List<Filebean> resultBean) {
+                                ToastUtils.showShort("修改成功");
+                                changeAvatarDialog.dismiss();
                                 dismissDialog();
                             }