Merge branch 'CJL' into NewFilePath

wxr

2020-12-22 7ddc5830cc495d69119b9b0ae33353397bd0521f

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs

@@ -520,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;