From 3e7c0a6deda128e639abfa3b8ed9377dbd017526 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 11 十二月 2020 17:47:24 +0800
Subject: [PATCH] 2020-12-11-4

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

diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 5cb0446..5d69b59 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -157,6 +157,7 @@
             Rooms = null;
             ins_OidList = null;
             functionList = null;
+            HomeGateway = null;
             if (MainPage.IsRemote)
             {
                 DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
@@ -265,6 +266,7 @@
         /// <summary>
         /// 鎴块棿鍒楄〃
         /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
         public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;
 
         #region 鍔熻兘鏁版嵁
@@ -274,25 +276,6 @@
             get
             {
                 if (_functionList == null)
-                {
-                    _functionList = FunctionList.List;
-                }
-                return _functionList;
-            }
-            set
-            {
-                _functionList = value;
-            }
-        }
-
-        /// <summary>
-        /// 鍒锋柊浣忓畢閲岄潰鐨勬悳绱㈣澶囩姸鎬�
-        /// </summary>
-        public void RefreshResidenceFunctionStatus()
-        {
-            new Thread(() =>
-            {
-                if(_functionList == null)
                 {
                     _functionList = FunctionList.List;
                 }

--
Gitblit v1.8.0