From 792ca2a402feb952ef890d653f2e049c1230baf1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:48:33 +0800
Subject: [PATCH] 1111
---
HDL_ON/Entity/Function/FloorHeating.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/Function/FloorHeating.cs b/HDL_ON/Entity/Function/FloorHeating.cs
index a3af174..8295553 100644
--- a/HDL_ON/Entity/Function/FloorHeating.cs
+++ b/HDL_ON/Entity/Function/FloorHeating.cs
@@ -6,11 +6,11 @@
public class FloorHeating : Function
{
/*
- *鍦扮儹锛歵rait: [switch, mode, set_temperature, lock]
+ *鍦扮儹锛歵rait: [switch, mode, set_temp, lock]
*灞炴�� 鎻忚堪
*switch on/off
*mode day, night,away, vacation, timer
- *set_temperature value(鍙)
+ *set_temp value
*lock boolean(Lock閿佸畾鎺у埗)
*set_ point up,down,value
*/
@@ -59,7 +59,7 @@
{
if (_trait_mode == null)
{
- _trait_mode = function.Find((obj) => obj.key == "mode");
+ _trait_mode = attributes.Find((obj) => obj.key == "mode");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_mode == null)
{
@@ -71,7 +71,10 @@
min = 0,
};
}
- _trait_mode.curValue = _trait_mode.value.Count > 0 ? _trait_mode.value[0] : "";
+ if(_trait_mode.curValue.ToString() == "{}")
+ {
+ _trait_mode.curValue = "day";
+ }
}
return _trait_mode;
}
@@ -157,11 +160,40 @@
/// </summary>
public byte timeFlag = 0;
+ FunctionAttributes _trait_IndoorTemp;
/// <summary>
/// 瀹ゅ唴娓╁害
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public int indoorTemp = 20;
+ public FunctionAttributes trait_IndoorTemp
+ {
+ get
+ {
+ if (_trait_IndoorTemp == null)
+ {
+ _trait_IndoorTemp = attributes.Find((obj) => obj.key == FunctionAttributeKey.IndoorTemp);
+ //鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
+ if (_trait_IndoorTemp == null)
+ {
+ _trait_IndoorTemp = new FunctionAttributes()
+ {
+ key = FunctionAttributeKey.IndoorTemp,
+ value = new List<string> { },
+ max = 30,
+ min = 0,
+ };
+ if (_trait_IndoorTemp.curValue.ToString() == "{}")
+ _trait_IndoorTemp.curValue = "0";
+ }
+ }
+ //if (_trait_IndoorTemp.curValue.ToString().Length > 3)
+ {
+ var vv = Convert.ToDouble(_trait_IndoorTemp.curValue);
+ _trait_IndoorTemp.curValue = Convert.ToInt32(vv).ToString();
+ }
+ return _trait_IndoorTemp;
+ }
+ }
FunctionAttributes _trait_temp;
@@ -177,19 +209,26 @@
{
if (_trait_temp == null)
{
- _trait_temp = function.Find((obj) => obj.key == "set_temperature");
+ _trait_temp = attributes.Find((obj) => obj.key == "set_temp");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_temp == null)
{
_trait_temp = new FunctionAttributes()
{
- key = "set_temperature",
+ key = "set_temp",
value = new List<string> { },
max = 30,
min = 5,
};
}
- _trait_temp.curValue = 16;
+ if(_trait_temp.curValue.ToString() == "{}")
+ _trait_temp.curValue = "16";
+ }
+ //if (_trait_temp.curValue.ToString().Length > 3)
+ {
+ 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