From 41995c4cd30ca1c5a814ea0af6f70d3b86368137 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 20 八月 2021 09:07:07 +0800
Subject: [PATCH] 2021-08-20 09:06:44
---
HDL_ON/Entity/Function/Function.cs | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 38ecf24..3202c35 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -285,6 +285,16 @@
/// 鍔熻兘鐨勫睘鎬х姸鎬佸垪琛�
/// </summary>
public List<AttributesStatus> status = new List<AttributesStatus>();
+ /// <summary>
+ /// 閫氳繃鐘舵�佸垪琛ㄧ粍瑁呭睘鎬ч噷闈㈢殑鐘舵��
+ /// </summary>
+ public void AssembleStatus()
+ {
+ foreach (var sta in status)
+ {
+ SetAttrState(sta.key, sta.value);
+ }
+ }
/// <summary>
@@ -1218,7 +1228,7 @@
spkList.Add(SensorDoorWindow);
spkList.Add(SensorSmoke);
spkList.Add(SensorWater);
- //spkList.Add(SensorGas);
+ spkList.Add(SensorGas);
//spkList.Add(SensorShanLan);
//spkList.Add(SensorDuiShe);
//spkList.Add(SensoruUtrasonic);
@@ -1256,6 +1266,14 @@
/// 璇pk鍔熻兘鏄幆澧冧紶鎰熷櫒鍔熻兘鐨勯泦鎴�
/// </summary>
public const string SensorEnvironment = "sensor.environment";
+ /// <summary>
+ /// 闈掕悕鐜浼犳劅鍣�
+ /// </summary>
+ public const string SensorEnvironment2 = "sensor.environment2";
+ /// <summary>
+ /// 闈掕悕鐜浼犳劅鍣�
+ /// </summary>
+ public const string SensorEnvironment3 = "sensor.environment3";
/// <summary>
/// 鐜浼犳劅鍣╯pk鍒楄〃
@@ -1270,8 +1288,24 @@
spkList.Add(SensorTVOC);
spkList.Add(SensorHumidity);
spkList.Add(SensorEnvironment);
+ spkList.Add(SensorEnvironment2);
+ spkList.Add(SensorEnvironment3);
return spkList;
}
+
+ /// <summary>
+ /// 鐜浼犳劅鍣ㄨ澶囧垪琛�
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> EvironmentSensorList()
+ {
+ var spkList = new List<string>();
+ spkList.Add(SensorEnvironment);
+ spkList.Add(SensorEnvironment2);
+ spkList.Add(SensorEnvironment3);
+ return spkList;
+ }
+
#endregion
#endregion
--
Gitblit v1.8.0