From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Common/House.cs | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 8b7f693..a634591 100644
--- 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
@@ -234,9 +246,6 @@
};
try
{
- //澶嶅師绠＄悊鍛樻爣璇�(鑾峰彇浣忓畢鏃讹紝浣跨敤浠栧師鏉ヨ嚜宸辩殑Token)
- Common.Config.Instance.isAdministrator = false;
-
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("App/GetHomePager", System.Text.Encoding.UTF8.GetBytes(requestJson));
if (revertObj == null)
@@ -261,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");
@@ -382,6 +396,44 @@
#endregion
+ #region 鈼� 妤煎眰____________________________
+
+ /// <summary>
+ /// GetCurrentFloorName
+ /// </summary>
+ /// <returns></returns>
+ public string GetCurrentFloorName
+ {
+ get
+ {
+ return GetFloorNameById(CurrentFloorId);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇妤煎眰鍚嶇О
+ /// </summary>
+ /// <param name="floorId"></param>
+ /// <returns></returns>
+ public string GetFloorNameById(string floorId)
+ {
+ if (Config.Instance.Home.FloorDics.Count == 0)
+ {
+ return null;
+ }
+
+ foreach (var floor in Config.Instance.Home.FloorDics)
+ {
+ if (floorId == floor.Key)
+ {
+ return floor.Value;
+ }
+ }
+ return null;
+ }
+
+ #endregion
+
#region 鈼� 鎴块棿____________________________
#region 鈼� 娣诲姞鎴块棿璺緞_________________________
@@ -442,6 +494,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