From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期四, 03 十二月 2020 15:35:42 +0800 Subject: [PATCH] 2020-12-03-1 --- HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs index 6e11318..4ad76ab 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs @@ -52,6 +52,10 @@ string showedFunctionRoomId = "0"; List<Function> unallocatedList = new List<Function>(); List<Function> allocatedList = new List<Function>(); + /// <summary> + /// 琚慨鏀规暟鎹殑鍔熻兘鍒楄〃锛屽湪闇�瑕佷繚瀛樼殑鏃跺�欏啀淇濆瓨鏁版嵁 + /// </summary> + List<Function> changeList = new List<Function>(); #endregion public RoomEditFunctionPage(Room r) @@ -142,8 +146,8 @@ foreach (var function in DB_ResidenceData.functionList.GetAllFunction()) { - function.roomIdList.Remove(null); - if (function.roomIdList.Count > 0 ) + function.roomIds.Remove(null); + if (function.roomIds.Count > 0 ) { allocatedList.Add(function); } @@ -161,8 +165,8 @@ Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(582), Width = Application.GetRealWidth(220), - Height = Application.GetRealHeight(44), - Radius = (uint)Application.GetRealHeight(22), + Height = Application.GetRealWidth(44), + Radius = (uint)Application.GetRealWidth(22), BackgroundColor = CSS_Color.MainColor, TextColor = CSS_Color.MainBackgroundColor, TextSize = CSS_FontSize.SubheadingFontSize, @@ -174,7 +178,6 @@ LoadEventList(); } - /// <summary> /// 鏄剧ず鍔熻兘Row @@ -306,7 +309,7 @@ var btnFunctionFloorName = new Button() { X = btnFunctionIcon.Right + Application.GetRealWidth(12), - Y = Application.GetRealHeight(50), + Y = Application.GetRealHeight(30), Width = Application.GetRealWidth(200), Height = Application.GetRealHeight(20), Text = function.GetRoomListName(), @@ -325,7 +328,7 @@ Height = Application.GetRealWidth(28), UnSelectedImagePath = "Public/ChooseIcon.png", SelectedImagePath = "Public/ChooseOnIcon.png", - IsSelected = function.roomIdList.Contains(room.sid) + IsSelected = function.roomIds.Contains(room.sid) }; functionRow.AddChidren(btnChooseIcon); LoadEvent_ChangeRoomFunctionList(functionRow, btnChooseIcon, function); -- Gitblit v1.8.0