From ce2a26883e5dccaa0639cfdb4c4045ac7b5d9207 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 20 十二月 2020 17:28:44 +0800
Subject: [PATCH] 2020-12-20 1.报警推送弹窗方案效果修改，点击查看跳转信息中心，实现避免重复弹窗。2.
---
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
old mode 100644
new mode 100755
index 9784475..f1c6834
--- 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 SpatialInfo.CurrentSpatial.RoomList)
{
var roomView = new FrameLayout()
{
@@ -108,7 +108,7 @@
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
- Text = room.floorName + room.name,
+ Text = room.floorName + room.roomName,
};
roomView.AddChidren(btnRoomText);
@@ -120,7 +120,7 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/ChooseIcon.png",
SelectedImagePath = "Public/ChooseOnIcon.png",
- IsSelected = function.roomIds.Contains(room.sid),
+ 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.sid) && btnChooseAll.IsSelected)
+ if (!function.roomIds.Contains(room.roomId) && btnChooseAll.IsSelected)
{
btnChooseAll.IsSelected = false;
}
--
Gitblit v1.8.0