From 6ba43603ccd8868a4ee73e9b978b7cb20a5b2c52 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 04 十二月 2020 14:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC'
---
HDL_ON/Entity/Enumerative/MyEnum.cs | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index 98a240f..a4db6f7 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -45,15 +45,15 @@
/// <summary>
/// 鏅�氬満鏅�
/// </summary>
- OrdinaryScenes = 0x01,
+ OrdinaryScenes = 1,
/// <summary>
/// 鐢靛奖changing
/// </summary>
- MovieScene = 0x02,
+ MovieScene = 2,
}
/// <summary>
- /// 鍔熻兘绫诲埆
+ /// 鍔熻兘绫诲瀷
/// </summary>
public enum FunctionType
{
@@ -64,7 +64,7 @@
/// <summary>
/// 鑹叉俯
/// </summary>
- ColorTemperature =0x0203,
+ ColorTemperature = 0x0203,
RGB = 0x0204,
Curtain = 0x0301,
MotorCurtain = 0x0303,
@@ -74,7 +74,7 @@
Fan = 0x1001,
TV = 0x1002,
- Socket =0x0102,
+ Socket = 0x0102,
PM25 = 0x0506,
CO2 = 0x0507,
@@ -83,10 +83,29 @@
Humidity = 0x0503,
A31Music = 0x0902,
+
+ //铏氭嫙鐨勫厛鐢ㄦ潵璋冭瘯鐣岄潰
+ /// <summary>
+ /// RGBW
+ /// </summary>
+ RGBW = 0x0102,
+ /// <summary>
+ /// CCT鐏�
+ /// </summary>
+ CCT = 0x0103,
+ /// <summary>
+ /// 寮�鍚堝笜
+ /// </summary>
+ TrietexCurtain = 0x0104,
+ /// <summary>
+ /// 鍗峰笜
+ /// </summary>
+ RollerCurtain = 0x0105,
+
}
/// <summary>
- /// 鍔熻兘绫诲瀷
+ /// 鍔熻兘绫诲埆
/// </summary>
public enum FunctionCategory
{
@@ -95,7 +114,7 @@
/// 寮�鍏崇被
/// </summary>
SwitchDevice = 0x01,
-
+
/// <summary>
/// 鍦烘櫙
/// </summary>
@@ -184,7 +203,6 @@
//SecurityMonitoring = 0x20,
//VideoIntercom = 0x21,
}
-
/// <summary>
/// 鍔熻兘绫诲瀷
@@ -289,8 +307,16 @@
}
-
-
+ /// <summary>
+ /// 鎿嶄綔绫诲瀷
+ /// </summary>
+ public enum OptionType
+ {
+ Add,
+ Update,
+ Delete,
+ Cover,
+ }
public enum InfraredCode_TV
{
--
Gitblit v1.8.0