Merge branch 'dev--wxr' into LcSdkV1

wxr

2022-11-23 5b77d9d57a6cddb474a66ca54401ad5ab0892db3

 HDL_ON/Common/HDLCommon.cs

@@ -91,7 +91,7 @@
                    {
                        if (revertObj.Data != null)
                        {
                            var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionRes>(revertObj.Data.ToString());
                            var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionResNew>(revertObj.Data.ToString());
                            if (appVersionRes != null)
                            {

@@ -99,29 +99,33 @@
                                {
                                    UpdateType = appVersionRes.isEnforce ? 2 : 1,
                                    NewVersion = appVersionRes.version,
                                    NewVersionUrl = appVersionRes.androidUrl
                                    NewVersionUrl = appVersionRes.packageUrl
                                };
#if __IOS__
                                mForceUpdateInfo.NewVersionUrl = appVersionRes.iosUrl;
                                mForceUpdateInfo.NewVersionUrl = appVersionRes.packageUrl;
#endif
                                //解析更新内容详情
                                var reasonStrJson = GetReasonStrJson(appVersionRes.updateDescription);
                                if (reasonStrJson != null)
                                {
                                    if (Language.CurrentLanguage == "Chinese")
                                    {
                                        mForceUpdateInfo.ReasonStr = reasonStrJson.Chinese;
                                    }
                                    else
                                    {
                                        mForceUpdateInfo.ReasonStr = reasonStrJson.English;
                                    }
                                }
                                //var reasonStrJson = GetReasonStrJson(appVersionRes.remark);
                                //if (reasonStrJson != null)
                                //{
                                //    if (Language.CurrentLanguage == "Chinese")
                                //    {
                                //        mForceUpdateInfo.ReasonStr = reasonStrJson.Chinese;
                                //    }
                                //    else
                                //    {
                                //        mForceUpdateInfo.ReasonStr = reasonStrJson.English;
                                //    }
                                //}
                                mForceUpdateInfo.ReasonStr = appVersionRes.remark;

                                Application.RunOnMainThread(() =>
                                if (appVersionRes.version != MainPage.VersionString)
                                {
                                    ShowForceUpdateDialog(mForceUpdateInfo);
                                });
                                    Application.RunOnMainThread(() =>
                                    {
                                        ShowForceUpdateDialog(mForceUpdateInfo);
                                    });
                                }
                            }
                        }
                    }
@@ -621,6 +625,7 @@
        public void UpdateInternetStatus(int internetStatus, bool IsEnterBackground = false)
        {
            MainPage.Log($"网络状态变化，当前网络:{internetStatus} 是否后台:{IsEnterBackground.ToString()}");
            MainPage.LinkHdlMqttCount = 0;
            //网络状态变化 重置网关状态重新搜索
            Control.Ins.GatewayOnline_Cloud = false;
            Control.Ins.GatewayOnline_Local = false;
@@ -630,6 +635,7 @@
            if (internetStatus == 0)//没有网络连接 0
            {
                MainPage.InternetStatus = 0;
                DAL.Mqtt.MqttClient.InitState();
            }
            else if (internetStatus == 1)//3,4G的网络连接 1
            {