From a3dfbcd5218270f9a75e6e32807b08215270b657 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 11 九月 2024 11:48:23 +0800
Subject: [PATCH] Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 22bad8a..9575c4f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -492,6 +492,7 @@
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 unit = InpOrOutLogicMethod.Current.GetTemperatureUnit(device);
+ var setTempAttr = device.GetAttribute(FunctionAttributeKey.SetTemp);
///娓╁害鐐瑰嚮浜嬩欢
temperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
{
@@ -508,7 +509,7 @@
string set_temp_value = stateStr.Replace(unit, "");
//鏁版嵁灏佽
AddDictionary(keyVlaue, set_temp_value);
- }, min, max, unit);
+ }, min, max, unit, setTempAttr.step);
};
///妯″紡鐐瑰嚮浜嬩欢
@@ -562,7 +563,7 @@
}
break;
case SPK.FloorHeatStandard:
- case SPK.HvacFloorHeat:
+ case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
{
#region 鐣岄潰
///寮�鍏�
@@ -586,6 +587,7 @@
DelayView(fLayout, floorHeatingModehView.frameLayout.Bottom);
#endregion
#region 鐐瑰嚮浜嬩欢
+ var setTempAttr = device.GetAttribute(FunctionAttributeKey.SetTemp);
///寮�鍏崇偣鍑讳簨浠�
floorHeatingSwitchVie.btnClick.MouseUpEventHandler += (sender, e) =>
{
@@ -611,7 +613,7 @@
//鏁版嵁灏佽
AddDictionary(keyVlaue, set_temp_value);
- }, min, max, unit);
+ }, min, max, unit, setTempAttr.step);
};
///妯″紡鐐瑰嚮浜嬩欢
@@ -910,7 +912,7 @@
case SPK.AcIr:
case SPK.AcStandard:
case SPK.FloorHeatStandard:
- case SPK.HvacFloorHeat:
+ case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
{
//鍋氫簡涓�涓壒娈婂鐞嗭紱
bool _bool = false;
--
Gitblit v1.8.0