Skip to content

Y
YDL-Component-Medical
Commit 027b183d by YKai
Options

feat:一键登录代码优化，登录界面号码验证

parent 6ff932cd
Showing with 83 additions and 168 deletions
app/src/main/java/com/ydl/component/MainActivity.kt
......@@ -12,6 +12,7 @@ import android.provider.Settings
import android.util.Log
import com.alibaba.android.arouter.facade.annotation.Route
import com.alibaba.android.arouter.launcher.ARouter
import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper
import com.tbruyelle.rxpermissions2.RxPermissions
import com.umeng.analytics.MobclickAgent
import com.ydl.component.music.FragmentContainerActivity
......@@ -74,7 +75,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
YdlCommonRouterManager.initYdlCommonRoute(PlatformTempCommonRouteImpl())
// 初始化一键登录sdk
OneKeyLoginHelp.sdkInit(this, OneKeyLoginHelp.YDL_USER_APP, OneKeyLoginHelp.ONE_KEY_LOGIN)
OneKeyLoginHelp.sdkInit(this, OneKeyLoginHelp.YDL_USER_APP, PhoneNumberAuthHelper.SERVICE_TYPE_LOGIN)
bindService()
reLoadData()
......@@ -92,9 +93,6 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
// .withBoolean("bind_phone", false)
// .withBoolean("isFromGuide", true)
// .navigation()
if (!OneKeyLoginHelp.mIsGetTokenSuccess) {
OneKeyLoginHelp.setAuthListener()
}
OneKeyLoginHelp.getLoginToken(false)
}
bt_to_consultant.setOnClickListener {
......
m-user/src/main/java/com/yidianling/user/UserHelper.kt
......@@ -23,6 +23,9 @@ object UserHelper {
private val user_setting_name_sp = "ydl_user_setting"
private val user_setting_key_sp = "ydl_user_setting_key"
// 存储用户的手机号
public const val USER_PHONE = "user_phone"
//用户信息//缓存
private var userTemp: UserResponseBean? = null
......@@ -35,6 +38,8 @@ object UserHelper {
userTemp = userInfo
var str = gson.toJson(userTemp)
SharedPreferencesEditor.putFileString(user_info_name_sp, user_info_key_sp, str)
// 存储登录所使用的手机号
SharedPreferencesEditor.putString(USER_PHONE,userInfo?.userInfo?.phone)
UserInfoCache.getInstance().saveYDLUser("\"" + userInfo?.uid + "\"",
userInfo?.userInfo?.nick_name, userInfo?.userInfo?.head)
......
m-user/src/main/java/com/yidianling/user/mine/MineFragment.java
......@@ -360,9 +360,6 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
*/
private void startLogin(){
if (OneKeyLoginHelp.INSTANCE.getMIsOpenOneKeyLogin()) {
if (!OneKeyLoginHelp.INSTANCE.getMIsGetTokenSuccess()) {
OneKeyLoginHelp.INSTANCE.setAuthListener();
}
OneKeyLoginHelp.INSTANCE.getLoginToken(true);
}else {
RegisterAndLoginActivity.Companion.start(getActivity());
......
m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt
......@@ -30,14 +30,12 @@ object OneKeyLoginHelp {
"i4Y/PVRAz4P/aqajQF7SOd3JUIKEsJbRurH04azLyX6N2upi292OrLHECRmtTVAqY24HFjwUjW1QjRwJA9aFbNzl3zl7L5DEDBZ4+QSU28vq34HccmAjAeUCC7qCHbN7QLVZqhVpuYUCMZ5fp2NdhANJl/741wHccdPk/Un5c4larDNuv1KEo2OZOds2J1WFiBx7giWtzli4NwMq9x+9sb0aXPZZQ9C9Kr8T/0+/ccYdotwFm7XWenNs/G3Jy1HHVqqOCDecKPbyXR+cV0jBUisSjv+SEUTfpcc3iUGH5OjZyQ6OfaLkdjATsr5K9oVP"
const val YDL_USER_APP = 1
const val YDL_EXPERT_APP = 2
const val PHONE_CHECK = 1 // 本机号码验证
const val ONE_KEY_LOGIN = 2 // 一键登录
var mPhoneNumberAuthHelper: PhoneNumberAuthHelper? = null
private var mAppType: Int = YDL_USER_APP
var mIsGetTokenSuccess = true // 获取token是否成功，默认是成功
var mIsOpenOneKeyLogin = false // 是否开启一键登录
var mIsFromGuide = true
var mAuthType = ONE_KEY_LOGIN // 1：本机号码校验 2: ⼀键登录
var mAuthType = PhoneNumberAuthHelper.SERVICE_TYPE_LOGIN // 1：本机号码校验 2: ⼀键登录
private lateinit var mActivity: BaseActivity
......@@ -55,17 +53,27 @@ object OneKeyLoginHelp {
} else if (appType == YDL_EXPERT_APP) {
it.setAuthSDKInfo(YDL_EXPERT_APP_KEY)
}
// 检查认证环境
// it.checkEnvAvailable(authType) // type 1：本机号码校验 2: ⼀键登录
}
}
/**
* 检查认证环境
*
*/
fun checkEnvAvailable(authType: Int) {
mAuthType = authType
if (!mIsGetTokenSuccess) {
setAuthListener()
}
mPhoneNumberAuthHelper?.checkEnvAvailable(authType) // type 1：本机号码校验 2: ⼀键登录
}
/**
* 设置token监听
*
*/
fun setAuthListener() {
private fun setAuthListener() {
mPhoneNumberAuthHelper?.setAuthListener(mTokenListener)
}
......@@ -86,7 +94,10 @@ object OneKeyLoginHelp {
*
*/
fun getVerifyToken() {
mAuthType = PHONE_CHECK
mAuthType = PhoneNumberAuthHelper.SERVICE_TYPE_AUTH
if (!mIsGetTokenSuccess) {
setAuthListener()
}
mPhoneNumberAuthHelper?.getVerifyToken(5000) // 5000表示超时时间 单位ms
}
......@@ -97,8 +108,11 @@ object OneKeyLoginHelp {
*/
fun getLoginToken(isOpenDialog: Boolean) {
mIsFromGuide = isOpenDialog
mAuthType = ONE_KEY_LOGIN
mAuthType = PhoneNumberAuthHelper.SERVICE_TYPE_LOGIN
mPhoneNumberAuthHelper?.let {
if (!mIsGetTokenSuccess) {
setAuthListener()
}
// 打开页面
if (isOpenDialog) {
openDialog(it)
......@@ -281,28 +295,31 @@ object OneKeyLoginHelp {
// 一键登录token监听器
private var mTokenListener: TokenResultListener = object : TokenResultListener {
override fun onTokenSuccess(s: String) {
val tokenRet = TokenRet.fromJson(s)
when (tokenRet.code) {
ResultCode.CODE_START_AUTHPAGE_SUCCESS -> { // 唤起一键登录页面成功
LogUtil.e("唤起授权页成功：$s")
}
ResultCode.CODE_SUCCESS -> { // 点击登录后获取token成功
val token = tokenRet.token
if (mAuthType == PHONE_CHECK) { // 本机号码校验
verifyTokenResultListener.onTokenSuccess(token)
}else{
// 登录
if (mAuthType == PhoneNumberAuthHelper.SERVICE_TYPE_AUTH) { // 本机号码校验
verifyTokenResultListener.onTokenSuccess(s)
} else {
val tokenRet = TokenRet.fromJson(s)
when (tokenRet.code) {
ResultCode.CODE_START_AUTHPAGE_SUCCESS -> { // 唤起一键登录页面成功
LogUtil.e("唤起授权页成功：$s")
}
ResultCode.CODE_SUCCESS -> { // 获取token成功
val token = tokenRet.token
mPhoneNumberAuthHelper?.setAuthListener(null)
mIsGetTokenSuccess = false
}
mPhoneNumberAuthHelper?.setAuthListener(null)
}
}
}
override fun onTokenFailed(s: String) {
LogUtil.e(s)
mIsGetTokenSuccess = false
val tokenRet = TokenRet.fromJson(s)
if (mAuthType == PHONE_CHECK) { // 本机号码校验
if (mAuthType == PhoneNumberAuthHelper.SERVICE_TYPE_AUTH) { // 本机号码校验
verifyTokenResultListener.onTokenFailed(tokenRet)
} else {
// 一键登录
......@@ -324,7 +341,7 @@ object OneKeyLoginHelp {
private lateinit var verifyTokenResultListener: VerifyTokenResultListener
interface VerifyTokenResultListener {
fun onTokenSuccess(result: String?)
fun onTokenSuccess(result: String)
fun onTokenFailed(result: TokenRet)
}
......
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
......@@ -12,25 +12,21 @@ import android.text.*
import android.text.method.LinkMovementMethod
import android.text.style.AbsoluteSizeSpan
import android.text.style.ClickableSpan
import android.util.Log
import android.view.View
import android.view.animation.AnimationUtils
import com.alibaba.android.arouter.facade.annotation.Route
import com.meituan.android.walle.WalleChannelReader
import com.mobile.auth.gatewayauth.AuthUIConfig
import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper
import com.mobile.auth.gatewayauth.PreLoginResultListener
import com.mobile.auth.gatewayauth.TokenResultListener
import com.mobile.auth.gatewayauth.model.InitResult
import com.mobile.auth.gatewayauth.model.VendorConfig
import com.mobile.auth.gatewayauth.ResultCode
import com.mobile.auth.gatewayauth.model.TokenRet
import com.tbruyelle.rxpermissions2.RxPermissions
import com.umeng.socialize.UMShareAPI
import com.umeng.socialize.UMShareConfig
import com.umeng.socialize.bean.SHARE_MEDIA
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.base.BaseMvpActivity
import com.ydl.ydlcommon.data.PlatformRamImpl
import com.ydl.ydlcommon.utils.ActivityManager
import com.ydl.ydlcommon.utils.SharedPreferencesEditor
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
......@@ -38,7 +34,10 @@ import com.ydl.ydlcommon.view.dialog.CommonDialog
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxKeyboardTool
import com.yidianling.common.tools.ToastUtil
import com.yidianling.user.*
import com.yidianling.user.LoginUtils
import com.yidianling.user.R
import com.yidianling.user.StatusUtils
import com.yidianling.user.UserHelper
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.bean.AliAuthBean
import com.yidianling.user.constants.UserBIConstants
......@@ -65,20 +64,11 @@ import kotlinx.android.synthetic.main.user_activity_register_and_login.*
class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginContract.Presenter>(),
ILoginContract.View {
private var mAlicomAuthHelper: PhoneNumberAuthHelper? = null
private var mTokenListener: TokenResultListener? = null
private var mAutCheckResult: InitResult? = null
private var userPhoneNumber: String? = null
// 是否支持号码认证
private var isCanAuth: Boolean = false
/**
* 是不是4G网络
*/
private var isCan4GAuth: Boolean = false
/**
* 手机号校验结果
*/
private var chcekPhoneResponeBean: ChcekPhoneResponeBean? = null
private var chcekPhoneResponeBean: ChcekPhoneResponeBean? = null // 手机号校验结果
private var isUmengLoginState: Boolean = false //true 通过第三方登录后绑定手机号码
private var countryCode: String? = "0086"//国家或地区手机区号
private var handler: Handler? = null
......@@ -144,21 +134,13 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
.subscribe { permission ->
when {
permission.granted -> {
// 用户已经同意该权限
/*
* 5.sdk init
*/
mAutCheckResult = mAlicomAuthHelper?.checkAuthEnvEnable()
}
permission.shouldShowRequestPermissionRationale -> {
// 用户拒绝了该权限，没有选中『不再询问』（Never ask again）,那么下次再次启动时。还会提示请求权限的对话框
}
else -> {
// 用户拒绝了该权限，而且选中『不再询问』
ToastUtil.toastLong(
this,
getString(R.string.platform_need_storage_permission_hint)
)
ToastUtil.toastLong(this, "App正常工作需要使用设备信息权限，请开启")
val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
val uri = Uri.fromParts("package", packageName, null)
intent.data = uri
......@@ -166,19 +148,6 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
finish()
}
}
if (mAutCheckResult != null) {
isCan4GAuth = mAutCheckResult?.isCan4GAuth!!
if (!TextUtils.isEmpty(mAutCheckResult!!.simPhoneNumber) && TextUtils.isEmpty(
userPhoneNumber
)
) {
runOnUiThread {
et_phone_number.setPhoneText(mAutCheckResult!!.simPhoneNumber)
et_phone_number.setSelection(et_phone_number.text.length)
iv_del.visibility = View.VISIBLE
}
}
}
}
}
......@@ -198,78 +167,44 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
private fun initAuthHelper() {
/*
* 1.init get token callback Listener
*/
mTokenListener = object : TokenResultListener {
override fun onTokenSuccess(ret: String) {
this@RegisterAndLoginActivity.runOnUiThread {
try {
requestPermission()
OneKeyLoginHelp.checkEnvAvailable(PhoneNumberAuthHelper.SERVICE_TYPE_AUTH)
OneKeyLoginHelp.setVerifyTokenResultListener(object :OneKeyLoginHelp.VerifyTokenResultListener{
override fun onTokenSuccess(result: String) {
val tokenRet = TokenRet.fromJson(result)
when (tokenRet.code) {
ResultCode.CODE_ERROR_ENV_CHECK_SUCCESS->{ // 终端环境支持认证
isCanAuth =true
val phone = SharedPreferencesEditor.getString(UserHelper.USER_PHONE)
phone?.let {
et_phone_number.setPhoneText(phone)
et_phone_number.setSelection(phone.length)
iv_del.visibility = View.VISIBLE
}
}
ResultCode.CODE_SUCCESS -> { // 获取token成功
val aliAuthBean = AliAuthBean()
aliAuthBean.accessCode = ret
//
aliAuthBean.accessCode = result
if (isUmengLoginState) {
//绑定手机号码
umengLoginBindPhone(aliAuthBean.accessCode)
} else {
autoLogin(aliAuthBean)
}
} catch (e: Exception) {
e.printStackTrace()
aliAuthFailed()
OneKeyLoginHelp.mPhoneNumberAuthHelper?.setAuthListener(null)
OneKeyLoginHelp.mIsGetTokenSuccess = false
}
/*
* setText just show the result for get token。
* use ret to verfiy number。
*/
mAlicomAuthHelper?.quitAuthActivity()
}
}
override fun onTokenFailed(ret: String) {
this@RegisterAndLoginActivity.runOnUiThread {
override fun onTokenFailed(result: TokenRet) {
if (isCanAuth) {
//验证失败跳转到验证码/密码界面
aliAuthFailed()
/*
* setText just show the result for get token
* do something when getToken failed, such as use sms verify code.
*/
mAlicomAuthHelper?.quitAuthActivity()
}
}
}
/*
* 2.init AlicomAuthHelper with tokenListener
*/
mAlicomAuthHelper = PhoneNumberAuthHelper.getInstance(this, mTokenListener)
/*
* 3.set debugMode when app is in debug mode, sdk will print log in debug mode
*/
mAlicomAuthHelper?.setDebugMode(BaseApp.instance.getGlobalConfig().appDebug)
requestPermission()
/*
* 8.config authorization page ui to adapte app ui theme
*/
mAlicomAuthHelper?.setAuthUIConfig(
AuthUIConfig.Builder()
.setAppPrivacyOne("自定义协议", "https://www.aliyun.com/product/dypns")
.setLogoImgPath("ic_launcher")
.setPrivacyState(true)
.setCheckboxHidden(true)
.create()
)
mAlicomAuthHelper?.preLogin(5, object : PreLoginResultListener {
override fun onTokenSuccess(s: String) {
Log.e("mTokenListener", "preLogin Success：$s")
}
override fun onTokenFailed(s: String, s1: String) {
Log.e("mTokenListener", "preLogin Failed：$s")
}
})
}
......@@ -554,30 +489,15 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
override fun checkPhoneStatusSuccess(bean: ChcekPhoneResponeBean?, phone: String) {
//校验手机号的结果需要在本地保存，后续一键认证登录失败后跳转密码登录需要用到校验结果
if (bean != null) {
chcekPhoneResponeBean =
ChcekPhoneResponeBean(bean.hasPwd, bean.isDoctor, bean.isRegistered)
chcekPhoneResponeBean = ChcekPhoneResponeBean(bean.hasPwd, bean.isDoctor, bean.isRegistered)
}
if (isCan4GAuth) {
mAlicomAuthHelper?.getAuthToken(5000)
// val authBean = CheckAliAuthParam(phone, mAlicomAuthHelper!!.version)
// mPresenter.checkAliAuth(authBean)
if (isCanAuth) {
OneKeyLoginHelp.getVerifyToken()
} else {
aliAuthFailed()
}
}
/**
* 服务端校验阿里一键认证成功，设置sdk token
*
* 成功的回调 :
* @see getAuthToken
*
* 失败的回调 ：
* @see aliAuthFailed
*/
override fun getAuthToken(configDTOs: List<VendorConfig>) {
// mAlicomAuthHelper!!.getAuthToken(5000)
}
/**
* 服务端校验阿里一键认证认证失败
......@@ -742,9 +662,5 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
if (handler != null) {
handler = null
}
if (mAlicomAuthHelper != null) {
mAlicomAuthHelper!!.onDestroy()
}
mAlicomAuthHelper = null
}
}
m-user/src/main/java/com/yidianling/user/ui/login/contract/ILoginContract.kt
......@@ -62,11 +62,6 @@ interface ILoginContract {
fun checkPhoneStatusSuccess(bean: ChcekPhoneResponeBean?, phone: String)
/**
* 设置阿里一键认证sdk token
*/
fun getAuthToken(configDTOs: List<VendorConfig>)
/**
* 服务端阿里认证失败
*/
fun aliAuthFailed()
......
m-user/src/main/java/com/yidianling/user/ui/login/testLoginActivity.kt
......@@ -59,7 +59,7 @@ import kotlinx.android.synthetic.main.user_activity_register_and_login.*
* @Company 壹点灵
* @date 2018/11/28
*/
@Route(path = "/user/login")
//@Route(path = "/user/login")
class testLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginContract.Presenter>(),
ILoginContract.View {
......@@ -434,19 +434,6 @@ class testLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginContract.Pr
}
/**
* 服务端校验阿里一键认证成功，设置sdk token
*
* 成功的回调 :
* @see getAuthToken
*
* 失败的回调 ：
* @see aliAuthFailed
*/
override fun getAuthToken(configDTOs: List<VendorConfig>) {
// mAlicomAuthHelper!!.getAuthToken(5000)
}
/**
* 服务端校验阿里一键认证认证失败
*
* 成功的回调 :
......
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