2023年06月07日13:45:26

wjc

2023-06-07 c355072676c274e3f916b0488c4ee9c4730f6210

 HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs

@@ -229,10 +229,10 @@
                        ///开关
                        LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
                        curtainSwitchView.btnText.TextID = StringId.switchLogic;
                        fLayout.AddChidren(curtainSwitchView.FLayoutView());
                        //fLayout.AddChidren(curtainSwitchView.FLayoutView());//2023年04月17日16:27:10 产品要求的去掉
                        ///百分比
                        LogicView.FunTypeView crtainPercentumView = new LogicView.FunTypeView();
                        crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
                        //crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
                        crtainPercentumView.btnText.TextID = StringId.percentum;
                        fLayout.AddChidren(crtainPercentumView.FLayoutView());
                        crtainPercentumView.btnState.Text = "5%";//产品经理晓辉要求改的 2021-11-06
@@ -331,6 +331,8 @@
                        {
                            SwitchViewMethod(device, acSwitchVie.btnState, 2);
                        };
                        int min = device.GetAttribute("set_temp") == null ? 16 : device.GetAttribute("set_temp").min;
                        int max = device.GetAttribute("set_temp") == null ? 32 : device.GetAttribute("set_temp").max;
                        ///温度点击事件
                        temperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
@@ -347,8 +349,7 @@
                                string set_temp_value = stateStr.Replace("℃", "");
                                //数据封装
                                AddDictionary(keyVlaue, set_temp_value);
                            });

                            }, min,max);

                        };
                        ///模式点击事件
@@ -435,6 +436,8 @@
                        ///温度点击事件
                        temperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            int min = device.GetAttribute("set_temp") == null ? 16 : device.GetAttribute("set_temp").min;
                            int max = device.GetAttribute("set_temp") == null ? 32 : device.GetAttribute("set_temp").max;
                            string tempValue = temperatureView.btnState.Text;
                            LogicView.TemperatureView tempView = new LogicView.TemperatureView();
                            tempView.FLayoutView(this, tempValue, (stateStr) =>
@@ -448,7 +451,7 @@
                                //数据封装
                                AddDictionary(keyVlaue, set_temp_value);

                            });
                            },min,max);

                        };
                        ///模式点击事件