From 30b5770f56f99c1f92e933ad31cf7d2af58b033c Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 02 十二月 2020 16:31:48 +0800
Subject: [PATCH] 20201202

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

diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
index 9784475..3b56c1e 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 DB_ResidenceData.Rooms)
             {
                 var roomView = new FrameLayout()
                 {
@@ -108,7 +108,7 @@
                     TextSize = CSS_FontSize.SubheadingFontSize,
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     TextAlignment = TextAlignment.CenterLeft,
-                    Text = room.floorName + room.name,
+                    Text = room.floorName + room.roomName,
                 };
                 roomView.AddChidren(btnRoomText);
 
@@ -120,7 +120,7 @@
                     Height = Application.GetMinRealAverage(28),
                     UnSelectedImagePath = "Public/ChooseIcon.png",
                     SelectedImagePath = "Public/ChooseOnIcon.png",
-                    IsSelected = function.roomIds.Contains(room.sid),
+                    IsSelected = function.roomIds.Contains(room.uid),
                     Tag = "ChooseIcon"
                 };
                 roomView.AddChidren(btnChoose);
@@ -129,7 +129,7 @@
                     LoadEvent_RoomSelected(room, btnChoose.IsSelected);
                 };
 
-                if (!function.roomIds.Contains(room.sid) && btnChooseAll.IsSelected)
+                if (!function.roomIds.Contains(room.uid) && btnChooseAll.IsSelected)
                 {
                     btnChooseAll.IsSelected = false;
                 }

--
Gitblit v1.8.0