Commit 601e5cea by YKai

feat: m-user组件升级

parent 24c8efdd
...@@ -8,7 +8,7 @@ ext { ...@@ -8,7 +8,7 @@ ext {
"m-confide" : "0.0.49.13", "m-confide" : "0.0.49.13",
"m-consultant" : "0.0.59.93", "m-consultant" : "0.0.59.93",
"m-fm" : "0.0.30.04", "m-fm" : "0.0.30.04",
"m-user" : "0.0.61.56", "m-user" : "0.0.61.69",
"m-home" : "0.0.22.73", "m-home" : "0.0.22.73",
"m-im" : "0.0.19.80", "m-im" : "0.0.19.80",
"m-dynamic" : "0.0.7.29", "m-dynamic" : "0.0.7.29",
...@@ -91,7 +91,7 @@ ext { ...@@ -91,7 +91,7 @@ ext {
"m-confide" : "0.0.49.13", "m-confide" : "0.0.49.13",
"m-consultant" : "0.0.59.93", "m-consultant" : "0.0.59.93",
"m-fm" : "0.0.30.04", "m-fm" : "0.0.30.04",
"m-user" : "0.0.61.56", "m-user" : "0.0.61.69",
"m-home" : "0.0.22.73", "m-home" : "0.0.22.73",
"m-im" : "0.0.19.80", "m-im" : "0.0.19.80",
"m-dynamic" : "0.0.7.29", "m-dynamic" : "0.0.7.29",
......
package com.yidianling.user.ui.login package com.yidianling.user.ui.login
import android.Manifest
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Activity import android.app.Activity
import android.content.Context import android.content.Context
...@@ -19,7 +18,6 @@ import com.fm.openinstall.model.AppData ...@@ -19,7 +18,6 @@ import com.fm.openinstall.model.AppData
import com.meituan.android.walle.WalleChannelReader import com.meituan.android.walle.WalleChannelReader
import com.mobile.auth.gatewayauth.* import com.mobile.auth.gatewayauth.*
import com.mobile.auth.gatewayauth.model.TokenRet import com.mobile.auth.gatewayauth.model.TokenRet
import com.tbruyelle.rxpermissions2.RxPermissions
import com.ydl.ydlcommon.base.BaseActivity import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.base.BaseApp import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.utils.JPushUtils import com.ydl.ydlcommon.utils.JPushUtils
...@@ -599,29 +597,15 @@ object OneKeyLoginHelp { ...@@ -599,29 +597,15 @@ object OneKeyLoginHelp {
* */ * */
@SuppressLint("CheckResult") @SuppressLint("CheckResult")
fun startLogin(context: Activity, isOpenDialog: Boolean) { fun startLogin(context: Activity, isOpenDialog: Boolean) {
try { if (mIsOpenOneKeyLogin) {
RxPermissions(context) getLoginToken(isOpenDialog)
.request(Manifest.permission.READ_PHONE_STATE) } else {
.subscribe { hasPermission: Boolean? -> // 一键登录页面打开成功
if (hasPermission == true && mIsOpenOneKeyLogin) { if (mOpenPageIsSuccess) {
getLoginToken(isOpenDialog) RegisterAndLoginActivity.start(context)
} else { } else {
// 一键登录页面打开成功 RegisterAndLoginActivity.start(context, isFromOneKey = false, isFromGuide = true)
if (mOpenPageIsSuccess) { }
RegisterAndLoginActivity.start(context)
} else {
RegisterAndLoginActivity.start(
context,
isFromOneKey = false,
isFromGuide = true
)
}
}
}
} catch (e: Exception) {
RegisterAndLoginActivity.start(context)
e.printStackTrace()
} }
} }
} }
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