From 64dbbfe1d6488635e160189a704afccffc7d34d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 07 十二月 2020 11:33:06 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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..e7dbd12 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.uid)
};
functionRow.AddChidren(btnChooseIcon);
LoadEvent_ChangeRoomFunctionList(functionRow, btnChooseIcon, function);
@@ -399,7 +402,7 @@
Height = Application.GetRealWidth(1),
BackgroundColor = CSS_Color.DividingLineColor,
});
- foreach (var tempRoom in DB_ResidenceData.rooms)
+ foreach (var tempRoom in DB_ResidenceData.residenceData.Rooms)
{
Button btnRoom = new Button()
@@ -407,16 +410,16 @@
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(128),
Height = Application.GetRealHeight(50),
- Text = tempRoom.name,
+ Text = tempRoom.roomName,
TextColor = CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.SubheadingFontSize,
TextAlignment = TextAlignment.CenterLeft,
- IsSelected = showedFunctionRoomId == tempRoom.sid,
- Tag = tempRoom.sid,
+ IsSelected = showedFunctionRoomId == tempRoom.uid,
+ Tag = tempRoom.uid,
};
roomListView.AddChidren(btnRoom);
- LoadEvent_ChangeShowedFunctionList(btnRoom, dialog, tempRoom.name);
+ LoadEvent_ChangeShowedFunctionList(btnRoom, dialog, tempRoom.roomName);
roomListView.AddChidren(new Button()
{
--
Gitblit v1.8.0