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 | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index ed3d96a..1ee49bc 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -142,10 +142,11 @@
public void EixtAccount()
{
instance = null;
- Rooms = null;
ins_OidList = null;
functionList = null;
HomeGateway = null;
+ SpatialInfo.CurrentSpatial.ClearRooms();
+ //UserInfo.Current.ClearUserInfo();
if (MainPage.IsRemote)
{
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
@@ -180,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>
@@ -251,10 +270,11 @@
/// </summary>
public string CurFoor = Language.StringByID(StringId.All);
- /// <summary>
- /// 鎴块棿鍒楄〃
- /// </summary>
- public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;
+ ///// <summary>
+ ///// 鎴块棿鍒楄〃
+ ///// </summary>
+ //[Newtonsoft.Json.JsonIgnore]
+ //public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;
#region 鍔熻兘鏁版嵁
static FunctionList _functionList;
--
Gitblit v1.8.0