From ac8660d2dd439e8074c1760cbe6cc9465a452193 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 24 八月 2023 17:50:17 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/Entity/Function/FloorHeating.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/FloorHeating.cs b/HDL_ON/Entity/Function/FloorHeating.cs
index 1eb0352..dfc2539 100644
--- a/HDL_ON/Entity/Function/FloorHeating.cs
+++ b/HDL_ON/Entity/Function/FloorHeating.cs
@@ -71,14 +71,29 @@
/// </summary>
public string GetTempUnitString(Function function)
{
- var tt = function.GetAttrState(FunctionAttributeKey.TempType);
- if (tt == "0")
+ var tt = function.GetAttribute(FunctionAttributeKey.TempType);
+ if (tt == null)
+ {
+ return "掳C";
+ }
+ if (tt.unit == string.Empty)
{
return "掳C";
}
else
{
- return tt;
+ if (tt.unit == "C")
+ {
+ return "掳C";
+ }
+ else if (tt.unit == "F")
+ {
+ return "掳F";
+ }
+ else
+ {
+ return tt.unit;
+ }
}
}
--
Gitblit v1.8.0