20201215-1

wei

2020-12-15 7d9e5d946d08f0b53ff25d1c25dcf83efb68b734

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

@@ -43,37 +43,15 @@
            //加载开关Row
            LoadFunctionRow(sceneFunction.localFunction.trait_on_off);

            //foreach(var attr in sceneFunction.status)
            //{
            //    switch (attr.key)
            //    {
            //        case "set_temperature":
            //            LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temperature"));
            //            break;
            //        case "mode":
            //            LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "mode"));
            //            break;
            //        case "fan":
            //            LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "fan"));
            //            break;
            //        case "percent":
            //            LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "percent"));
            //            break;
            //        case "brightness":
            //            LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness"));
            //            break;
            //    }
            //}

            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:
@@ -132,6 +110,7 @@
                {
                    scene.functions.Add(sceneFunction);
                }
                scene.SaveSceneData(true);
                refreshAction();
                this.RemoveFromParent();
            };
@@ -203,7 +182,7 @@
                    case "fan":
                        LoadEditDialog_FunctionPar(trait, btnFunctionText);
                        break;
                    case "set_temperature":
                    case "set_temp":
                        LoadEditDialog_Temp(trait, btnFunctionText);
                        break;
                    case "delay":
@@ -389,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;
            };

@@ -514,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,"");
            };

@@ -657,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;
            };
        }
@@ -810,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;
            };