1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

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

@@ -504,29 +504,29 @@
        string GetFunctionScnenInfo(Function sceneFunction)
        {
            string sceneFunctionInfo = Language.StringByID(StringId.Close);
            if (sceneFunction.trait_on_off.value.ToString() == "off")
            if (sceneFunction.trait_on_off.curValue.ToString() == "off")
                return sceneFunctionInfo;
            sceneFunctionInfo = "";
            Trait perTrait;
            FunctionAttributes perTrait;

            switch (sceneFunction.functionType)
            {
                case FunctionType.AC:
                    sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.name == "mode").GetCurValueText();
                    sceneFunctionInfo += " " + sceneFunction.function.Find((obj) => obj.name == "set_temperature").value.ToString() +
                         sceneFunction.function.Find((obj) => obj.name == "set_temperature").uintString;
                    sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.name == "fan").GetCurValueText();
                    sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.key == "mode").GetCurValueText();
                    sceneFunctionInfo += " " + sceneFunction.function.Find((obj) => obj.key == "set_temperature").curValue.ToString() +
                         sceneFunction.function.Find((obj) => obj.key == "set_temperature").uintString;
                    sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.key == "fan").GetCurValueText();
                    break;
                case FunctionType.FloorHeating:
                    sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.name == "mode").GetCurValueText();
                    sceneFunctionInfo += " " + sceneFunction.function.Find((obj) => obj.name == "set_temperature").value.ToString() +
                         sceneFunction.function.Find((obj) => obj.name == "set_temperature").uintString;
                    sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.key == "mode").GetCurValueText();
                    sceneFunctionInfo += " " + sceneFunction.function.Find((obj) => obj.key == "set_temperature").curValue.ToString() +
                         sceneFunction.function.Find((obj) => obj.key == "set_temperature").uintString;
                    break;
                case FunctionType.Dimmer:
                    perTrait = sceneFunction.function.Find((obj) => obj.name == "brightness");
                    perTrait = sceneFunction.function.Find((obj) => obj.key == "brightness");
                    if (perTrait != null)
                    {
                        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.name == "brightness").value.ToString() + "%";
                        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
                    }
                    else
                    {
@@ -537,10 +537,10 @@
                    sceneFunctionInfo += Language.StringByID(StringId.Open);
                    break;
                case FunctionType.RGB:
                    perTrait = sceneFunction.function.Find((obj) => obj.name == "percent");
                    perTrait = sceneFunction.function.Find((obj) => obj.key == "percent");
                    if (perTrait != null)
                    {
                        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.name == "brightness").value.ToString() + "%";
                        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.key == "brightness").curValue.ToString() + "%";
                    }
                    else
                    {
@@ -551,10 +551,10 @@
                    sceneFunctionInfo += Language.StringByID(StringId.Open);
                    break;
                case FunctionType.MotorCurtain:
                    perTrait = sceneFunction.function.Find((obj) => obj.name == "percent");
                    perTrait = sceneFunction.function.Find((obj) => obj.key == "percent");
                    if (perTrait != null)
                    {
                        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.name == "percent").value.ToString() + "%";
                        sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + sceneFunction.function.Find((obj) => obj.key == "percent").curValue.ToString() + "%";
                    }
                    else
                    {