From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1
---
HDL_ON/Entity/Enumerative/MyEnum.cs | 63 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index a87b097..d9c63c6 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -45,26 +45,26 @@
/// <summary>
/// 鏅�氬満鏅�
/// </summary>
- OrdinaryScenes = 0x01,
+ OrdinaryScenes = 1,
/// <summary>
/// 鐢靛奖changing
/// </summary>
- MovieScene = 0x02,
+ MovieScene = 2,
}
/// <summary>
- /// 鍔熻兘绫诲埆
+ /// 鍔熻兘绫诲瀷
/// </summary>
public enum FunctionType
{
- Scene = 0x0001,
- MovieScene = 0x0002,
+ Scene = 0x0A01,
+ MovieScene = 0x0A02,
Relay = 0x0201,
Dimmer = 0x0202,
/// <summary>
/// 鑹叉俯
/// </summary>
- ColorTemperature =0x0203,
+ ColorTemperature = 0x0203,
RGB = 0x0204,
Curtain = 0x0301,
MotorCurtain = 0x0303,
@@ -72,24 +72,40 @@
AC = 0x0401,
FloorHeating = 0x0402,
- Fan = 0x1002,
- TV = 0x1003,
- Socket =0x0102,
+ Fan = 0x1001,
+ TV = 0x1002,
+ Socket = 0x0102,
- PM10 = 0x0b01,
- PM25 = 0x0b06,
- //Noise = 0x0b03,
- WindPower = 0x0b04,
- CO2 = 0x0b07,
- Temp = 0x0b02,
- TVOC = 0x0b05,
- Humidity = 0x0b03,
+ PM25 = 0x0506,
+ CO2 = 0x0507,
+ Temp = 0x0502,
+ TVOC = 0x0505,
+ Humidity = 0x0503,
- A31Music = 0x1A23,
+ 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
{
@@ -98,7 +114,7 @@
/// 寮�鍏崇被
/// </summary>
SwitchDevice = 0x01,
-
+
/// <summary>
/// 鍦烘櫙
/// </summary>
@@ -138,11 +154,11 @@
/// <summary>
/// 闊充箰
/// </summary>
- Music = 0x1A,
+ Music = 0x09,
/// <summary>
/// 浼犳劅鍣�
/// </summary>
- Sensor = 0x0B,
+ Sensor = 0x05,
///// <summary>
///// 闂ㄩ攣
///// </summary>
@@ -291,9 +307,6 @@
VideoIntercom = 0x21,
}
-
-
-
public enum InfraredCode_TV
{
--
Gitblit v1.8.0