From 387383a243879bf8c63a4611e2ed2c5a519e218d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 十一月 2020 18:14:29 +0800
Subject: [PATCH] Merge branch 'CJL'
---
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
index b1b2340..e7c078d 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.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.floor + " " + room.name,
+ Text = room.floorName + room.name,
};
roomView.AddChidren(btnRoomText);
--
Gitblit v1.8.0