Commit f06b463f by 霍志良

feat:华为渠道不勾选隐私协议,其他渠道默认勾选隐私协议

parent 3dba71bc
...@@ -8,7 +8,7 @@ ext { ...@@ -8,7 +8,7 @@ ext {
"m-confide" : "0.0.48.74", "m-confide" : "0.0.48.74",
"m-consultant" : "0.0.59.34", "m-consultant" : "0.0.59.34",
"m-fm" : "0.0.30.00", "m-fm" : "0.0.30.00",
"m-user" : "0.0.60.23", "m-user" : "0.0.60.25",
"m-home" : "0.0.22.31", "m-home" : "0.0.22.31",
"m-im" : "0.0.18.15", "m-im" : "0.0.18.15",
"m-dynamic" : "0.0.7.13", "m-dynamic" : "0.0.7.13",
...@@ -33,7 +33,7 @@ ext { ...@@ -33,7 +33,7 @@ ext {
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
//第一步 //第一步
"ydl-platform" : "0.0.39.48", "ydl-platform" : "0.0.39.49",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.32", "ydl-webview" : "0.0.38.32",
...@@ -91,7 +91,7 @@ ext { ...@@ -91,7 +91,7 @@ ext {
"m-confide" : "0.0.41.3", "m-confide" : "0.0.41.3",
"m-consultant" : "0.0.51.13", "m-consultant" : "0.0.51.13",
"m-fm" : "0.0.23.5", "m-fm" : "0.0.23.5",
"m-user" : "0.0.41.2", "m-user" : "0.0.41.4",
"m-home" : "0.0.6.26", "m-home" : "0.0.6.26",
"m-im" : "0.0.3.9", "m-im" : "0.0.3.9",
"m-dynamic" : "0.0.1.7", "m-dynamic" : "0.0.1.7",
...@@ -114,7 +114,7 @@ ext { ...@@ -114,7 +114,7 @@ ext {
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
//第一步 //第一步
"ydl-platform" : "0.0.39.48", "ydl-platform" : "0.0.39.49",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.31", "ydl-webview" : "0.0.38.31",
...@@ -263,7 +263,7 @@ ext { ...@@ -263,7 +263,7 @@ ext {
"protector" : "com.ydl:protector:1.0.1-SNAPSHOT@aar", "protector" : "com.ydl:protector:1.0.1-SNAPSHOT@aar",
"ydl-hnet" : "com.ydl:h-net:0.0.8", "ydl-hnet" : "com.ydl:h-net:0.0.8",
"ydl-user-router" : "com.ydl:router:1.0.0-SNAPSHOT@aar", "ydl-user-router" : "com.ydl:router:1.0.0-SNAPSHOT@aar",
"ydl-device" : "com.ydl:device-id:0.0.24@aar", "ydl-device" : "com.ydl:device-id:0.0.25@aar",
"ydl-net" : "com.ydl:ydl-net:${ydlCompileVersion["ydl-net"]}", "ydl-net" : "com.ydl:ydl-net:${ydlCompileVersion["ydl-net"]}",
"ydl-utils" : "com.ydl:ydl-utils:${ydlCompileVersion["ydl-utils"]}", "ydl-utils" : "com.ydl:ydl-utils:${ydlCompileVersion["ydl-utils"]}",
......
...@@ -16,6 +16,7 @@ import android.util.Log ...@@ -16,6 +16,7 @@ import android.util.Log
import android.view.View import android.view.View
import android.view.animation.AnimationUtils import android.view.animation.AnimationUtils
import com.alibaba.android.arouter.facade.annotation.Route 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.AuthUIConfig
import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper
import com.mobile.auth.gatewayauth.PreLoginResultListener import com.mobile.auth.gatewayauth.PreLoginResultListener
...@@ -81,7 +82,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -81,7 +82,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
private var countryCode: String? = "0086"//国家或地区手机区号 private var countryCode: String? = "0086"//国家或地区手机区号
private var handler: Handler? = null private var handler: Handler? = null
private var isFromGuide = false//是否来自启动页 private var isFromGuide = false//是否来自启动页
private var isAgreeProtocol =false
companion object { companion object {
private var BIND_PHONE = "bind_phone"//用于判断时候是绑定手机号 private var BIND_PHONE = "bind_phone"//用于判断时候是绑定手机号
private var IS_FROM_GUIDE = "isFromGuide"//是否来自启动页 private var IS_FROM_GUIDE = "isFromGuide"//是否来自启动页
...@@ -368,6 +369,14 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -368,6 +369,14 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
RxKeyboardTool.hideSoftInput(this) RxKeyboardTool.hideSoftInput(this)
onBackPressed() onBackPressed()
} }
var isAgreeProtocol =false
//华为渠道不默认勾选隐私协议,必须全局上下文才可以获取到渠道号。其他渠道默认勾选隐私协议
if (WalleChannelReader.getChannel(applicationContext)=="huawei"){
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected)
}else{
isAgreeProtocol=true
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_selected)
}
view_click.setOnClickListener { view_click.setOnClickListener {
if(iv_select_protocol.visibility==View.VISIBLE){ if(iv_select_protocol.visibility==View.VISIBLE){
isAgreeProtocol=!isAgreeProtocol isAgreeProtocol=!isAgreeProtocol
......
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