From 15978205aa7e4aeca8af3d3d34a80a85f0265f63 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期一, 14 十二月 2020 10:42:52 +0800 Subject: [PATCH] 2020-12-14 1.密码锁定错误码处理 --- HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 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..e32c1e8 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); } @@ -62,11 +61,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() { @@ -82,7 +84,7 @@ 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