From af0269cf1d551fb799784df233d8d9c388c6b18b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 16:02:27 +0800
Subject: [PATCH] 合并可视对讲功能
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 5d1ec08..2a48cc0 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -98,7 +98,7 @@
public void LoadPage(Action backRefresh)
{
- DB_ResidenceData.Instance.SupportFacePass
+ //DB_ResidenceData.Instance.sceneChooseRoomId
new TopViewDiv(bodyView, Language.StringByID(StringId.EditScene)).LoadTopView(backRefresh);
initPage();
}
@@ -482,6 +482,13 @@
scene.functions.Remove(scenefunction);
continue;
}
+ //灏唖pk瀹炰綋閲岄潰鐨刴in max鍊兼斁鍏ュ満鏅姛鑳藉疄浣撻噷锛岃涓嶇劧鏁版嵁浼氫涪澶� 2022-06-21 16:06:45
+ foreach (var tt in scenefunction.status) {
+ tt.min = scenefunction.localFunction.GetAttribute(tt.key).min;
+ tt.max = scenefunction.localFunction.GetAttribute(tt.key).max;
+ tt.valueList = scenefunction.localFunction.GetAttribute(tt.key).value;
+ }
+
i++;
var row = new RowLayout()
{
--
Gitblit v1.8.0