From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs | 62 ++++++++++++++-----------------
1 files changed, 28 insertions(+), 34 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs
index a0e6a01..5b18a2d 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("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);
}
@@ -50,61 +49,56 @@
/// </summary>
void LoadRoomRow(Room room)
{
- roomsListView.AddChidren(new Button()
- {
- Height = Application.GetRealHeight(8),
- Tag = room.name+"line",
- });
+ roomsListView.AddChidren(new Button() { Height = Application.GetRealHeight(10) });
var roomRow = new FrameLayout()
{
- Gravity = Gravity.CenterHorizontal,
- Tag = room.name + "row",
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(92),
- Radius = (uint)Application.GetRealWidth(12),
+ Tag = room.roomName + "row",
+ Height = Application.GetRealHeight(100),
};
roomsListView.AddChidren(roomRow);
- var btnBg = new Button()
+
+ var btnBg = new ImageView()
{
- Y = Application.GetRealHeight(0 - (192 - 92) / 2),
+ Y = Application.GetRealHeight(-50),
Height = Application.GetRealHeight(192),
- UnSelectedImagePath = room.backgroundImage,
+ Width = Application.GetRealWidth(343),
+ //ImagePath = room.backgroundImage,
Radius = (uint)Application.GetRealWidth(12),
+ Gravity = Gravity.CenterHorizontal,
};
roomRow.AddChidren(btnBg);
- //ImageView imageView = new ImageView()
- //{
- // Height = Application.GetRealHeight(92),
- // Radius = (uint)Application.GetRealWidth(12),
- //};
- //roomRow.AddChidren(imageView);
+ //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+ ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, btnBg);
- var btnShadow = new Button()
+ var btn = new Button()
{
- BackgroundColor = 0x19333333,
+ UnSelectedImagePath = "RoomListBg.png",
};
- roomRow.AddChidren(btnShadow);
+ roomRow.AddChidren(btn);
var btnRoomName = new Button()
{
- X = Application.GetRealWidth(12),
- Y = Application.GetRealHeight(10),
+ X = Application.GetRealWidth(28),
+ Y = Application.GetRealHeight(21),
Width = Application.GetRealWidth(266),
- Height = Application.GetRealHeight(26),
- TextAlignment = TextAlignment.CenterLeft,
+ Height = Application.GetRealHeight(22),
+ TextAlignment = TextAlignment.TopLeft,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- Text = room.floorName + room.name,
+ Text = room.floorName + room.roomName,
};
roomRow.AddChidren(btnRoomName);
- btnShadow.MouseUpEventHandler += (sender, e) =>
- {
- LoadEvent_SkipEditRoomPage(room, btnRoomName, btnBg);
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+ LoadEvent_SkipEditRoomPage(room, btnRoomName, btnBg, roomRow);
};
+ btnBg.MouseUpEventHandler = eventHandler;
+ roomRow.MouseUpEventHandler = eventHandler;
+ btnRoomName.MouseUpEventHandler = eventHandler;
+ btn.MouseUpEventHandler = eventHandler;
}
}
--
Gitblit v1.8.0