From ea8f01fd99a2ef85bf96623c1bf90e84128cbe5c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 28 八月 2021 10:27:10 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/Entity/Function/Function.cs | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index b99f909..1d2e85d 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1228,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);
@@ -1267,13 +1267,17 @@
/// </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>
+ /// 鐢查啗
+ /// </summary>
+ public const string SensorHcho = "sensor.hcho";
/// <summary>
/// 鐜浼犳劅鍣╯pk鍒楄〃
@@ -1288,8 +1292,25 @@
spkList.Add(SensorTVOC);
spkList.Add(SensorHumidity);
spkList.Add(SensorEnvironment);
+ spkList.Add(SensorEnvironment2);
+ spkList.Add(SensorEnvironment3);
+ spkList.Add(SensorHcho);
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
@@ -1346,6 +1367,10 @@
/// 绾㈠椋庢墖
/// </summary>
public const string FanIr = "ir.fan";
+ /// <summary>
+ /// 鏅鸿兘绌哄紑
+ /// </summary>
+ public const string AirSwitch = "electrical.breaker";
#region 娑傞甫
/// <summary>
@@ -1388,6 +1413,7 @@
spkList.Add(ElectricTuyaFan);
spkList.Add(ElectricTuyaWeepRobot);
spkList.Add(ElectricTuyaWaterValve);
+ spkList.Add(AirSwitch);
return spkList;
}
--
Gitblit v1.8.0