From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs | 12 +++++++-----
1 files changed, 7 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 8b61727..f704fa8 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 DB_ResidenceData.residenceData.Rooms)
{
LoadRoomRow(room);
}
@@ -62,12 +61,15 @@
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()
{
X = Application.GetRealWidth(28),
--
Gitblit v1.8.0