From dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 04 十二月 2020 16:06:47 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs
index e5e2666..adb9611 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs
@@ -38,7 +38,7 @@
};
bodyView.AddChidren(roomsListView);
- foreach(var room in DB_ResidenceData.rooms)
+ foreach(var room in DB_ResidenceData.residenceData.Rooms)
{
LoadRoomRow(room);
}
@@ -52,7 +52,7 @@
{
var roomRow = new FrameLayout()
{
- Tag = room.name + "row",
+ Tag = room.roomName + "row",
Height = Application.GetRealHeight(100),
};
roomsListView.AddChidren(roomRow);
@@ -62,11 +62,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,12 +80,12 @@
TextAlignment = TextAlignment.TopLeft,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- Text = room.floorName + room.name,
+ Text = room.floorName + room.roomName,
};
roomRow.AddChidren(btnRoomName);
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
- LoadEvent_SkipEditRoomPage(room, btnRoomName, btnBg);
+ LoadEvent_SkipEditRoomPage(room, btnRoomName, btnBg, roomRow);
};
btnBg.MouseUpEventHandler = eventHandler;
roomRow.MouseUpEventHandler = eventHandler;
--
Gitblit v1.8.0