From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
index b1b2340..f588139 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
@@ -17,6 +17,7 @@
/// </summary>
VerticalScrolViewLayout contentView;
+ Button btnAllRoomText;
Button btnChooseAll;
#endregion
@@ -59,17 +60,6 @@
};
contentView.AddChidren(allRoomView);
- Button btnAllRoomText = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(280),
- TextID = StringId.All,
- TextSize= CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextAlignment = TextAlignment.CenterLeft,
- };
- allRoomView.AddChidren(btnAllRoomText);
-
btnChooseAll = new Button()
{
X = Application.GetRealWidth(331),
@@ -82,7 +72,18 @@
};
allRoomView.AddChidren(btnChooseAll);
- foreach(var room in DB_ResidenceData.residenceData.rooms)
+ btnAllRoomText = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ TextID = StringId.All,
+ TextSize= CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ allRoomView.AddChidren(btnAllRoomText);
+
+
+ foreach(var room in SpatialInfo.CurrentSpatial.RoomList)
{
var roomView = new FrameLayout()
{
@@ -101,17 +102,6 @@
};
roomView.AddChidren(btnLine);
- Button btnRoomText = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(280),
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextAlignment = TextAlignment.CenterLeft,
- Text = room.floor + " " + room.name,
- };
- roomView.AddChidren(btnRoomText);
-
Button btnChoose = new Button()
{
X = Application.GetRealWidth(331),
@@ -120,16 +110,27 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/ChooseIcon.png",
SelectedImagePath = "Public/ChooseOnIcon.png",
- IsSelected = function.roomIdList.Contains(room.sid),
+ IsSelected = function.roomIds.Contains(room.roomId),
Tag = "ChooseIcon"
};
roomView.AddChidren(btnChoose);
- btnChoose.MouseUpEventHandler = (sender, e) => {
+
+ Button btnRoomText = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ //Width = Application.GetRealWidth(280),
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = room.floorName + room.roomName,
+ };
+ roomView.AddChidren(btnRoomText);
+ btnRoomText.MouseUpEventHandler = (sender, e) => {
btnChoose.IsSelected = !btnChoose.IsSelected;
LoadEvent_RoomSelected(room, btnChoose.IsSelected);
};
- if (!function.roomIdList.Contains(room.sid) && btnChooseAll.IsSelected)
+ if (!function.roomIds.Contains(room.roomId) && btnChooseAll.IsSelected)
{
btnChooseAll.IsSelected = false;
}
--
Gitblit v1.8.0