From 2ed75b8b337048e5d75e6d9ec8307633134f02fd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 10 十月 2019 11:33:04 +0800
Subject: [PATCH] 个人中心添加楼层和创建房间，实装二级验证
---
ZigbeeApp/Shared/Common/House.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 29609c6..1d6815e 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -54,6 +54,17 @@
public List<string> RoomFilePathList = new List<string> { };
/// <summary>
+ /// 妤煎眰瀛楀吀
+ /// key:FloorId
+ /// value:FloorName
+ /// </summary>
+ public Dictionary<string,string> FloorDics = new Dictionary<string,string> { };
+ /// <summary>
+ /// 褰撳墠妤煎眰
+ /// </summary>
+ public string CurrentFloorId;
+
+ /// <summary>
/// 鍏ㄥ眬鍦烘櫙璺緞鍒楄〃---澶囩敤
/// </summary>
public List<string> SceneFilePathList = new List<string> { };
@@ -170,6 +181,7 @@
}
home.Name = houseName;
home.Save();
+ Config.Instance.Save();
}
#endregion
@@ -258,6 +270,11 @@
}
else
{
+ if (Config.Instance.HomeId == string.Empty && responseDataObj.PageData.Count > 0)
+ {
+ //璧嬩竴涓垵濮嬪��
+ Config.Instance.HomeId = responseDataObj.PageData[0].Id;
+ }
foreach (var residence in responseDataObj.PageData)
{
Config.Instance.HomeFilePathList.Add($"House_{residence.Id}.json");
@@ -379,6 +396,38 @@
#endregion
+ #region 鈼� 妤煎眰____________________________
+
+ /// <summary>
+ /// GetCurrentFloorName
+ /// </summary>
+ /// <returns></returns>
+ public string GetCurrentFloorName()
+ {
+ return GetFloorName(CurrentFloorId);
+ }
+
+ /// <summary>
+ /// GetFloorName
+ /// </summary>
+ /// <param name="floorId"></param>
+ /// <returns></returns>
+ public string GetFloorName(string floorId)
+ {
+ if (string.IsNullOrEmpty(floorId))
+ {
+ return null;
+ }
+ if (Config.Instance.Home.FloorDics.Count == 0 || Config.Instance.Home.FloorDics.ContainsKey(floorId) == false)
+ {
+ return null;
+ }
+ return Config.Instance.Home.FloorDics[floorId];
+ }
+
+
+ #endregion
+
#region 鈼� 鎴块棿____________________________
#region 鈼� 娣诲姞鎴块棿璺緞_________________________
@@ -439,6 +488,10 @@
}
path = System.IO.Path.Combine(path, FileName);
Shared.IO.FileUtils.WriteFileByBytes(path, System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
+ if (autoBackup == true && Id == Config.Instance.HomeId)
+ {
+ HdlAutoBackupLogic.AddOrEditorFile(FileName);
+ }
}
#endregion
}
--
Gitblit v1.8.0