fix:一键登录和其他登录方式切换bug修复

config.gradle

@@ -8,7 +8,7 @@ ext {
             "m-confide"       : "0.0.48.91",
             "m-consultant"    : "0.0.59.40",
             "m-fm"            : "0.0.30.00",
-            "m-user"          : "0.0.60.80",
+            "m-user"          : "0.0.60.82",
             "m-home"          : "0.0.22.51",
             "m-im"            : "0.0.18.30",
             "m-dynamic"       : "0.0.7.13",

m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt

@@ -51,7 +51,7 @@ object OneKeyLoginHelp {
     const val YDL_EXPERT_APP = 2
     var mPhoneNumberAuthHelper: PhoneNumberAuthHelper? = null
     private var mAppType: Int = YDL_USER_APP
-    private var mIsFromGuide = true   // 是否来自启动页
+    var mIsFromGuide = true   // 是否来自启动页
     private var mOpenPageIsSuccess = false // 一键登录界面是否打开成功
     var mIsGetTokenSuccess = true    // 获取token是否成功，默认是成功
     var mIsOpenOneKeyLogin = true   // 是否开启一键登录

m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt

@@ -545,10 +545,21 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             tv_protocol.visibility = View.GONE
             other_login_style.visibility = View.GONE
         } else {
-            if (isFromGuide) {
-                LoginUtils.loginSuccessOperate(this)
-            } else {
-                finish()
+            when {
+                isFromGuide -> {
+                    LoginUtils.loginSuccessOperate(this)
+                }
+                isFromOneKeyLogin -> {
+                    if (OneKeyLoginHelp.mIsFromGuide){
+                        LoginUtils.loginSuccessOperate(this)
+                    }else{
+                        OneKeyLoginHelp.quitLoginPage()
+                        finish()
+                    }
+                }
+                else -> {
+                    finish()
+                }
             }
         }
     }
@@ -655,7 +666,12 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
                     LoginUtils.loginSuccessOperate(this)
                 }
                 isFromOneKeyLogin -> {
-                    LoginUtils.loginSuccessOperate(this)
+                    if (OneKeyLoginHelp.mIsFromGuide){
+                        LoginUtils.loginSuccessOperate(this)
+                    }else{
+                        OneKeyLoginHelp.quitLoginPage()
+                        finish()
+                    }
                 }
                 else -> {
                     finish()
@@ -677,14 +693,6 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
 
 
     override fun onBackPressed() {
-        //当前stack只有一个activity，说明被挤掉线的
-//        if (ActivityManager.getActivitySize() == 1) {
-//            ActivityManager.finishOtherActivity(this)
-//            UserIn.mainIntent(this, 4)
-//            finish()
-//        } else {
-//            super.onBackPressed()
-//        }
         if (isFromGuide) {
             ActivityManager.finishOtherActivity(this)
             UserIn.mainIntent(this, 4)
@@ -693,9 +701,13 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             // 如果已经登录
             if (isLogin()) {
                 OneKeyLoginHelp.quitLoginPage()
-                ActivityManager.finishOtherActivity(this)
-                UserIn.mainIntent(this, 4)
-                finish()
+                if (OneKeyLoginHelp.mIsFromGuide){
+                    ActivityManager.finishOtherActivity(this)
+                    UserIn.mainIntent(this, 4)
+                    finish()
+                }else{
+                    super.onBackPressed()
+                }
             } else {
                 super.onBackPressed()
             }