From c355072676c274e3f916b0488c4ee9c4730f6210 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 07 六月 2023 13:46:43 +0800 Subject: [PATCH] 2023年06月07日13:45:26 --- HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs | 4 ++-- HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs index 5dad653..f93fdc3 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs +++ b/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() + "鈩�"); diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs index b1c6ab8..2d8e3ba 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs +++ b/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); }; ///妯″紡鐐瑰嚮浜嬩欢 -- Gitblit v1.8.0