From 1b5ec1190a27ebe66f74ca9513020f805d3ec61c Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 13:54:19 +0800
Subject: [PATCH] 2021221-2

---
 HDL_ON/Entity/DB_ResidenceData.cs |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 1478f42..4edb93c 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -123,8 +123,12 @@
             HomeGateway = null;
             SpatialInfo.CurrentSpatial.Clear();
             FunctionList.List.Clear();
-            if (MainPage.IsRemote)
+            
+            ///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
+            HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
+            if (DriverLayer.Control.Ins.IsRemote)
             {
+                DriverLayer.Control.Ins.IsRemote = false;
                 DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
             }
         }
@@ -157,7 +161,10 @@
                 }
             }
         }
-
+        /// <summary>
+        /// 璁板綍绐楀笜鍏ㄥ紑鍏ㄥ叧鐘舵��
+        /// </summary>
+        public bool GlobalCurtainStatus = false;
         /// <summary>
         /// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
         /// gatewayId 鍒ょ┖

--
Gitblit v1.8.0