Merge branch 'Dev-Wxr'

wxr

2023-02-15 7ff70bc7c9460c395b59952d55df6e5d6a12a718

 HDL_ON/Common/HDLCommon.cs

@@ -102,7 +102,7 @@
                                    NewVersionUrl = appVersionRes.packageUrl
                                };
#if __IOS__
                                mForceUpdateInfo.NewVersionUrl = appVersionRes.iosUrl;
                                mForceUpdateInfo.NewVersionUrl = appVersionRes.packageUrl;
#endif
                                //解析更新内容详情
                                //var reasonStrJson = GetReasonStrJson(appVersionRes.remark);
@@ -119,10 +119,13 @@
                                //}
                                mForceUpdateInfo.ReasonStr = appVersionRes.remark;

                                if (appVersionRes.version != MainPage.VersionString)
                                {
                                Application.RunOnMainThread(() =>
                                {
                                    ShowForceUpdateDialog(mForceUpdateInfo);
                                });
                                }
                            }
                        }
                    }
@@ -622,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;
@@ -631,6 +635,7 @@
            if (internetStatus == 0)//没有网络连接 0
            {
                MainPage.InternetStatus = 0;
                DAL.Mqtt.MqttClient.InitState();
            }
            else if (internetStatus == 1)//3,4G的网络连接 1
            {