2020-12-15-1

陈嘉乐

2020-12-15 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17

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

@@ -15,10 +15,12 @@

        Action refreshAction;
        SceneFunction sceneFunction;
        //Function localFunction;
        public SceneFunctionInfoEditPage(Scene s, SceneFunction fc,Action action)
        {
            bodyView = this;
            scene = s;
            //localFunction = fc;
            sceneFunction = fc;
            refreshAction = action;
        }
@@ -44,12 +46,12 @@
            switch (sceneFunction.localFunction.functionType)
            {
                case FunctionType.AC:
                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temperature"));
                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temp"));
                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "mode"));
                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "fan"));
                    break;
                case FunctionType.FloorHeating:
                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temperature"));
                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temp"));
                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "mode"));
                    break;
                case FunctionType.Curtain:
@@ -98,6 +100,7 @@

            btnConfrim.MouseUpEventHandler = (sender, e) =>
            {
                //var temp = localFunction.ConvertSceneFunction();
                var temp = scene.functions.Find((obj) => obj.sid == sceneFunction.sid);
                if (temp != null)
                {
@@ -107,6 +110,7 @@
                {
                    scene.functions.Add(sceneFunction);
                }
                scene.SaveSceneData(true);
                refreshAction();
                this.RemoveFromParent();
            };
@@ -178,7 +182,7 @@
                    case "fan":
                        LoadEditDialog_FunctionPar(trait, btnFunctionText);
                        break;
                    case "set_temperature":
                    case "set_temp":
                        LoadEditDialog_Temp(trait, btnFunctionText);
                        break;
                    case "delay":
@@ -364,11 +368,13 @@
            btnOn.MouseUpEventHandler = (sender, e) => {
                dialog.Close();
                trait.curValue = "on";
                sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff).value = "on";
                btn.Text = trait.GetCurValueText() + trait.uintString;
            };
            btnOff.MouseUpEventHandler = (sender,e) =>{
                dialog.Close();
                trait.curValue = "off";
                sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff).value = "off";
                btn.Text= trait.GetCurValueText() + trait.uintString;
            };

@@ -489,6 +495,7 @@
            btnConfrim.MouseUpEventHandler = (sender, e) => {
                dialog.Close();
                btn.Text = selectItem;
                sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff).value = trait.curValue.ToString() ;
                trait.curValue = selectItem.Replace(trait.uintString,"");
            };

@@ -632,6 +639,7 @@
            btnConfrim.MouseUpEventHandler = (sender, e) => {
                dialog.Close();
                trait.curValue = controlBar.Progress;
                sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff).value = trait.curValue.ToString() ;
                btn.Text = trait.curValue + trait.uintString;
            };
        }
@@ -785,6 +793,7 @@
            btnConfrim.MouseUpEventHandler = (sender, e) => {
                dialog.Close();
                trait.curValue = lastData;
                sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff).value = trait.curValue.ToString() ;
                btn.Text = lastText;
            };