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/SetSceneFunctionInfoPage.cs | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
index 4973f51..b82e1f8 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -70,6 +70,9 @@
case FunctionAttributeKey.RGB:
LoadFunctionRow(sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.RGB));
break;
+ case "angle"://瑙掑害
+ LoadFunctionRow(sceneFunction.status.Find((obj) => obj.key == "angle"));
+ break;
}
}
@@ -148,7 +151,15 @@
if (temp != null)
{
- temp = sceneFunction;
+ temp.delay = sceneFunction.delay;
+ foreach(var attr in sceneFunction.status)
+ {
+ var keva = temp.status.Find((obj) => obj.key == attr.key);
+ if (keva != null)
+ {
+ keva.value = attr.value;
+ }
+ }
}
else
{
@@ -345,6 +356,10 @@
case FunctionAttributeKey.FadeTime:
break;
+ case "angle":
+ //鍛堢幇鐨勫脊绐�
+
+ break;
case "cct":
LoadEditDialog_CCT(sceneStatus, btnFunctionText);
break;
--
Gitblit v1.8.0