wjc
2023-06-07 c355072676c274e3f916b0488c4ee9c4730f6210
2023年06月07日13:45:26

输出目标:空调,地暖温度范围用实际上传的值作为限制;
2个文件已修改
13 ■■■■■ 已修改文件
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs
@@ -11,7 +11,7 @@
        /// <param name="frameLayout">弹窗父控件</param>
        /// <param name="stateValue">之前状态值</param>
        /// <param name="action">返回结果</param>
        public void FLayoutView(FrameLayout frameLayout, string stateValue, Action<string> action)
        public void FLayoutView(FrameLayout frameLayout, string stateValue, Action<string> action,int min,int max)
        {
            FrameLayout frame = new FrameLayout
            {
@@ -28,7 +28,7 @@
            };
            //初始化列表
            var temperatureList = new List<string>();
            for (int i = 16; i < 32; i++)
            for (int i = min; i < max; i++)
            {
                //添加数据
                temperatureList.Add(i.ToString() + "℃");
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -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);
                        };
                        ///模式点击事件