feat:m-user 华为永不默认勾选。vivo动态配置。其他渠道默认勾选

m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt

@@ -410,12 +410,16 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         }
         var isAgreeProtocol = false
         //华为渠道不默认勾选隐私协议，必须全局上下文才可以获取到渠道号。其他渠道默认勾选隐私协议
-        //protocol_android  1是开启华为、vivo渠道默认勾选，2是关闭华为、vivo渠道默认勾选，方便应用市场审核
-        val huaweiType = PlatformRamImpl.getInstance().getGlobalInfo()?.info?.protocol_android ?: 2
+        //protocol_android  1是开启默认勾选，2是关闭默认勾选，方便应用市场审核
+        //新逻辑：华为一直不默认勾选(上线后华为也会抽查隐私协议勾选情况)，vivo审核不默认勾选，通过后默认勾选
+
+        val privacyOnOffType = PlatformRamImpl.getInstance().getGlobalInfo()?.info?.protocol_android ?: 2
         val channel = WalleChannelReader.getChannel(applicationContext)
-        if (huaweiType == 2 && (channel == "huawei"||channel=="vivo")) {
+        if (channel=="huawei"){
             iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected)
-        } else {
+        }else if (privacyOnOffType == 2 && (channel=="vivo")){
+            iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected)
+        }else{
             isAgreeProtocol = true
             iv_select_protocol.setImageResource(R.drawable.user_login_protocol_selected)
         }