fix: 一键登录唤起后，又打开手机号登录问题修复

config.gradle

@@ -8,7 +8,7 @@ ext {
             "m-confide"       : "0.0.49.06",
             "m-consultant"    : "0.0.59.68",
             "m-fm"            : "0.0.30.01",
-            "m-user"          : "0.0.61.26",
+            "m-user"          : "0.0.61.28",
             "m-home"          : "0.0.22.59",
             "m-im"            : "0.0.18.48",
             "m-dynamic"       : "0.0.7.19",
@@ -91,7 +91,7 @@ ext {
             "m-confide"       : "0.0.49.06",
             "m-consultant"    : "0.0.59.68",
             "m-fm"            : "0.0.30.01",
-            "m-user"          : "0.0.61.26",
+            "m-user"          : "0.0.61.28",
             "m-home"          : "0.0.22.59",
             "m-im"            : "0.0.18.48",
             "m-dynamic"       : "0.0.7.19",

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

@@ -20,6 +20,7 @@ import com.meituan.android.walle.WalleChannelReader
 import com.mobile.auth.gatewayauth.*
 import com.mobile.auth.gatewayauth.model.TokenRet
 import com.tbruyelle.rxpermissions2.RxPermissions
+import com.ydl.webview.NewH5Activity
 import com.ydl.ydlcommon.base.BaseActivity
 import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.utils.JPushUtils
@@ -430,7 +431,8 @@ object OneKeyLoginHelp {
                             .observeOn(AndroidSchedulers.mainThread())
                             .subscribe({
                                 if (it.code == 200) {
-                                    AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.LOGIN,"一键登录成功")
+                                    AliYunRichLogsHelper.getInstance()
+                                        .sendRichLog(AliYunLogConfig.LOGIN, "一键登录成功")
                                     ToastUtil.toastShort("登录成功")
                                     saveUserData(it.data)
                                     if (it.data.firstLogin == 1) {//第一次登录：是注册
@@ -464,12 +466,18 @@ object OneKeyLoginHelp {
                                         LoginUtils.loginSuccessOperate(mActivity)
                                     }
                                 } else {
-                                    AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.LOGIN,"一键登录失败   msg:${it.msg}")
+                                    AliYunRichLogsHelper.getInstance().sendRichLog(
+                                        AliYunLogConfig.LOGIN,
+                                        "一键登录失败   msg:${it.msg}"
+                                    )
                                     ToastUtil.toastShort(it.msg)
                                     mPhoneNumberAuthHelper?.hideLoginLoading()
                                 }
                             }, {
-                                AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.LOGIN,"一键登录Error   msg:${it.message}")
+                                AliYunRichLogsHelper.getInstance().sendRichLog(
+                                    AliYunLogConfig.LOGIN,
+                                    "一键登录Error   msg:${it.message}"
+                                )
                                 ToastUtil.toastShort(it.message)
                                 mPhoneNumberAuthHelper?.hideLoginLoading()
                             })
@@ -603,9 +611,8 @@ object OneKeyLoginHelp {
                     }
                 }
         } catch (e: Exception) {
-            e.printStackTrace()
-        } finally {
             RegisterAndLoginActivity.start(context)
+            e.printStackTrace()
         }
 
     }