From 3fcb73db484d2bed5ee993702913a7eaea68068c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 八月 2023 18:01:23 +0800
Subject: [PATCH] 2.1.2

---
 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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..e730aaa 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -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