Merge branch 'WJC' into NewFilePath

wxr

2020-12-22 a56a485926a8927f904d7f4795c371c25b35753a

 HDL_ON/Common/HDLCommon.cs

@@ -311,7 +311,7 @@
        {
            //加载Loading效果
            var waitPage = new Loading();
            MainPage.BasePageView.AddChidren(waitPage);
            MainPage.BaseView.AddChidren(waitPage);
            waitPage.Start(Language.StringByID(StringId.PleaseWait));

            new Thread(() =>
@@ -450,9 +450,16 @@
            //网络状态变化 重置网关状态重新搜索
            Control.Ins.GatewayOnline = false;

            //网络变化，断开重连一次
            if (Control.Ins.IsRemote)
            {
                Control.Ins.IsRemote = false;
                DAL.Mqtt.MqttClient.DisConnectRemote("UpdateInternetStatus", false);
            }

            if (internetStatus == 0)//没有网络连接 0
            {
                //Control.Ins.GatewayOnline = false;
                Control.Ins.GatewayOnline = false;
                Control.Ins.IsRemote = false;
                MainPage.InternetStatus = 0;
            }