From bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 14:06:36 +0800
Subject: [PATCH] 20201217-1

---
 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
index 3b56c1e..f1c6834 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
@@ -82,7 +82,7 @@
             };
             allRoomView.AddChidren(btnChooseAll);
 
-            foreach(var room in DB_ResidenceData.Rooms)
+            foreach(var room in SpatialInfo.CurrentSpatial.RoomList)
             {
                 var roomView = new FrameLayout()
                 {
@@ -120,7 +120,7 @@
                     Height = Application.GetMinRealAverage(28),
                     UnSelectedImagePath = "Public/ChooseIcon.png",
                     SelectedImagePath = "Public/ChooseOnIcon.png",
-                    IsSelected = function.roomIds.Contains(room.uid),
+                    IsSelected = function.roomIds.Contains(room.roomId),
                     Tag = "ChooseIcon"
                 };
                 roomView.AddChidren(btnChoose);
@@ -129,7 +129,7 @@
                     LoadEvent_RoomSelected(room, btnChoose.IsSelected);
                 };
 
-                if (!function.roomIds.Contains(room.uid) && btnChooseAll.IsSelected)
+                if (!function.roomIds.Contains(room.roomId) && btnChooseAll.IsSelected)
                 {
                     btnChooseAll.IsSelected = false;
                 }

--
Gitblit v1.8.0