From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 16:32:35 +0800
Subject: [PATCH] 上传合并后的代码

---
 ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs b/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
old mode 100644
new mode 100755
index 5ac8557..aa8dd52
--- a/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
@@ -90,9 +90,9 @@
             };
 
             //鑾峰彇妤煎眰
-            if (this.curFloorId == string.Empty)
-            {
-                this.curFloorId = Config.Instance.Home.CurrentFloorId;
+            if (this.curFloorId == string.Empty)
+            {
+                this.curFloorId = Config.Instance.Home.CurrentFloorId;
             }
             var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
             if (dicFloor.Count == 0)
@@ -239,7 +239,7 @@
         private void InitRoomCardControl(int XX, int YY)
         {
             //妗屽竷鎺т欢
-            var frameBack = new FrameLayoutControl();
+            var frameBack = new FrameLayoutStatuControl();
             frameBack.X = XX;
             frameBack.Y = YY;
             frameBack.Width = this.GetPictrueRealSize(495);

--
Gitblit v1.8.0