From 86325cf53601d57fff61b6bf77da9c7d341a9327 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 24 八月 2023 18:15:11 +0800
Subject: [PATCH] 2023年08月24日18:14:58
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
index 0974ade..5cb0afd 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -27,8 +27,8 @@
public SceneFunctionInfoEditPage(Scene s, SceneFunction fc,Action action)
{
- bodyView = this;
- scene = s;
+ bodyView = this;
+ scene = s;
sceneFunction = fc.localFunction.ConvertSceneFunction();
foreach(var ll in sceneFunction.status)
{
@@ -61,11 +61,18 @@
bodyView.AddChidren(contentView);
var onOffStatus = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff);
- if(onOffStatus.value == "on")
+ if (onOffStatus != null)
+ {
+ if (onOffStatus.value == "on")
+ {
+ isOnStatus = true;
+ }
+ LoadFunctionRow(onOffStatus);
+ }
+ else
{
isOnStatus = true;
}
- LoadFunctionRow(onOffStatus);
if (sceneFunction.localFunction.spk == SPK.LightRGB || sceneFunction.localFunction.spk == SPK.GroupControl)
{
@@ -179,8 +186,11 @@
}
else
{
- sceneFunction.status.Clear();
- sceneFunction.status.Add(new SceneFunctionStatus() { key = FunctionAttributeKey.OnOff, value = "off" });
+ if (sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff) != null)
+ {
+ sceneFunction.status.Clear();
+ sceneFunction.status.Add(new SceneFunctionStatus() { key = FunctionAttributeKey.OnOff, value = "off" });
+ }
}
}
var temp = scene.functions.Find((obj) => obj.sid == sceneFunction.sid);
--
Gitblit v1.8.0