From d60b92c58ac09197642eb6dac9b905f0898dacb8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 十二月 2020 15:42:13 +0800
Subject: [PATCH] Merge branch 'CJL-NEW'
---
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..aad410c 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.residenceData.Rooms)
{
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