From b3abfd30576871c32f2839a322fa3bb783f96498 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 12 十二月 2020 19:10:10 +0800
Subject: [PATCH] 2020-12-12 1.解锁逻辑优化
---
HDL_ON/Entity/DB_ResidenceData.cs | 62 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index f11328a..1ee49bc 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -29,14 +29,14 @@
}
else
{
- var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
+ var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == UserInfo.Current.CurReginID);
if (curRegion == null)
{
if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
{
- CurReginID = UserInfo.Current.regionList[0].RegionID;
+ UserInfo.Current.CurReginID = UserInfo.Current.regionList[0].RegionID;
//鎭㈠澶囦唤
- HDLCommon.Current.RestoreHomeBackup(CurReginID);
+ //HDLCommon.Current.RestoreHomeBackup(CurReginID);
return UserInfo.Current.regionList[0];
}
@@ -45,12 +45,6 @@
return new RegionInfoRes();
}
}
-
- //if (curRegion == null)
- //{
- // CurReginID = UserInfo.Current.regionList[0].RegionID;
- // return UserInfo.Current.regionList[0];
- //}
return curRegion;
}
}
@@ -87,10 +81,6 @@
// }
//}
/// <summary>
- /// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
- /// </summary>
- public string CurReginID = "";
- /// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
public List<ShowFunction> functionTypeList = new List<ShowFunction>();
@@ -104,7 +94,7 @@
{
try
{
- var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData");
+ var residenceDataBytes = Common.FileUtlis.Files.ReadFile("DB_ResidenceData");
var userConfigString = System.Text.Encoding.UTF8.GetString(residenceDataBytes);
DB_ResidenceData temp = null;
@@ -133,8 +123,6 @@
});
instance.SaveResidenceData();
}
-
-
}
catch (Exception ex)
{
@@ -154,9 +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("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
@@ -191,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>
@@ -253,7 +261,7 @@
if (this == null || this.residecenInfo == null)
return;
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
+ Common.FileUtlis.Files.WriteFileByBytes("DB_ResidenceData", ssd);
MainPage.Log("Save DB_ResidenceData");
}
@@ -262,17 +270,19 @@
/// </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;
- public static FunctionList functionList {
+ public static FunctionList functionList
+ {
get
{
- if(_functionList == null)
+ if (_functionList == null)
{
_functionList = FunctionList.List;
}
@@ -299,7 +309,7 @@
{
if (ins_OidList == null)
{
- var bytes = FileUtils.ReadFile(OidSavePathName);
+ var bytes = Common.FileUtlis.Files.ReadFile(OidSavePathName);
if (bytes == null || bytes.Length == 0)
{
ins_OidList = new List<FunctionOid>();
@@ -335,7 +345,7 @@
{
var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);
- FileUtils.WriteFileByBytes(OidSavePathName, oidBytes);
+ Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes);
}
#endregion
--
Gitblit v1.8.0