fix:一键登录逻辑优化

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

@@ -52,6 +52,7 @@ object OneKeyLoginHelp {
     var mPhoneNumberAuthHelper: PhoneNumberAuthHelper? = null
     private var mAppType: Int = YDL_USER_APP
     private var mIsFromGuide = true   // 是否来自启动页
+    private var mOpenPageIsSuccess = false // 一键登录界面是否打开成功
     var mIsGetTokenSuccess = true    // 获取token是否成功，默认是成功
     var mIsOpenOneKeyLogin = true   // 是否开启一键登录
     var mAuthType = PhoneNumberAuthHelper.SERVICE_TYPE_LOGIN              // 1：本机号码校验 2: ⼀键登录
@@ -117,7 +118,11 @@ object OneKeyLoginHelp {
      *
      */
     fun toLoginActivity() {
-        RegisterAndLoginActivity.startFromGuide(mActivity,false, mIsFromGuide)
+        if (mOpenPageIsSuccess){
+            RegisterAndLoginActivity.start(mActivity)
+        }else{
+            RegisterAndLoginActivity.startFromGuide(mActivity, isBindPhone = false, isFromGudile = true)
+        }
     }
 
     /**
@@ -128,7 +133,11 @@ object OneKeyLoginHelp {
         if (mIsOpenOneKeyLogin){
             getLoginToken(isOpenDialog)
         }else{
-            RegisterAndLoginActivity.startFromGuide(mActivity,false, mIsFromGuide)
+            if (mOpenPageIsSuccess){
+                RegisterAndLoginActivity.start(mActivity)
+            }else{
+                RegisterAndLoginActivity.startFromGuide(mActivity, isBindPhone = false, isFromGudile = true)
+            }
         }
     }
 
@@ -158,6 +167,7 @@ object OneKeyLoginHelp {
      * @param isOpenDialog 是否是弹窗
      */
     fun getLoginToken(isOpenDialog: Boolean) {
+        mOpenPageIsSuccess = false
         mIsFromGuide = !isOpenDialog
         mAuthType = PhoneNumberAuthHelper.SERVICE_TYPE_LOGIN
         mPhoneNumberAuthHelper?.let {
@@ -378,11 +388,11 @@ object OneKeyLoginHelp {
                         LogUtil.e("唤起授权页成功：$s")
                         if (mIsFromGuide){
                             mActivity.finish()
-                            mIsFromGuide = false
+                            mOpenPageIsSuccess = true
                         }
                     }
-                    ResultCode.CODE_SUCCESS -> {                          // 获取token成功
-                        val param = PhoneLoginAutoParam(tokenRet.token, JPushUtils.getRegistrationID(),2,2,"", RxAppTool.getAppVersionName(BaseApp.Companion.getApp()))
+                    ResultCode.CODE_SUCCESS -> {                          // 获取token成功  JPushUtils.getRegistrationID()
+                        val param = PhoneLoginAutoParam(tokenRet.token, "111111",2,2,"", RxAppTool.getAppVersionName(BaseApp.Companion.getApp()))
                         LoginApiRequestUtil.autoLogin(param)
                             .subscribeOn(Schedulers.io())
                             .observeOn(AndroidSchedulers.mainThread())
@@ -411,7 +421,8 @@ object OneKeyLoginHelp {
                                     mPhoneNumberAuthHelper?.hideLoginLoading()
                                 }
                             }, {
-                             toLoginActivity()
+                                ToastUtil.toastShort(it.message)
+                                mPhoneNumberAuthHelper?.hideLoginLoading()
                             })
                     }
                 }