feat:VIVO渠道开关配置。

config.gradle

@@ -8,7 +8,7 @@ ext {
             "m-confide"       : "0.0.48.77",
             "m-consultant"    : "0.0.59.36",
             "m-fm"            : "0.0.30.00",
-            "m-user"          : "0.0.60.33",
+            "m-user"          : "0.0.60.34",
             "m-home"          : "0.0.22.33",
             "m-im"            : "0.0.18.23",
             "m-dynamic"       : "0.0.7.13",
@@ -92,7 +92,7 @@ ext {
             "m-confide"       : "0.0.41.6",
             "m-consultant"    : "0.0.51.16",
             "m-fm"            : "0.0.23.5",
-            "m-user"          : "0.0.41.12",
+            "m-user"          : "0.0.41.13",
             "m-home"          : "0.0.6.28",
             "m-im"            : "0.0.3.14",
             "m-dynamic"       : "0.0.1.7",

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

@@ -413,15 +413,11 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         //protocol_android  1是开启华为、vivo渠道默认勾选，2是关闭华为、vivo渠道默认勾选，方便应用市场审核
         val huaweiType = PlatformRamImpl.getInstance().getGlobalInfo()?.info?.protocol_android ?: 2
         val channel = WalleChannelReader.getChannel(applicationContext)
-        if (huaweiType == 2 && channel == "huawei") {
+        if (huaweiType == 2 && (channel == "huawei"||channel=="vivo")) {
             iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected)
         } else {
-            if (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)
-            }
+            isAgreeProtocol = true
+            iv_select_protocol.setImageResource(R.drawable.user_login_protocol_selected)
         }
         view_click.setOnClickListener {
             if (iv_select_protocol.visibility == View.VISIBLE) {