From 43b6e3d6a3a96e7b759b396df4f141ab105fb6bb Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 05 三月 2021 11:31:58 +0800
Subject: [PATCH] 合并嘉乐代码并测试通过
---
HDL_ON/Entity/Function/FloorHeating.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/Function/FloorHeating.cs b/HDL_ON/Entity/Function/FloorHeating.cs
index f218595..aefe030 100644
--- a/HDL_ON/Entity/Function/FloorHeating.cs
+++ b/HDL_ON/Entity/Function/FloorHeating.cs
@@ -182,15 +182,15 @@
max = 30,
min = 0,
};
- if (_trait_IndoorTemp.curValue.ToString() == "{}")
- _trait_IndoorTemp.curValue = 0;
+
}
}
- //if (_trait_IndoorTemp.curValue.ToString().Length > 3)
+ if (_trait_IndoorTemp.curValue.ToString() == "{}")
{
- var vv = Convert.ToDouble(_trait_IndoorTemp.curValue);
- _trait_IndoorTemp.curValue = Convert.ToInt32(vv);
+ _trait_IndoorTemp.curValue = "0";
}
+ var vv = Convert.ToDouble(_trait_IndoorTemp.curValue);
+ _trait_IndoorTemp.curValue = Convert.ToInt32(vv).ToString();
return _trait_IndoorTemp;
}
}
@@ -222,12 +222,13 @@
};
}
if(_trait_temp.curValue.ToString() == "{}")
- _trait_temp.curValue = 16;
+ _trait_temp.curValue = "16";
}
//if (_trait_temp.curValue.ToString().Length > 3)
{
- var vv = Convert.ToDouble(_trait_temp.curValue);
- _trait_temp.curValue = Convert.ToInt32(vv);
+ double vv = 0;
+ Double.TryParse(_trait_temp.curValue.ToString(),out vv);
+ _trait_temp.curValue = Convert.ToInt32(vv).ToString();
}
return _trait_temp;
}
--
Gitblit v1.8.0