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/Entity/Function/AC.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/Function/AC.cs b/HDL_ON/Entity/Function/AC.cs
index bc31208..8a8db35 100644
--- a/HDL_ON/Entity/Function/AC.cs
+++ b/HDL_ON/Entity/Function/AC.cs
@@ -12,24 +12,28 @@
public string GetTempUnitString(Function function)
{
//var attr = function.GetAttribute(FunctionAttributeKey.TempType)
- 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
{
- if (tt == "C")
+ if (tt.unit == "C")
{
return "掳C";
}
- else if (tt == "F")
+ else if (tt.unit == "F")
{
return "掳F";
}
else
{
- return tt;
+ return tt.unit;
}
}
}
--
Gitblit v1.8.0