From 6b6a3fd9c292a75196c4cc15c6d9bf52537efbd4 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期二, 07 九月 2021 10:12:20 +0800 Subject: [PATCH] 1.窗帘问题。2.智能空开。3.组合调光部分。 --- HDL_ON/Entity/Function/Function.cs | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 5 deletions(-) diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs index b99f909..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> @@ -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,14 +1267,36 @@ /// </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鍒楄〃 + /// </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,23 @@ spkList.Add(SensorCO2); spkList.Add(SensorTVOC); spkList.Add(SensorHumidity); - spkList.Add(SensorEnvironment); + 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 +1382,10 @@ /// 绾㈠椋庢墖 /// </summary> public const string FanIr = "ir.fan"; + /// <summary> + /// 鏅鸿兘绌哄紑 + /// </summary> + public const string AirSwitch = "electrical.breaker"; #region 娑傞甫 /// <summary> @@ -1388,6 +1428,7 @@ spkList.Add(ElectricTuyaFan); spkList.Add(ElectricTuyaWeepRobot); spkList.Add(ElectricTuyaWaterValve); + spkList.Add(AirSwitch); return spkList; } -- Gitblit v1.8.0