From 9bea5849559521fe09b681025958886e9d6e2d74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 24 十二月 2019 14:29:51 +0800
Subject: [PATCH] 2019.12.24

---
 ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
index c6f94e4..48758ba 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
@@ -20,6 +20,19 @@
 
         public FrameLayout itemView;
 
+        static RoomManagement roomManagement;
+        public static RoomManagement Instance
+        {
+            get
+            {
+                if (roomManagement == null)
+                {
+                    roomManagement = new RoomManagement { };
+                }
+                return roomManagement;
+            }
+        }
+
         #endregion
 
 
@@ -35,6 +48,8 @@
         /// </summary>
         public void Show()
         {
+            RemoveAll();
+
             AddTop();
 
             AddBodyView(Config.Instance.Home.CurrentFloorId);
@@ -150,7 +165,7 @@
                     var room = roomList[i];
                     var roomView = new RoomMainView(xx, yy);
                     itemView.AddChidren(roomView);
-                    roomView.Init();
+                    roomView.Init(this,room);
                     roomView.SetRoomName(room.Name);
                     roomView.SetRoomIcon(room.BackgroundImage);
                 }
@@ -172,9 +187,10 @@
         /// <summary>
         /// 鎴块棿绠$悊鐣岄潰
         /// </summary>
-        void RoomPage()
+        public RoomManagement()
         {
             BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+            roomManagement = this;
         }
 
         /// <summary>

--
Gitblit v1.8.0