From 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:16:00 +0800
Subject: [PATCH] Merge branch 'NewFilePath'
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs | 26 +++++++++++++++++++-------
1 files changed, 19 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 b302aaf..8bb99ac 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
@@ -56,14 +56,27 @@
/// 琚慨鏀规暟鎹殑鍔熻兘鍒楄〃锛屽湪闇�瑕佷繚瀛樼殑鏃跺�欏啀淇濆瓨鏁版嵁
/// </summary>
List<Function> changeList = new List<Function>();
+ /// <summary>
+ /// 鏂板鐨勬埧闂寸粦瀹氬姛鑳戒簨浠讹紝鐢ㄦ埛纭畾鐢熸垚鎴块棿涔嬪悗锛屽啀灏嗗姛鑳界粦瀹氬埌鎴块棿
+ /// </summary>
+ Action<List<Function>> newRoomAddFunction;
#endregion
-
+ /// <summary>
+ /// 缂栬緫鐜版湁鎴块棿鐨勬瀯閫犲嚱鏁�
+ /// </summary>
+ /// <param name="r"></param>
public RoomEditFunctionPage(Room r)
{
bodyView = this;
room = r;
}
+ public RoomEditFunctionPage(Room r, Action<List<Function>> action)
+ {
+ bodyView = this;
+ room = r;
+ newRoomAddFunction = action;
+ }
/// <summary>
/// 鍔犺浇鐣岄潰
/// </summary>
@@ -71,7 +84,6 @@
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
new TopViewDiv(bodyView, Language.StringByID(StringId.AddFunction)).LoadTopView();
- //new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.AddFunction));
#region 鏄剧ず鐨勫姛鑳界被鍨嬪垏鎹㈠尯鍩�
showdFunctionTypeRow = new FrameLayout()
@@ -144,7 +156,7 @@
};
bodyView.AddChidren(functionListView);
- foreach (var function in DB_ResidenceData.functionList.GetAllFunction())
+ foreach (var function in FunctionList.List.GetDeviceFunctionList())
{
function.roomIds.Remove(null);
if (function.roomIds.Count > 0 )
@@ -328,7 +340,7 @@
Height = Application.GetRealWidth(28),
UnSelectedImagePath = "Public/ChooseIcon.png",
SelectedImagePath = "Public/ChooseOnIcon.png",
- IsSelected = function.roomIds.Contains(room.uid)
+ IsSelected = function.roomIds.Contains(room.roomId)
};
functionRow.AddChidren(btnChooseIcon);
LoadEvent_ChangeRoomFunctionList(functionRow, btnChooseIcon, function);
@@ -402,7 +414,7 @@
Height = Application.GetRealWidth(1),
BackgroundColor = CSS_Color.DividingLineColor,
});
- foreach (var tempRoom in DB_ResidenceData.Rooms)
+ foreach (var tempRoom in SpatialInfo.CurrentSpatial.RoomList)
{
Button btnRoom = new Button()
@@ -415,8 +427,8 @@
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.SubheadingFontSize,
TextAlignment = TextAlignment.CenterLeft,
- IsSelected = showedFunctionRoomId == tempRoom.uid,
- Tag = tempRoom.uid,
+ IsSelected = showedFunctionRoomId == tempRoom.roomId,
+ Tag = tempRoom.roomId,
};
roomListView.AddChidren(btnRoom);
LoadEvent_ChangeShowedFunctionList(btnRoom, dialog, tempRoom.roomName);
--
Gitblit v1.8.0