From aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 21:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/Entity/Function/FloorHeating.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/FloorHeating.cs b/HDL_ON/Entity/Function/FloorHeating.cs
index 18161bb..61413c3 100644
--- a/HDL_ON/Entity/Function/FloorHeating.cs
+++ b/HDL_ON/Entity/Function/FloorHeating.cs
@@ -186,7 +186,7 @@
_trait_IndoorTemp.curValue = 0;
}
}
- if (_trait_IndoorTemp.curValue.ToString().Length > 3)
+ //if (_trait_IndoorTemp.curValue.ToString().Length > 3)
{
var vv = Convert.ToDouble(_trait_IndoorTemp.curValue);
_trait_IndoorTemp.curValue = Convert.ToInt32(vv);
@@ -224,9 +224,10 @@
if(_trait_temp.curValue.ToString() == "{}")
_trait_temp.curValue = 16;
}
- if (_trait_temp.curValue.ToString().Length > 3)
+ //if (_trait_temp.curValue.ToString().Length > 3)
{
- var vv = Convert.ToDouble(_trait_temp.curValue);
+ double vv = 0;
+ Double.TryParse(_trait_temp.curValue.ToString(),out vv);
_trait_temp.curValue = Convert.ToInt32(vv);
}
return _trait_temp;
--
Gitblit v1.8.0