From 4cb0cb32a69b8b4586e35d2e5383cb9051679538 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期二, 17 五月 2022 13:56:26 +0800
Subject: [PATCH] Merge branch 'dev-CQY' into dev
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs | 10 +++++++++-
1 files changed, 9 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..97d6306 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -148,7 +148,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
{
--
Gitblit v1.8.0