From c9a987ced5454cfc6b9363eadcad038191706f5b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 12 十二月 2020 16:37:09 +0800
Subject: [PATCH] 2020-12-12 1.解锁设置优化

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

diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index f111294..1ee49bc 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -146,7 +146,7 @@
             functionList = null;
             HomeGateway = null;
             SpatialInfo.CurrentSpatial.ClearRooms();
-            UserInfo.Current.ClearUserInfo();
+            //UserInfo.Current.ClearUserInfo();
             if (MainPage.IsRemote)
             {
                 DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
@@ -181,6 +181,24 @@
                 }
             }
         }
+
+        /// <summary>
+        /// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
+        /// gatewayId 鍒ょ┖
+        /// </summary>
+        /// <returns></returns>
+        public bool CheckWhetherGatewayIdIsNull()
+        {
+            if (HomeGateway != null && !string.IsNullOrEmpty(HomeGateway.gatewayId))
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
         /// <summary>
         /// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
         /// </summary>

--
Gitblit v1.8.0