Commit 67ad8a6e by 霍志良

feat:未登录状态导医BUG修改

parent 53b44f0a
...@@ -8,7 +8,7 @@ ext { ...@@ -8,7 +8,7 @@ ext {
"m-confide" : "0.0.49.53", "m-confide" : "0.0.49.53",
"m-consultant" : "0.0.60.11", "m-consultant" : "0.0.60.11",
"m-fm" : "0.0.30.04", "m-fm" : "0.0.30.04",
"m-user" : "0.0.62.00", "m-user" : "0.0.62.01",
"m-home" : "0.0.22.93", "m-home" : "0.0.22.93",
"m-im" : "0.0.21.18", "m-im" : "0.0.21.18",
"m-dynamic" : "0.0.7.35", "m-dynamic" : "0.0.7.35",
...@@ -92,7 +92,7 @@ ext { ...@@ -92,7 +92,7 @@ ext {
"m-confide" : "0.0.49.52", "m-confide" : "0.0.49.52",
"m-consultant" : "0.0.60.11", "m-consultant" : "0.0.60.11",
"m-fm" : "0.0.30.07", "m-fm" : "0.0.30.07",
"m-user" : "0.0.62.00", "m-user" : "0.0.62.01",
"m-home" : "0.0.22.93", "m-home" : "0.0.22.93",
"m-im" : "0.0.21.18", "m-im" : "0.0.21.18",
"m-dynamic" : "0.0.7.35", "m-dynamic" : "0.0.7.35",
......
...@@ -37,7 +37,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers ...@@ -37,7 +37,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
*/ */
object LoginUtils { object LoginUtils {
var logingCallBackListener: LoginCallBackListener? = null var logingCallBackListener: LoginCallBackListener? = null
fun setLoginCallBack(listener: LoginCallBackListener) { fun setLoginCallBack(listener: LoginCallBackListener?) {
logingCallBackListener = listener logingCallBackListener = listener
} }
@JvmStatic @JvmStatic
......
...@@ -167,6 +167,7 @@ object OneKeyLoginHelp { ...@@ -167,6 +167,7 @@ object OneKeyLoginHelp {
*/ */
fun quitLoginPage() { fun quitLoginPage() {
mPhoneNumberAuthHelper?.quitLoginPage() mPhoneNumberAuthHelper?.quitLoginPage()
LoginUtils.setLoginCallBack(null)
} }
...@@ -496,7 +497,7 @@ object OneKeyLoginHelp { ...@@ -496,7 +497,7 @@ object OneKeyLoginHelp {
} }
override fun onTokenFailed(s: String) { override fun onTokenFailed(s: String) {
LogUtil.e(s) LogUtil.e("onTokenFailed"+s)
mIsGetTokenSuccess = false mIsGetTokenSuccess = false
val tokenRet = TokenRet.fromJson(s) val tokenRet = TokenRet.fromJson(s)
if (mAuthType == PhoneNumberAuthHelper.SERVICE_TYPE_AUTH) { // 本机号码校验 if (mAuthType == PhoneNumberAuthHelper.SERVICE_TYPE_AUTH) { // 本机号码校验
......
...@@ -712,6 +712,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -712,6 +712,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
override fun onBackPressed() { override fun onBackPressed() {
if (isFromGuide) { if (isFromGuide) {
LoginUtils.setLoginCallBack(null)
ActivityManager.finishOtherActivity(this) ActivityManager.finishOtherActivity(this)
UserIn.mainIntent(this, 4) UserIn.mainIntent(this, 4)
finish() finish()
...@@ -731,6 +732,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -731,6 +732,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
super.onBackPressed() super.onBackPressed()
} }
} else { } else {
LoginUtils.setLoginCallBack(null)
super.onBackPressed() super.onBackPressed()
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment