From 203c3a3ffde6259413d9743f6a723b95b1e7989c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 06 七月 2023 22:43:05 +0800
Subject: [PATCH] 门锁功能
---
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 2d8e3ba..2104754 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -333,6 +333,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 = device.GetAttribute("temperature_type") == null ? "掳" : device.GetAttribute("temperature_type").state;
///娓╁害鐐瑰嚮浜嬩欢
temperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
{
@@ -346,10 +347,10 @@
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
string keyVlaue = "set_temp";
selectedState = device.spk + "_" + keyVlaue;
- string set_temp_value = stateStr.Replace("鈩�", "");
+ string set_temp_value = stateStr.Replace(unit, "");
//鏁版嵁灏佽
AddDictionary(keyVlaue, set_temp_value);
- }, min,max);
+ }, min,max, unit);
};
///妯″紡鐐瑰嚮浜嬩欢
@@ -438,6 +439,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 = device.GetAttribute("temperature_type") == null ? "掳" : device.GetAttribute("temperature_type").state;
string tempValue = temperatureView.btnState.Text;
LogicView.TemperatureView tempView = new LogicView.TemperatureView();
tempView.FLayoutView(this, tempValue, (stateStr) =>
@@ -447,11 +449,11 @@
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
string keyVlaue = "set_temp";
selectedState = device.spk + "_" + keyVlaue;
- string set_temp_value = stateStr.Replace("鈩�", "");
+ string set_temp_value = stateStr.Replace(unit, "");
//鏁版嵁灏佽
AddDictionary(keyVlaue, set_temp_value);
- },min,max);
+ }, min, max, unit);
};
///妯″紡鐐瑰嚮浜嬩欢
--
Gitblit v1.8.0