Commit 83c3950c by 霍志良

feat:huawei、VIVO不默认勾选隐私协议,其他渠道动态开关配置

parent 5d6408a3
...@@ -8,7 +8,7 @@ ext { ...@@ -8,7 +8,7 @@ ext {
"m-confide" : "0.0.49.09", "m-confide" : "0.0.49.09",
"m-consultant" : "0.0.59.78", "m-consultant" : "0.0.59.78",
"m-fm" : "0.0.30.03", "m-fm" : "0.0.30.03",
"m-user" : "0.0.61.33", "m-user" : "0.0.61.34",
"m-home" : "0.0.22.61", "m-home" : "0.0.22.61",
"m-im" : "0.0.19.12", "m-im" : "0.0.19.12",
"m-dynamic" : "0.0.7.22", "m-dynamic" : "0.0.7.22",
...@@ -91,7 +91,7 @@ ext { ...@@ -91,7 +91,7 @@ ext {
"m-confide" : "0.0.49.09", "m-confide" : "0.0.49.09",
"m-consultant" : "0.0.59.78", "m-consultant" : "0.0.59.78",
"m-fm" : "0.0.30.01", "m-fm" : "0.0.30.01",
"m-user" : "0.0.61.33", "m-user" : "0.0.61.34",
"m-home" : "0.0.22.61", "m-home" : "0.0.22.61",
"m-im" : "0.0.19.12", "m-im" : "0.0.19.12",
"m-dynamic" : "0.0.7.22", "m-dynamic" : "0.0.7.22",
......
...@@ -367,14 +367,14 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -367,14 +367,14 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
var isAgreeProtocol = false var isAgreeProtocol = false
//华为渠道不默认勾选隐私协议,必须全局上下文才可以获取到渠道号。其他渠道默认勾选隐私协议 //华为渠道不默认勾选隐私协议,必须全局上下文才可以获取到渠道号。其他渠道默认勾选隐私协议
//protocol_android 1是开启默认勾选,2是关闭默认勾选,方便应用市场审核 //protocol_android 1是开启默认勾选,2是关闭默认勾选,方便应用市场审核
//新逻辑:华为一直不默认勾选(上线后华为也会抽查隐私协议勾选情况),vivo审核不默认勾选,通过后默认勾选 //新逻辑:华为和VIVO一直不默认勾选(上线后华为、VIVO也会抽查隐私协议勾选情况)
val privacyOnOffType = val privacyOnOffType =
PlatformRamImpl.getInstance().getGlobalInfo()?.info?.protocol_android ?: 2 PlatformRamImpl.getInstance().getGlobalInfo()?.info?.protocol_android ?: 2
val channel = WalleChannelReader.getChannel(applicationContext) val channel = WalleChannelReader.getChannel(applicationContext)
if (channel == "huawei") { if (channel == "huawei"||channel == "vivo") {
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected_new) iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected_new)
} else if (privacyOnOffType == 2 && (channel == "vivo")) { } else if (privacyOnOffType == 2) {
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected_new) iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected_new)
} else { } else {
isAgreeProtocol = true isAgreeProtocol = true
......
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