From 7ddc5830cc495d69119b9b0ae33353397bd0521f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 22 十二月 2020 10:42:10 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/Common/HDLCommon.cs | 9 ++++++++-
HDL_ON/Entity/DB_ResidenceData.cs | 2 +-
HDL_ON/UI/MainPage.cs | 8 ++++----
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 6c1045e..07ddc1c 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -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;
}
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index f860c1d..297e294 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -126,7 +126,7 @@
///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
- if (MainPage.IsRemote)
+ if (HDL_ON.DriverLayer.Control.Ins.IsRemote)
{
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 8a03892..b834063 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -44,10 +44,10 @@
/// 鏃犵櫥褰曟ā寮�
/// </summary>
public static bool NoLoginMode = false;
- /// <summary>
- /// 杩滅▼妯″紡
- /// </summary>
- public static bool IsRemote = false;
+ ///// <summary>
+ ///// 杩滅▼妯″紡
+ ///// </summary>
+ //public static bool IsRemote = false;
/// <summary>
/// 缃戠粶杩炴帴鐘舵��
/// 0:鏃犵綉缁�
--
Gitblit v1.8.0