From d07d62be7111d78b2aaa44c9cdee23a7d22b4dda Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 10:38:15 +0800
Subject: [PATCH] 20201222-1

---
 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
index 1d6d10a..46137ff 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
@@ -499,10 +499,7 @@
                 }
             }
 
-            if (sceneFunction.status.Count == 0)
-            {
-                return sceneFunctionInfo += Language.StringByID(StringId.Open);
-            }
+            sceneFunctionInfo += Language.StringByID(StringId.Open);
 
             var modeState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Mode);
             var tempState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.SetTemp);
@@ -523,12 +520,12 @@
             var briState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Brightness);
             if (briState != null)
             {
-                sceneFunctionInfo += sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
+                sceneFunctionInfo += briState.value + "%";
             }
             var perState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Percent);
             if (perState != null)
             {
-                sceneFunctionInfo += sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
+                sceneFunctionInfo += perState.value + "%";
             }
 
             return sceneFunctionInfo;

--
Gitblit v1.8.0