From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 01 七月 2021 15:19:13 +0800 Subject: [PATCH] 合并嘉乐lc代码 --- HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs | 28 ++++++++++++++++++++-------- 1 files changed, 20 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 a9ab971..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,6 +49,8 @@ /// </summary> void LoadRoomRow(Room room) { + roomsListView.AddChidren(new Button() { Height = Application.GetRealHeight(10) }); + var roomRow = new FrameLayout() { Tag = room.roomName + "row", @@ -57,16 +58,26 @@ }; 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, + //ImagePath = room.backgroundImage, Radius = (uint)Application.GetRealWidth(12), Gravity = Gravity.CenterHorizontal, }; roomRow.AddChidren(btnBg); + + //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶 + ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, btnBg); + + var btn = new Button() + { + UnSelectedImagePath = "RoomListBg.png", + }; + roomRow.AddChidren(btn); var btnRoomName = new Button() { @@ -82,11 +93,12 @@ 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; btnRoomName.MouseUpEventHandler = eventHandler; + btn.MouseUpEventHandler = eventHandler; } } -- Gitblit v1.8.0