fix:一键登录逻辑优化

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.64",
+            "m-user"          : "0.0.60.65",
             "m-home"          : "0.0.22.51",
             "m-im"            : "0.0.18.30",
             "m-dynamic"       : "0.0.7.13",
@@ -91,7 +91,7 @@ ext {
             "m-confide"       : "0.0.48.91",
             "m-consultant"    : "0.0.51.16",
             "m-fm"            : "0.0.23.5",
-            "m-user"          : "0.0.60.63",
+            "m-user"          : "0.0.60.65",
             "m-home"          : "0.0.22.51",
             "m-im"            : "0.0.3.15",
             "m-dynamic"       : "0.0.1.7",

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

@@ -101,8 +101,6 @@ object LoginUtils {
 
     @JvmStatic
     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/login/OneKeyLoginHelp.kt

@@ -364,7 +364,6 @@ object OneKeyLoginHelp {
                         LogUtil.e("唤起授权页成功：$s")
                         if (mIsFromGuide){
                             mActivity.finish()
-                            mIsFromGuide = false
                         }
                     }
                     ResultCode.CODE_SUCCESS -> {                          // 获取token成功

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

@@ -633,18 +633,11 @@ 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){
+        if (ActivityManager.getActivitySize() == 1) {
             ActivityManager.finishOtherActivity(this)
             UserIn.mainIntent(this, 4)
             finish()
-        }else{
+        } else {
             super.onBackPressed()
         }
     }