From d616b67bd6ea95562af73a00bf0aab38eec935df Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 11 十二月 2020 13:37:26 +0800
Subject: [PATCH] 2020-12-11 1.取消屏幕常亮。2.优化iOS接收推送处理。
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
index db68f7b..edfb09d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
@@ -146,8 +146,8 @@
foreach (var function in DB_ResidenceData.functionList.GetAllFunction())
{
- function.roomIdList.Remove(null);
- if (function.roomIdList.Count > 0 )
+ function.roomIds.Remove(null);
+ if (function.roomIds.Count > 0 )
{
allocatedList.Add(function);
}
@@ -165,8 +165,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(582),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealHeight(44),
- Radius = (uint)Application.GetRealHeight(22),
+ Height = Application.GetRealWidth(44),
+ Radius = (uint)Application.GetRealWidth(22),
BackgroundColor = CSS_Color.MainColor,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -328,7 +328,7 @@
Height = Application.GetRealWidth(28),
UnSelectedImagePath = "Public/ChooseIcon.png",
SelectedImagePath = "Public/ChooseOnIcon.png",
- IsSelected = function.roomIdList.Contains(room.sid)
+ IsSelected = function.roomIds.Contains(room.roomId)
};
functionRow.AddChidren(btnChooseIcon);
LoadEvent_ChangeRoomFunctionList(functionRow, btnChooseIcon, function);
@@ -402,7 +402,7 @@
Height = Application.GetRealWidth(1),
BackgroundColor = CSS_Color.DividingLineColor,
});
- foreach (var tempRoom in DB_ResidenceData.rooms)
+ foreach (var tempRoom in DB_ResidenceData.residenceData.Rooms)
{
Button btnRoom = new Button()
@@ -410,16 +410,16 @@
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(128),
Height = Application.GetRealHeight(50),
- Text = tempRoom.name,
+ Text = tempRoom.roomName,
TextColor = CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.SubheadingFontSize,
TextAlignment = TextAlignment.CenterLeft,
- IsSelected = showedFunctionRoomId == tempRoom.sid,
- Tag = tempRoom.sid,
+ IsSelected = showedFunctionRoomId == tempRoom.roomId,
+ Tag = tempRoom.roomId,
};
roomListView.AddChidren(btnRoom);
- LoadEvent_ChangeShowedFunctionList(btnRoom, dialog, tempRoom.name);
+ LoadEvent_ChangeShowedFunctionList(btnRoom, dialog, tempRoom.roomName);
roomListView.AddChidren(new Button()
{
--
Gitblit v1.8.0