From 5428935270159bfc42c2934ed7fb1091554fc9a4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 七月 2020 17:12:42 +0800
Subject: [PATCH] 修改了 sokect
---
ZigbeeApp/Shared/Common/House.cs | 43 ++-----------------------------------------
1 files changed, 2 insertions(+), 41 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index d368109..dc7e878 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -60,10 +60,6 @@
/// </summary>
public string ResidenceAddressName = string.Empty;
/// <summary>
- /// 鎴块棿鍒楄〃(鎴块棿鐨処D)
- /// </summary>
- public List<string> ListRooms = new List<string>();
- /// <summary>
/// 妤煎眰瀛楀吀
/// key:FloorId
/// value:FloorName
@@ -109,42 +105,6 @@
#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();
- }
- }
-
- #endregion
-
#region 鈼� 淇濆瓨____________________________
/// <summary>
@@ -160,7 +120,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