From f1532873e3029b2fb17cb84c1b9da1e2f66247c4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 02 九月 2021 10:43:38 +0800
Subject: [PATCH] 代码合并
---
HDL_ON/Entity/Function/Function.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 1d2e85d..143cc90 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1280,6 +1280,24 @@
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>
/// <returns></returns>
@@ -1291,9 +1309,6 @@
spkList.Add(SensorCO2);
spkList.Add(SensorTVOC);
spkList.Add(SensorHumidity);
- spkList.Add(SensorEnvironment);
- spkList.Add(SensorEnvironment2);
- spkList.Add(SensorEnvironment3);
spkList.Add(SensorHcho);
return spkList;
}
--
Gitblit v1.8.0