From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Common/House.cs | 70 ++++-------------------------------
1 files changed, 8 insertions(+), 62 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index d368109..e726972 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -60,19 +60,11 @@
/// </summary>
public string ResidenceAddressName = string.Empty;
/// <summary>
- /// 鎴块棿鍒楄〃(鎴块棿鐨処D)
- /// </summary>
- public List<string> ListRooms = new List<string>();
- /// <summary>
/// 妤煎眰瀛楀吀
/// key:FloorId
/// value:FloorName
/// </summary>
public Dictionary<string,string> FloorDics = new Dictionary<string,string> { };
- /// <summary>
- /// 褰撳墠妤煎眰Id
- /// </summary>
- public string CurrentFloorId = string.Empty;
#endregion
@@ -86,62 +78,15 @@
public string GetCurrentFloorName
{
get
- {
+ {
return HdlResidenceLogic.Current.GetFloorNameById(CurrentFloorId);
}
- }
-
- /// <summary>
- /// 璁剧疆褰撳墠妤煎眰鐨処D
+ }
+ /// <summary>
+ /// 褰撳墠妤煎眰ID
/// </summary>
- public void SetCurrentFloorId()
- {
- if (Config.Instance.Home.FloorDics.Count > 0 && string.IsNullOrEmpty(CurrentFloorId))
- {
- foreach (var floor in Config.Instance.Home.FloorDics)
- {
- CurrentFloorId = floor.Key;
- Save(false);
- return;
- }
- }
- }
-
- #endregion
-
- #region 鈼� 娣诲姞鎴块棿璺緞_________________________
-
- /// <summary>
- /// 娣诲姞鎴块棿ID
- /// </summary>
- /// <returns><c>true</c>, if room list file path was added, <c>false</c> otherwise.</returns>
- /// <param name="roomFilePath">Room file path.</param>
- public void AddRoomId(string roomId)
- {
- if (ListRooms.Contains(roomId) == false)
- {
- ListRooms.Add(roomId);
- this.Save();
- }
- }
-
- #endregion
-
- #region 鈼� 鍒犻櫎鎴块棿璺緞_________________________
-
- /// <summary>
- /// 绉婚櫎鎴块棿Id
- /// </summary>
- /// <returns><c>true</c>, if room list file path was added, <c>false</c> otherwise.</returns>
- /// <param name="roomFilePath">Room file path.</param>
- public void RemoveRoomId(string roomId)
- {
- if (ListRooms.Contains(roomId)==true)
- {
- ListRooms.Remove(roomId);
- Save();
- }
- }
+ [Newtonsoft.Json.JsonIgnore]
+ public string CurrentFloorId = string.Empty;
#endregion
@@ -160,7 +105,8 @@
System.IO.Directory.CreateDirectory(path);
}
path = System.IO.Path.Combine(path, FileName);
- Shared.IO.FileUtils.WriteFileByBytes(path, System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
+ HdlFileLogic.Current.SaveFileContent(path, this);
+
if (autoBackup == true && Id == Config.Instance.HomeId)
{
HdlAutoBackupLogic.AddOrEditorFile(FileName);
--
Gitblit v1.8.0