From dfa6733793434bdcfd394f978ae72f1628b2260f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 22 四月 2020 16:50:03 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
index 798ab93..bd3a852 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
@@ -1018,9 +1018,11 @@
if (strData != null)
{
listFloorSort = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(strData);
- }
- foreach (string keys in Common.Config.Instance.Home.FloorDics.Keys)
- {
+ }
+
+
+ foreach (string keys in Common.Config.Instance.Home.FloorDics.Keys)
+ {
if (listFloorSort != null)
{
if (listFloorSort.Contains(keys) == false)
@@ -1029,9 +1031,10 @@
listFloorSort.Add(keys);
}
}
- }
-
- var dic = new Dictionary<string, string>();
+
+ }
+
+ var dic = new Dictionary<string, string>();
if (listFloorSort != null)
{
for (int i = 0; i < listFloorSort.Count; i++)
@@ -1042,7 +1045,6 @@
}
}
}
-
//淇濆瓨椤哄簭
UserCenterLogic.SaveFileContent(fullName, listFloorSort);
return dic;
--
Gitblit v1.8.0