fix:一键登录逻辑优化

m-user/src/main/java/com/yidianling/user/LoginUtils.kt

@@ -23,6 +23,7 @@ import com.yidianling.user.safePrivate.HandUnlockCheckActivity
 import com.yidianling.user.ui.LoginActivity
 import com.yidianling.user.ui.collect.CollectSexAndBirthActivity
 import com.yidianling.user.ui.login.InputPassWordActivity
+import com.yidianling.user.ui.login.OneKeyLoginHelp
 import com.yidianling.user.ui.login.RegisterAndLoginActivity
 import com.yidianling.user.ui.login.VerificationCodeActivity
 import de.greenrobot.event.EventBus
@@ -99,7 +100,9 @@ object LoginUtils {
     }
 
     @JvmStatic
-    fun LoginSuccessOperate(activity: Activity) {
+    fun loginSuccessOperate(activity: Activity) {
+        // 在一键登录页面切换到其它登录方式登录后，并退出一键登录界面
+        OneKeyLoginHelp.quitLoginPage()
         val size = ActivityManager.getActivitySize()
         if (size <= 2) {//当前stack只有两个页面，必然没有MainActivity
             ActivityManager.finishAll()

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

@@ -159,7 +159,7 @@ class SmsLoginActivity : BaseActivity() {
 //                        UserIn.mainIntent(this)
 //                    }
 //                    finish()
-                    LoginUtils.LoginSuccessOperate(this)
+                    LoginUtils.loginSuccessOperate(this)
                 }, object : ThrowableConsumer() {
                     override fun accept(msg: String) {
                         dismissProgressDialog()

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

@@ -323,7 +323,7 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
 
         RxKeyboardTool.hideSoftInput(this)
 
-        LoginUtils.LoginSuccessOperate(this)
+        LoginUtils.loginSuccessOperate(this)
     }
 
     private fun closeAnim(hasAnim: Boolean) {

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

@@ -9,7 +9,6 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.RelativeLayout
 import android.widget.TextView
-import com.alibaba.android.arouter.launcher.ARouter
 import com.meituan.android.walle.WalleChannelReader
 import com.mobile.auth.gatewayauth.*
 import com.mobile.auth.gatewayauth.model.TokenRet
@@ -133,6 +132,13 @@ object OneKeyLoginHelp {
         }
     }
 
+    /**
+     * 退出一键登录界面
+     */
+    fun quitLoginPage(){
+        mPhoneNumberAuthHelper?.quitLoginPage()
+    }
+
 
     /**
      * 本机手机号码校验
@@ -358,6 +364,7 @@ object OneKeyLoginHelp {
                         LogUtil.e("唤起授权页成功：$s")
                         if (mIsFromGuide){
                             mActivity.finish()
+                            mIsFromGuide = false
                         }
                     }
                     ResultCode.CODE_SUCCESS -> {                          // 获取token成功
@@ -383,7 +390,7 @@ object OneKeyLoginHelp {
                                     }
                                     mIsGetTokenSuccess = false
                                     if (mIsFromGuide) {
-                                        LoginUtils.LoginSuccessOperate(mActivity)
+                                        LoginUtils.loginSuccessOperate(mActivity)
                                     }
                                 }else{
                                     ToastUtil.toastShort(it.msg)

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

@@ -507,7 +507,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             other_login_style.visibility = View.GONE
         } else {
             if (isFromGuide) {
-                LoginUtils.LoginSuccessOperate(this)
+                LoginUtils.loginSuccessOperate(this)
             } else {
                 finish()
             }
@@ -612,7 +612,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         ToastUtil.toastShort("登录成功")
         handler!!.postDelayed({
             if (isFromGuide) {
-                LoginUtils.LoginSuccessOperate(this)
+                LoginUtils.loginSuccessOperate(this)
             } else {
                 finish()
             }
@@ -633,11 +633,18 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
 
     override fun onBackPressed() {
         //当前stack只有一个activity，说明被挤掉线的
-        if (ActivityManager.getActivitySize() == 1) {
+//        if (ActivityManager.getActivitySize() == 1) {
+//            ActivityManager.finishOtherActivity(this)
+//            UserIn.mainIntent(this, 4)
+//            finish()
+//        } else {
+//            super.onBackPressed()
+//        }
+        if (isFromGuide){
             ActivityManager.finishOtherActivity(this)
             UserIn.mainIntent(this, 4)
             finish()
-        } else {
+        }else{
             super.onBackPressed()
         }
     }

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

@@ -326,7 +326,7 @@ class VerificationCodeActivity :
     override fun closeActivity() {
         RxKeyboardTool.hideSoftInput(this)
 
-        LoginUtils.LoginSuccessOperate(this)
+        LoginUtils.loginSuccessOperate(this)
     }
 
     /**