From 9ed4d6675aa1f0abe20e3f84e92f5ac2da8ab4f4 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 12 十二月 2020 20:02:00 +0800
Subject: [PATCH] 20201212-4
---
HDL_ON/Entity/DB_ResidenceData.cs | 83 +++++++++++++++++------------------------
1 files changed, 35 insertions(+), 48 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index f11328a..aacf16e 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -25,19 +25,16 @@
{
if (MainPage.NoLoginMode)
{
- return new RegionInfoRes() { Name = "鏈湴妯″紡" };
+ return new RegionInfoRes() { Name = "鏈湴妯″紡" , };
}
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;
- //鎭㈠澶囦唤
- HDLCommon.Current.RestoreHomeBackup(CurReginID);
-
+ UserInfo.Current.CurReginID = UserInfo.Current.regionList[0].RegionID;
return UserInfo.Current.regionList[0];
}
else
@@ -45,12 +42,6 @@
return new RegionInfoRes();
}
}
-
- //if (curRegion == null)
- //{
- // CurReginID = UserInfo.Current.regionList[0].RegionID;
- // return UserInfo.Current.regionList[0];
- //}
return curRegion;
}
}
@@ -87,10 +78,6 @@
// }
//}
/// <summary>
- /// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
- /// </summary>
- public string CurReginID = "";
- /// <summary>
/// 鍔熻兘绫诲瀷鍒楄〃
/// </summary>
public List<ShowFunction> functionTypeList = new List<ShowFunction>();
@@ -104,7 +91,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,12 +120,12 @@
});
instance.SaveResidenceData();
}
-
-
}
catch (Exception ex)
{
MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
+ instance = new DB_ResidenceData { };
+ return instance;
}
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
@@ -154,9 +141,10 @@
public void EixtAccount()
{
instance = null;
- Rooms = null;
ins_OidList = null;
- functionList = null;
+ HomeGateway = null;
+ SpatialInfo.CurrentSpatial.ClearRooms();
+ FunctionList.List.Clear();
if (MainPage.IsRemote)
{
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
@@ -191,6 +179,24 @@
}
}
}
+
+ /// <summary>
+ /// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
+ /// gatewayId 鍒ょ┖
+ /// </summary>
+ /// <returns></returns>
+ public bool CheckWhetherGatewayIdIsNull()
+ {
+ if (HomeGateway != null && !string.IsNullOrEmpty(HomeGateway.gatewayId))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
/// <summary>
/// 妫�娴嬩綇瀹呮槸鍚︾粦瀹氫簡缃戝叧
/// </summary>
@@ -253,8 +259,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);
- MainPage.Log("Save DB_ResidenceData");
+ Common.FileUtlis.Files.WriteFileByBytes("DB_ResidenceData", ssd);
}
/// <summary>
@@ -262,29 +267,11 @@
/// </summary>
public string CurFoor = Language.StringByID(StringId.All);
- /// <summary>
- /// 鎴块棿鍒楄〃
- /// </summary>
- public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;
-
- #region 鍔熻兘鏁版嵁
- static FunctionList _functionList;
- public static FunctionList functionList {
- get
- {
- if(_functionList == null)
- {
- _functionList = FunctionList.List;
- }
- return _functionList;
- }
- set
- {
- _functionList = value;
- }
- }
-
- #endregion
+ ///// <summary>
+ ///// 鎴块棿鍒楄〃
+ ///// </summary>
+ //[Newtonsoft.Json.JsonIgnore]
+ //public List<Room> Rooms = SpatialInfo.CurrentSpatial.RoomList;
#region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
/// <summary>
@@ -299,7 +286,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 +322,7 @@
{
var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);
- FileUtils.WriteFileByBytes(OidSavePathName, oidBytes);
+ Common.FileUtlis.Files.WriteFileByBytes(OidSavePathName, oidBytes);
}
#endregion
--
Gitblit v1.8.0