From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/Entity/Function/AC.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/Entity/Function/AC.cs b/HDL_ON/Entity/Function/AC.cs
index f720477..32d7556 100644
--- a/HDL_ON/Entity/Function/AC.cs
+++ b/HDL_ON/Entity/Function/AC.cs
@@ -6,12 +6,12 @@
public class AC : Function
{
/*
- * 绌鸿皟锛歵rait: [switch, mode, fan, set_temperature, swing, lock]
+ * 绌鸿皟锛歵rait: [switch, mode, fan, set_temp, swing, lock]
* 灞炴�� 鎻忚堪
* on_off on/off
* mode mode: auto, cool, heat, dry, fan
* fan high, medium, low, auto
- * set_temperature up,down,value
+ * set_temp up,down,value
* swing up/down/left/right
* lock boolean (Lock閿佸畾鎺у埗)
*/
@@ -182,7 +182,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)
{
@@ -194,8 +194,9 @@
min = 0,
};
}
- _trait_mode.curValue = _trait_mode.value.Count > 0 ? _trait_mode.value[0] : "";
}
+ if (_trait_mode.curValue.ToString() == "{}")
+ _trait_mode.curValue = "cool";
return _trait_mode;
}
}
@@ -208,7 +209,7 @@
{
if (_trait_fan == null)
{
- _trait_fan = function.Find((obj) => obj.key == "fan");
+ _trait_fan = attributes.Find((obj) => obj.key == "fan");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_fan == null)
{
@@ -218,10 +219,12 @@
value = new List<string> { "high", "medium", "low", "auto" },
max = 3,
min = 0,
+ curValue = "high"
};
}
- _trait_fan.curValue = _trait_fan.value.Count > 0 ? _trait_fan.value[0] : "";
}
+ if (_trait_fan.curValue.ToString() == "{}")
+ _trait_fan.curValue = "high";
return _trait_fan;
}
}
@@ -237,20 +240,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 = 32,
min = 16,
};
}
+ }
+ if (_trait_temp.curValue.ToString() == "{}")
+ {
_trait_temp.curValue = 16;
}
+ double vv = 16;
+ Double.TryParse(_trait_temp.curValue.ToString(), out vv);
+ _trait_temp.curValue = Convert.ToInt32(vv);
return _trait_temp;
}
}
@@ -263,7 +272,7 @@
{
if (_trait_swting == null)
{
- _trait_swting = function.Find((obj) => obj.key == "swting");
+ _trait_swting = attributes.Find((obj) => obj.key == "swting");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_swting == null)
{
@@ -275,8 +284,9 @@
min = 0,
};
}
- _trait_swting.curValue = _trait_swting.value.Count > 0 ? _trait_swting.value[trait_mode.min] : "";
}
+ if (_trait_swting.curValue.ToString() == "{}")
+ _trait_swting.curValue = "up";
return _trait_swting;
}
}
@@ -299,11 +309,39 @@
}
}
}
+ 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;
+ }
+ var vv = Convert.ToDouble(_trait_IndoorTemp.curValue);
+ _trait_IndoorTemp.curValue = Convert.ToInt32(vv);
+ return _trait_IndoorTemp;
+ }
+ }
/// <summary>
/// 褰撳墠妯″紡鐨刬con璺緞
--
Gitblit v1.8.0