From c008153a455b2c79ac9087d82bd9abf9f1eea19f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 11 八月 2021 18:03:14 +0800
Subject: [PATCH] 2021-08-11-1
---
HDL_ON/Entity/Function/Function.cs | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 04b4840..b99f909 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -281,6 +281,21 @@
return _trait_on_off;
}
}
+ /// <summary>
+ /// 鍔熻兘鐨勫睘鎬х姸鎬佸垪琛�
+ /// </summary>
+ public List<AttributesStatus> status = new List<AttributesStatus>();
+ /// <summary>
+ /// 閫氳繃鐘舵�佸垪琛ㄧ粍瑁呭睘鎬ч噷闈㈢殑鐘舵��
+ /// </summary>
+ public void AssembleStatus()
+ {
+ foreach (var sta in status)
+ {
+ SetAttrState(sta.key, sta.value);
+ }
+ }
+
/// <summary>
/// 浣跨敤娆℃暟
@@ -660,7 +675,7 @@
public List<AttributesStatus> status = new List<AttributesStatus>();
}
/// <summary>
- /// a鍗忚鎺у埗鍔ㄤ綔鏁版嵁
+ /// 鍔熻兘灞炴�х姸鎬�
/// </summary>
public class AttributesStatus
{
@@ -712,6 +727,7 @@
/// </summary>
public object curValue = new object();
}
+
/// <summary>
/// 鍔熻兘灞炴�ч敭鍚嶅垪琛�
/// </summary>
@@ -773,6 +789,7 @@
/// 绌鸿皟銆佸湴鐑�//app鑷姞
/// </summary>
public const string TempType = "temperature_type";
+
/// <summary>
/// 鏃堕棿鏍囪
/// 鍦扮儹//app鑷姞
@@ -884,6 +901,10 @@
/// </summary>
public const string Humidity = "humidity";
/// <summary>
+ /// 娓╁害
+ /// </summary>
+ public const string Temperature = "temperature";
+ /// <summary>
/// 瀹ゅ唴娓╁害
/// </summary>
public const string IndoorTemp = "indoor_temp";
@@ -896,7 +917,7 @@
/// </summary>
public const string FilterRemain = "filter_remain";
/// <summary>
- /// 杩囨护缃戞槸鍚﹁秴鏃惰鍛�
+ /// 杩囨护缃戞槸鍚﹁秴鏃惰鍛�
/// </summary>
public const string FilterTimeout = "filter_timeout";
@@ -1245,6 +1266,14 @@
/// 璇pk鍔熻兘鏄幆澧冧紶鎰熷櫒鍔熻兘鐨勯泦鎴�
/// </summary>
public const string SensorEnvironment = "sensor.environment";
+ /// <summary>
+ /// 闈掕悕浼犳劅鍣�2锛坈o2锛宲m25锛屾俯婀垮害锛岀數閲忥紝tvoc锛�
+ /// </summary>
+ public const string SensorEnvironment2 = "sensor.environment2";
+ /// <summary>
+ /// 闈掕悕浼犳劅鍣�3锛坈o2锛宲m25锛屾俯婀垮害锛�
+ /// </summary>
+ public const string SensorEnvironment3 = "sensor.environment3";
/// <summary>
/// 鐜浼犳劅鍣╯pk鍒楄〃
@@ -1258,6 +1287,7 @@
spkList.Add(SensorCO2);
spkList.Add(SensorTVOC);
spkList.Add(SensorHumidity);
+ spkList.Add(SensorEnvironment);
return spkList;
}
#endregion
--
Gitblit v1.8.0