Merge branch 'WJC' into NewFilePath

wxr

2020-12-22 64b84c33e8733228c624d07229026470497eb417

 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;