From eb51679c618d5027070fbd6f3c0519f0f17e7d7d Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期一, 23 十一月 2020 10:07:53 +0800 Subject: [PATCH] Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into 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