From c135877a65244706008b6215b2734bb37bbfb7f4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 20 七月 2023 08:59:09 +0800
Subject: [PATCH] Merge branch 'Dev-1.9' into Dev-Branch
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 6da1d29..1e9a160 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -1257,11 +1257,7 @@
if (set_temp != "")
{
- string unit = device.GetAttribute("temperature_type") == null ? "鈩�" : device.GetAttribute("temperature_type").state;
- if (string.IsNullOrEmpty(unit))
- {
- unit = "鈩�";
- }
+ string unit =GetTemperatureUnit(device);
stateStr += set_temp + unit + ",";
}
@@ -1359,11 +1355,7 @@
}
if (set_temp != "")
{
- string unit = device.GetAttribute("temperature_type") == null ? "鈩�" : device.GetAttribute("temperature_type").state;
- if (string.IsNullOrEmpty(unit))
- {
- unit = "鈩�";
- }
+ string unit = GetTemperatureUnit(device);
stateStr += set_temp + unit + ",";
}
if (mode != "")
@@ -1928,7 +1920,7 @@
//鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
break;
}
- button2.Text = value + "鈩�";
+ button2.Text = value + GetTemperatureUnit(device); ;
}
break;
case "mode":
@@ -2041,7 +2033,7 @@
//鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
break;
}
- button2.Text = value + "鈩�";
+ button2.Text = value + GetTemperatureUnit(device); ;
}
break;
case "mode":
@@ -2493,6 +2485,25 @@
return dicList[0]["value"].ToString();
}
/// <summary>
+ /// 鑾峰彇娓╁害鍗曚綅
+ /// </summary>
+ /// <param name="device"></param>
+ /// <returns></returns>
+ public string GetTemperatureUnit(Entity.Function device)
+ {
+ string unit = string.Empty;
+ if (device.GetAttribute("temperature_type") != null && device.GetAttribute("temperature_type").value.Count > 0)
+ {
+ unit = device.GetAttribute("temperature_type").value[0];
+ }
+ if (string.IsNullOrEmpty(unit))
+ {
+ //璋冭瘯杞欢鏈夌┖鑳戒笂浼犱负绌�
+ unit = "鈩�";
+ }
+ return unit;
+ }
+ /// <summary>
///鑾峰彇鑷姩鍖栧悕绉�
/// </summary>
/// <returns> 鏂板缓鑷姩鍖栧懡鍚嶈鍒�</returns>
--
Gitblit v1.8.0