From 5a64fc39289d4121b2950c07a4b6e43cf76dd4a5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 11:16:59 +0800
Subject: [PATCH] Merge branch 'tzy2' into MergeFL
---
HDL_ON/Entity/Function/Function.cs | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 9ae66ef..252f912 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1173,7 +1173,10 @@
/// 姣背娉紶鎰熷櫒
/// </summary>
public const string SenesorMegahealth = "sensor.megahealth";
-
+ /// <summary>
+ /// 鐜妫�娴嬩紶鎰熷櫒
+ /// </summary>
+ public const string SenesorEnvironment = "sensor.environment";
/// <summary>
/// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
/// </summary>
@@ -1181,16 +1184,16 @@
public static List<string> ArmSensorSpkList()
{
var spkList = new List<string>();
- spkList.Add(SensorLight);
+ //spkList.Add(SensorLight);
spkList.Add(SensorPir);
spkList.Add(SensorDoorWindow);
spkList.Add(SensorSmoke);
spkList.Add(SensorWater);
- spkList.Add(SensorGas);
- spkList.Add(SensorShanLan);
- spkList.Add(SensorDuiShe);
- spkList.Add(SensoruUtrasonic);
- spkList.Add(SensorDryContact);
+ //spkList.Add(SensorGas);
+ //spkList.Add(SensorShanLan);
+ //spkList.Add(SensorDuiShe);
+ //spkList.Add(SensoruUtrasonic);
+ //spkList.Add(SensorDryContact);
spkList.Add(SenesorMegahealth);
return spkList;
}
@@ -1321,6 +1324,7 @@
spkList.Add(TvIr);
spkList.Add(TvXmIr);
spkList.Add(ElectricFan);
+ spkList.Add(FanIr);
spkList.Add(ClothesHanger);
spkList.Add(IrLearn);
spkList.Add(PjtIr);
@@ -1334,7 +1338,6 @@
#endregion
-
#region 璁惧绫�
/// <summary>
@@ -1393,6 +1396,12 @@
}
#endregion
+ /// <summary>
+ /// 娌℃湁鐘舵�佹樉绀虹殑鍔熻兘spk鍒楄〃
+ /// </summary>
+ public static List<string> NotStatusSpkList = new List<string> {
+ ElectricTV, FanIr, TvIr, TvXmIr, StbIr, PjtIr, IrLearn
+ };
/// <summary>
/// 绗笁鏂瑰搧鐗屽垪琛�
--
Gitblit v1.8.0