From 9c8baf7e7e1169ebdf7d5f7ed33ab29dd5fcbf18 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 17:45:17 +0800
Subject: [PATCH] 2020-12-14 1.解锁设置问题修复，增加面容ID验证。2.错误码对接增加。
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs
index 243228c..e32c1e8 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs
@@ -17,7 +17,7 @@
VerticalScrolViewLayout roomsListView;
- Action<string, string> skipAddRoomAction;
+ Action skipAddRoomAction;
public RoomsManagementPage()
{
@@ -28,8 +28,7 @@
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
LoadEvent_SkipAddRoomPage();
- new TopViewDiv(bodyView, Language.StringByID(StringId.RoomsManagement)).LoadTopView_AddIcon("rooms",skipAddRoomAction);
- //new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.RoomsManagement), "rooms", skipAddRoomAction);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.RoomsManagement)).LoadTopView_RoomTopView(skipAddRoomAction);
roomsListView = new VerticalScrolViewLayout()
{
@@ -38,7 +37,7 @@
};
bodyView.AddChidren(roomsListView);
- foreach(var room in DB_ResidenceData.rooms)
+ foreach(var room in SpatialInfo.CurrentSpatial.RoomList)
{
LoadRoomRow(room);
}
@@ -52,7 +51,7 @@
{
var roomRow = new FrameLayout()
{
- Tag = room.name + "row",
+ Tag = room.roomName + "row",
Height = Application.GetRealHeight(100),
};
roomsListView.AddChidren(roomRow);
@@ -62,11 +61,14 @@
Y = Application.GetRealHeight(10),
Height = Application.GetRealHeight(90),
Width = Application.GetRealWidth(343),
- ImagePath = room.backgroundImage,
+ //ImagePath = room.backgroundImage,
Radius = (uint)Application.GetRealWidth(12),
Gravity = Gravity.CenterHorizontal,
};
roomRow.AddChidren(btnBg);
+
+ //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+ ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, btnBg);
var btnRoomName = new Button()
{
@@ -77,7 +79,7 @@
TextAlignment = TextAlignment.TopLeft,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- Text = room.floorName + room.name,
+ Text = room.floorName + room.roomName,
};
roomRow.AddChidren(btnRoomName);
--
Gitblit v1.8.0