From bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 14:06:36 +0800
Subject: [PATCH] 20201217-1

---
 HDL_ON/Entity/Enumerative/MyEnum.cs |  109 ++++++++++++++++++++++++++++++++----------------------
 1 files changed, 65 insertions(+), 44 deletions(-)

diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index a87b097..eaa4801 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -45,51 +45,65 @@
         /// <summary>
         /// 鏅�氬満鏅�
         /// </summary>
-        OrdinaryScenes = 0x01,
+        OrdinaryScenes = 1,
         /// <summary>
         /// 鐢靛奖changing
         /// </summary>
-        MovieScene = 0x02,
-    }
-
-    /// <summary>
-    /// 鍔熻兘绫诲埆
-    /// </summary>
-    public enum FunctionType
-    {
-        Scene = 0x0001,
-        MovieScene = 0x0002,
-        Relay = 0x0201,
-        Dimmer = 0x0202,
-        /// <summary>
-        /// 鑹叉俯
-        /// </summary>
-        ColorTemperature =0x0203,
-        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,
-
-        A31Music = 0x1A23,
+        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
     {
@@ -98,7 +112,7 @@
         /// 寮�鍏崇被
         /// </summary>
         SwitchDevice = 0x01,
-
+        
         /// <summary>
         /// 鍦烘櫙
         /// </summary>
@@ -138,11 +152,11 @@
         /// <summary>
         /// 闊充箰
         /// </summary>
-        Music = 0x1A,
+        Music = 0x09,
         /// <summary>
         /// 浼犳劅鍣�
         /// </summary>
-        Sensor = 0x0B,
+        Sensor = 0x05,
         ///// <summary>
         ///// 闂ㄩ攣
         ///// </summary>
@@ -187,7 +201,6 @@
         //SecurityMonitoring = 0x20,
         //VideoIntercom = 0x21,
     }
-
 
     /// <summary>
     /// 鍔熻兘绫诲瀷
@@ -292,8 +305,16 @@
 
     }
 
-
-
+    /// <summary>
+    /// 鎿嶄綔绫诲瀷
+    /// </summary>
+    public enum OptionType
+    {
+        Add,
+        Update,
+        Delete,
+        Cover,
+    }
 
     public enum InfraredCode_TV
     {

--
Gitblit v1.8.0