From 792ca2a402feb952ef890d653f2e049c1230baf1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:48:33 +0800
Subject: [PATCH] 1111
---
HDL_ON/Entity/Enumerative/MyEnum.cs | 109 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 68 insertions(+), 41 deletions(-)
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
old mode 100644
new mode 100755
index 0209a61..eaa4801
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -45,45 +45,65 @@
/// <summary>
/// 鏅�氬満鏅�
/// </summary>
- OrdinaryScenes = 0x01,
+ OrdinaryScenes = 1,
/// <summary>
/// 鐢靛奖changing
/// </summary>
- MovieScene = 0x02,
- }
-
- /// <summary>
- /// 鍔熻兘绫诲埆
- /// </summary>
- public enum FunctionType
- {
- Scene = 0x0001,
- MovieScene = 0x0002,
- Relay = 0x0202,
- Dimmer = 0x0201,
- RGB = 0x0204,
- Curtain = 0x0301,
- MotorCurtain = 0x0303,
- RollingShutter = 0x0304,
- AC = 0x0401,
- FloorHeating = 0x0402,
-
- Fan = 0x1002,
- TV = 0x1003,
- Socket =0x0102,
-
- PM10 = 0x0b01,
- PM25 = 0x0b06,
- //Noise = 0x0b03,
- WindPower = 0x0b04,
- CO2 = 0x0b07,
- Temp = 0x0b02,
- TVOC = 0x0b05,
- Humidity = 0x0b03,
+ MovieScene = 2,
}
/// <summary>
/// 鍔熻兘绫诲瀷
+ /// </summary>
+ public enum FunctionType
+ {
+ Scene = 0x0A01,
+ MovieScene = 0x0A02,
+ Relay = 0x0201,
+ Dimmer = 0x0202,
+ /// <summary>
+ /// 鑹叉俯
+ /// cct
+ /// </summary>
+ ColorTemperature= 0x0203,
+ RGB = 0x0204,
+ Curtain = 0x0301,
+ /// <summary>
+ /// 寮�鍚堝笜
+ /// </summary>
+ MotorCurtain= 0x0303,
+ /// <summary>
+ /// 鍗峰笜
+ /// </summary>
+ RollingShutter= 0x0304,
+ AC = 0x0401,
+ FloorHeating = 0x0402,
+
+ Fan = 0x1001,
+ TV = 0x1002,
+ Socket = 0x0102,
+
+ PM25 = 0x0506,
+ CO2 = 0x0507,
+ Temp = 0x0502,
+ TVOC = 0x0505,
+ Humidity = 0x0503,
+
+ A31Music = 0x0902,
+
+ //铏氭嫙鐨勫厛鐢ㄦ潵璋冭瘯鐣岄潰
+ /// <summary>
+ /// RGBW
+ /// </summary>
+ RGBW = 0x0102,
+
+
+
+
+ }
+
+ /// <summary>
+ /// 鍔熻兘绫诲埆
/// </summary>
public enum FunctionCategory
{
@@ -92,7 +112,7 @@
/// 寮�鍏崇被
/// </summary>
SwitchDevice = 0x01,
-
+
/// <summary>
/// 鍦烘櫙
/// </summary>
@@ -129,14 +149,14 @@
///// 鎸夐敭
///// </summary>
//Key = 0x09,
- ///// <summary>
- ///// 闊充箰
- ///// </summary>
- //Music = 0x0A,
+ /// <summary>
+ /// 闊充箰
+ /// </summary>
+ Music = 0x09,
/// <summary>
/// 浼犳劅鍣�
/// </summary>
- Sensor = 0x0B,
+ Sensor = 0x05,
///// <summary>
///// 闂ㄩ攣
///// </summary>
@@ -181,7 +201,6 @@
//SecurityMonitoring = 0x20,
//VideoIntercom = 0x21,
}
-
/// <summary>
/// 鍔熻兘绫诲瀷
@@ -286,8 +305,16 @@
}
-
-
+ /// <summary>
+ /// 鎿嶄綔绫诲瀷
+ /// </summary>
+ public enum OptionType
+ {
+ Add,
+ Update,
+ Delete,
+ Cover,
+ }
public enum InfraredCode_TV
{
--
Gitblit v1.8.0