From 52005ed57f3f7bc796fdd1a878e4f298a126f1e8 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 16:48:47 +0800
Subject: [PATCH] 2019.10.29-3
---
ZigbeeApp/Shared/Common/House.cs | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
old mode 100755
new mode 100644
index 7d0728e..a634591
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -406,28 +406,31 @@
{
get
{
- return GetFloorName(CurrentFloorId);
+ 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