Ver código fonte

1.优化不卸载app切换用户,用户首次登陆没有欢迎消息bug

王鹏鹏 2 anos atrás
pai
commit
041cdc5a53

+ 1 - 0
home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -651,6 +651,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                     makeMessageAsRead(msg)
                     analyticMessage(msg)
                 } else {
+                    Log.e("wpp", "---------------------------->消息未读")
                     if (User.getShowWelcomeMessage().not()) {
                         analyticMessage(msg)
                     }

+ 5 - 4
login/src/main/java/com/yingyang/login/ui/login/LoginActivity.kt

@@ -79,8 +79,7 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
      * 用户登录
      */
     private fun loginMsg() {
-        viewModel.loginMsg(
-            binding.username.text.toString().trim(),
+        viewModel.loginMsg(binding.username.text.toString().trim(),
             binding.password.text.toString().trim(),
             fail = {
                 it.toast()
@@ -136,12 +135,12 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
                     }
                     //保存是否第一次登陆(0第一次登陆)
                     if (TextUtils.isEmpty(it.firstLogin).not()) {
+                        User.saveShowWelcomeMessage(TextUtils.equals("0", it.firstLogin))
                         User.saveFirstLogin(it.firstLogin)
                     }
                     startInitService()
                     ARouter.getInstance().build(RouterUrlCommon.home)
-                        .withTransition(R.anim.leftin, R.anim.leftout)
-                        .navigation(mContext)
+                        .withTransition(R.anim.leftin, R.anim.leftout).navigation(mContext)
                     finish()
                 }
             }
@@ -156,6 +155,7 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
                     v.startAnimation(getScaleAnimation())
                 }
             }
+
             MotionEvent.ACTION_UP -> {
                 v.startAnimation(getEndAnimation())
                 if (v.id == R.id.login) {
@@ -168,6 +168,7 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
                     }
                 }
             }
+
             MotionEvent.ACTION_CANCEL -> {
                 if (v.id == R.id.login || v.id == R.id.tvCode) {
                     v.startAnimation(getEndAnimation())