From e34270918f2e831048114ecdfcfec3e3cdbb6fd7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 26 五月 2022 17:42:58 +0800
Subject: [PATCH] Merge branch 'release0123' into wxr0114
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
index 5f4966d..8f089d6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
@@ -156,9 +156,33 @@
{
unallocatedList.Add(function);
}
+
+ }
+ if (string.IsNullOrEmpty(DB_ResidenceData.Instance.sceneChooseRoomId))
+ {
+ LoadFunctionListRow(null);
+ }
+ else
+ {
+ var selectedRoom = Room.CurrentSpatial.RoomList.Find((obj) => obj.uid == DB_ResidenceData.Instance.sceneChooseRoomId);
+
+ var listAllFun = new List<Function>();
+ var listFun = new List<Function>();
+ listAllFun.AddRange(unallocatedList);
+ listAllFun.AddRange(allocatedList);
+
+ btnFloor.Text = selectedRoom.floorRoomName;
+ foreach(var funtion in listAllFun)
+ {
+ if (funtion.roomIds.Contains(selectedRoom.roomId))
+ {
+ listFun.Add(funtion);
+ }
+ }
+ LoadFunctionListRow(listFun);
+
}
- LoadFunctionListRow(null);
LoadEventList();
}
@@ -278,6 +302,7 @@
form.ShowDeviceFunctionView(btnFloor, listAllFun, (selectId, listFun) =>
{
nowSelectId = selectId;
+ DB_ResidenceData.Instance.sceneChooseRoomId = selectId;
//閲嶆柊鍒锋柊璁惧鍒楄〃
this.LoadFunctionListRow(listFun);
}, nowSelectId);
--
Gitblit v1.8.0