fix:华为隐私协议开关。

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.29",
+            "m-user"          : "0.0.60.30",
             "m-home"          : "0.0.22.33",
             "m-im"            : "0.0.18.23",
             "m-dynamic"       : "0.0.7.13",
@@ -33,7 +33,7 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.60",
+            "ydl-platform"    : "0.0.39.61",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.33",
@@ -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.8",
+            "m-user"          : "0.0.41.9",
             "m-home"          : "0.0.6.28",
             "m-im"            : "0.0.3.14",
             "m-dynamic"       : "0.0.1.7",
@@ -115,7 +115,7 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.60",
+            "ydl-platform"    : "0.0.39.61",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.32",

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

@@ -373,7 +373,8 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         var  isAgreeProtocol =false
         //华为渠道不默认勾选隐私协议，必须全局上下文才可以获取到渠道号。其他渠道默认勾选隐私协议
         //protocol_android  1是开启华为渠道默认勾选，2是关闭华为渠道默认勾选，方便应用市场审核
-        if (WalleChannelReader.getChannel(applicationContext)=="huawei"&& PlatformRamImpl.getInstance().getGlobalInfo()?.info?.protocol_android==2){
+        val huaweiType=PlatformRamImpl.getInstance().getGlobalInfo()?.info?.protocol_android?:2
+        if (WalleChannelReader.getChannel(applicationContext)=="huawei"&& huaweiType==2){
             iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected)
         }else{
             isAgreeProtocol=true

ydl-platform/src/main/java/com/ydl/ydlcommon/bean/GlobalInfo.java

@@ -42,7 +42,7 @@ public class GlobalInfo implements Serializable{
         public String notice_url;
         public PayNotice pay_notice;
         public int login_hide_wx;  //1隐藏，0显示
-        public int protocol_android; //华为渠道隐私协议开关，1不默认勾选，2默认勾选
+        public int protocol_android=2; //华为渠道隐私协议开关，1默认勾选，2默认不勾选
 
         public static class PayNotice implements Serializable{
             public String title;