From c6b35c3138b944830b5336bf610f918154dd47c7 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 12 十月 2019 15:45:10 +0800
Subject: [PATCH] 合并门锁,完成住宅管理

---
 ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
index 724b35e..4c66ad9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
@@ -20,10 +20,6 @@
         /// </summary>
         private string floorKeys = string.Empty;
         /// <summary>
-        /// 鍏ㄩ儴鐨勯『搴�
-        /// </summary>
-        private Dictionary<string, List<string>> dicAllSort = new Dictionary<string, List<string>>();
-        /// <summary>
         /// 鎴块棿椤哄簭
         /// </summary>
         private List<string> listRoomSort = new List<string>();
@@ -127,7 +123,8 @@
             }
             frameRow.frameTable.ButtonClickEvent += (sender, e) =>
             {
-
+                var form = new LookRoomSettionForm();
+                form.AddForm(room);
             };
 
             if (room.IsSharedRoom == true)
@@ -169,6 +166,12 @@
                         Common.Room.CurrentRoom = Common.Room.Lists[0];
                     }
                     Common.Room.CurrentRoom.Remove(room.FileName);
+                    //璋冩暣楂樺害
+                    frameRow.RemoveFromParent();
+                    listView.AdjustRealHeight(Application.GetRealHeight(23));
+                    //淇濆瓨椤哄簭
+                    this.listRoomSort.Remove(room.Id);
+                    Common.Room.CurrentRoom.SaveRoomSort(floorKeys, this.listRoomSort);
                 });
             };
         }

--
Gitblit v1.8.0