From 8b4d79ca03495e522a1953e04ca17527f33c853a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 13:22:17 +0800
Subject: [PATCH] 合并完成代码
---
ZigbeeApp/Shared/Common/House.cs | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 1d6815e..a76d259 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -307,6 +307,11 @@
Config.Instance.HomeId = GetHouseIdByFilePath(Config.Instance.HomeFilePathList[0]);
}
Config.Instance.Save();
+ //妫�娴嬩綇瀹呭璞�
+ if (Config.Instance.Home.Id == string.Empty)
+ {
+ Config.Instance.Home = House.GetHouseByHouseId(Config.Instance.HomeId);
+ }
}
}
}
@@ -402,29 +407,35 @@
/// GetCurrentFloorName
/// </summary>
/// <returns></returns>
- public string GetCurrentFloorName()
+ public string GetCurrentFloorName
{
- return GetFloorName(CurrentFloorId);
+ get
+ {
+ return GetFloorNameById(CurrentFloorId);
+ }
}
/// <summary>
- /// GetFloorName
+ /// 鑾峰彇妤煎眰鍚嶇О
/// </summary>
/// <param name="floorId"></param>
/// <returns></returns>
- public string GetFloorName(string floorId)
+ public string GetFloorNameById(string floorId)
{
- if (string.IsNullOrEmpty(floorId))
+ if (Config.Instance.Home.FloorDics.Count == 0)
{
return null;
}
- if (Config.Instance.Home.FloorDics.Count == 0 || Config.Instance.Home.FloorDics.ContainsKey(floorId) == false)
- {
- return null;
- }
- return Config.Instance.Home.FloorDics[floorId];
- }
+ foreach (var floor in Config.Instance.Home.FloorDics)
+ {
+ if (floorId == floor.Key)
+ {
+ return floor.Value;
+ }
+ }
+ return null;
+ }
#endregion
--
Gitblit v1.8.0