From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android,没调用拒接接口问题。

---
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs
index ff52f30..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_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);
             }
@@ -50,17 +49,20 @@
         /// </summary>
         void LoadRoomRow(Room room)
         {
+            roomsListView.AddChidren(new Button() { Height = Application.GetRealHeight(10) });
+
             var roomRow = new FrameLayout()
             {
-                Tag = room.name + "row",
+                Tag = room.roomName + "row",
                 Height = Application.GetRealHeight(100),
             };
             roomsListView.AddChidren(roomRow);
 
+
             var btnBg = new ImageView()
             {
-                Y = Application.GetRealHeight(10),
-                Height = Application.GetRealHeight(90),
+                Y = Application.GetRealHeight(-50),
+                Height = Application.GetRealHeight(192),
                 Width = Application.GetRealWidth(343),
                 //ImagePath = room.backgroundImage,
                 Radius = (uint)Application.GetRealWidth(12),
@@ -71,6 +73,12 @@
             //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
             ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, btnBg);
 
+            var btn = new Button()
+            {
+                UnSelectedImagePath = "RoomListBg.png",
+            };
+            roomRow.AddChidren(btn);
+
             var btnRoomName = new Button()
             {
                 X = Application.GetRealWidth(28),
@@ -80,7 +88,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);
 
@@ -90,6 +98,7 @@
             btnBg.MouseUpEventHandler = eventHandler;
             roomRow.MouseUpEventHandler = eventHandler;
             btnRoomName.MouseUpEventHandler = eventHandler;
+            btn.MouseUpEventHandler = eventHandler;
         }
 
     }

--
Gitblit v1.8.0