From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1
---
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
index ab86b2c..9784475 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
@@ -5,6 +5,9 @@
namespace HDL_ON.UI
{
+ /// <summary>
+ /// 鍔熻兘鍒嗛厤鎴块棿鐣岄潰
+ /// </summary>
public partial class ChooseRoomPage : FrameLayout
{
#region 鎺т欢鍒楄〃
@@ -79,7 +82,7 @@
};
allRoomView.AddChidren(btnChooseAll);
- foreach(var room in DB_ResidenceData.residenceData.rooms)
+ foreach(var room in DB_ResidenceData.rooms)
{
var roomView = new FrameLayout()
{
@@ -105,7 +108,7 @@
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
- Text = room.floor + " " + room.name,
+ Text = room.floorName + room.name,
};
roomView.AddChidren(btnRoomText);
@@ -117,7 +120,7 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/ChooseIcon.png",
SelectedImagePath = "Public/ChooseOnIcon.png",
- IsSelected = function.roomIdList.Contains(room.sid),
+ IsSelected = function.roomIds.Contains(room.sid),
Tag = "ChooseIcon"
};
roomView.AddChidren(btnChoose);
@@ -126,7 +129,7 @@
LoadEvent_RoomSelected(room, btnChoose.IsSelected);
};
- if (!function.roomIdList.Contains(room.sid) && btnChooseAll.IsSelected)
+ if (!function.roomIds.Contains(room.sid) && btnChooseAll.IsSelected)
{
btnChooseAll.IsSelected = false;
}
--
Gitblit v1.8.0