From 95a7e380db583108d9716c56fe6d298ca08f8f23 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 九月 2021 10:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jpush_tst' into wxr7
---
HDL_ON/Entity/Function/Function.cs | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 3202c35..a76836c 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -695,7 +695,7 @@
/// 鍔熻兘灞炴��
/// 灞炴�у瓧娈佃В鏋愶細attri :灞炴�у唴瀹癸紝value 灞炴�х殑鍊硷紝max 鏈�澶у�� min 鏈�灏忓��
/// </summary>
- [System.Serializable]
+ [Serializable]
public class FunctionAttributes
{
/// <summary>
@@ -917,7 +917,7 @@
/// </summary>
public const string FilterRemain = "filter_remain";
/// <summary>
- /// 杩囨护缃戞槸鍚﹁秴鏃惰鍛�
+ /// 杩囨护缃戞槸鍚﹁秴鏃惰鍛�
/// </summary>
public const string FilterTimeout = "filter_timeout";
@@ -1274,7 +1274,29 @@
/// 闈掕悕鐜浼犳劅鍣�
/// </summary>
public const string SensorEnvironment3 = "sensor.environment3";
+ /// <summary>
+ /// 鐢查啗
+ /// </summary>
+ public const string SensorHcho = "sensor.hcho";
+ /// <summary>
+ /// 鐜浼犳劅鍣ㄨ澶噑pk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> EnvironDeviceSpkList()
+ {
+ var spkList = new List<string>();
+ spkList.Add(SensorTemperature);
+ spkList.Add(SensorPm25);
+ spkList.Add(SensorCO2);
+ spkList.Add(SensorTVOC);
+ spkList.Add(SensorHumidity);
+ spkList.Add(SensorEnvironment);
+ spkList.Add(SensorEnvironment2);
+ spkList.Add(SensorEnvironment3);
+ spkList.Add(SensorHcho);
+ return spkList;
+ }
/// <summary>
/// 鐜浼犳劅鍣╯pk鍒楄〃
/// </summary>
@@ -1287,9 +1309,7 @@
spkList.Add(SensorCO2);
spkList.Add(SensorTVOC);
spkList.Add(SensorHumidity);
- spkList.Add(SensorEnvironment);
- spkList.Add(SensorEnvironment2);
- spkList.Add(SensorEnvironment3);
+ spkList.Add(SensorHcho);
return spkList;
}
@@ -1362,6 +1382,10 @@
/// 绾㈠椋庢墖
/// </summary>
public const string FanIr = "ir.fan";
+ /// <summary>
+ /// 鏅鸿兘绌哄紑
+ /// </summary>
+ public const string AirSwitch = "electrical.breaker";
#region 娑傞甫
/// <summary>
@@ -1404,6 +1428,7 @@
spkList.Add(ElectricTuyaFan);
spkList.Add(ElectricTuyaWeepRobot);
spkList.Add(ElectricTuyaWaterValve);
+ spkList.Add(AirSwitch);
return spkList;
}
--
Gitblit v1.8.0