From a170a2ecef6d5c87883ed552dbbc81cfb0358d13 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 19 十一月 2021 16:43:53 +0800
Subject: [PATCH] Merge branch 'WJC' into newBranch1
---
HDL_ON/Entity/Enumerative/MyEnum.cs | 196 ++++++++----------------------------------------
1 files changed, 33 insertions(+), 163 deletions(-)
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index a4db6f7..1282a71 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -45,165 +45,16 @@
/// <summary>
/// 鏅�氬満鏅�
/// </summary>
- OrdinaryScenes = 1,
+ OrdinaryScenes = 0,
/// <summary>
- /// 鐢靛奖changing
+ /// 鐢靛奖鍦烘櫙
/// </summary>
- MovieScene = 2,
+ MovieScene = 1,
+ /// <summary>
+ /// 鐏厜鍦烘櫙
+ /// </summary>
+ LightScene = 2,
}
-
- /// <summary>
- /// 鍔熻兘绫诲瀷
- /// </summary>
- public enum FunctionType
- {
- Scene = 0x0A01,
- MovieScene = 0x0A02,
- Relay = 0x0201,
- Dimmer = 0x0202,
- /// <summary>
- /// 鑹叉俯
- /// </summary>
- ColorTemperature = 0x0203,
- RGB = 0x0204,
- Curtain = 0x0301,
- MotorCurtain = 0x0303,
- 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>
- /// CCT鐏�
- /// </summary>
- CCT = 0x0103,
- /// <summary>
- /// 寮�鍚堝笜
- /// </summary>
- TrietexCurtain = 0x0104,
- /// <summary>
- /// 鍗峰笜
- /// </summary>
- RollerCurtain = 0x0105,
-
- }
-
- /// <summary>
- /// 鍔熻兘绫诲埆
- /// </summary>
- public enum FunctionCategory
- {
- UnKown = int.MaxValue,
- /// <summary>
- /// 寮�鍏崇被
- /// </summary>
- SwitchDevice = 0x01,
-
- /// <summary>
- /// 鍦烘櫙
- /// </summary>
- Scene = 0x0A,
- /// <summary>
- /// 鐓ф槑
- /// </summary>
- Light = 0x02,
- /// <summary>
- /// 閬槼
- /// </summary>
- Curtain = 0x03,
- /// <summary>
- /// 鎭掓俯鍣�/绌鸿皟/鍦扮儹
- /// </summary>
- Thermostat = 0x04,
- ///// <summary>
- ///// 绐楀笜
- ///// </summary>
- //Curtain = 0x05,
- ///// <summary>
- ///// 绌鸿皟
- ///// </summary>
- //AC = 0x06,
- ///// <summary>
- ///// 鍦扮儹
- ///// </summary>
- //FloorHeating = 0x07,
- ///// <summary>
- ///// 鏂伴
- ///// </summary>
- //FreshAir = 0x08,
- ///// <summary>
- ///// 鎸夐敭
- ///// </summary>
- //Key = 0x09,
- /// <summary>
- /// 闊充箰
- /// </summary>
- Music = 0x09,
- /// <summary>
- /// 浼犳劅鍣�
- /// </summary>
- Sensor = 0x05,
- ///// <summary>
- ///// 闂ㄩ攣
- ///// </summary>
- //DoorLook = 0x0C,
- ///// <summary>
- ///// 鏃堕棿
- ///// </summary>
- //Timer = 0x0D,
- ///// <summary>
- ///// 璁℃暟鍣�
- ///// </summary>
- //Counter = 0x0E,
- ///// <summary>
- ///// 鍦扮悊鍥存爮
- ///// </summary>
- //GeographicalFence = 0x0F,
- /// <summary>
- /// 鐢靛櫒
- /// </summary>
- Electrical = 0x10,
- ///// <summary>
- ///// 绾㈠
- ///// </summary>
- //IR = 0x11,
- ///// <summary>
- ///// DMX
- ///// </summary>
- //DMX = 0x12,
- ///// <summary>
- ///// 鐢靛櫒
- ///// </summary>
- //EelectricAppliance = 0x13,
- ///// <summary>
- ///// 澶╂皵
- ///// </summary>
- //Weather = 0x14,
- //DoorLock=0x15,
- //Electric=0x16,
- //EnergyMonitoring = 0x17,
- //Environmental = 0x18,
- //Panel = 0x19,
- //SecurityMonitoring = 0x20,
- //VideoIntercom = 0x21,
- }
-
/// <summary>
/// 鍔熻兘绫诲瀷
/// </summary>
@@ -290,20 +141,39 @@
/// </summary>
Weather = 0x14,
-
+ /// <summary>
+ /// 闂ㄩ攣
+ /// </summary>
DoorLock = 0x15,
-
+ /// <summary>
+ /// 鐢靛櫒
+ /// </summary>
Electric = 0x16,
-
+ /// <summary>
+ /// 鑳芥簮鐩戞帶
+ /// </summary>
EnergyMonitoring = 0x17,
-
+ /// <summary>
+ /// 鐜鏁版嵁
+ /// </summary>
Environmental = 0x18,
-
+ /// <summary>
+ /// 闈㈡澘
+ /// </summary>
Panel = 0x19,
-
+ /// <summary>
+ /// 瀹夐槻鐩戞帶
+ /// </summary>
SecurityMonitoring = 0x20,
-
+ /// <summary>
+ /// 鍙瀵硅
+ /// </summary>
VideoIntercom = 0x21,
+ /// <summary>
+ /// 瀹夐槻涓績
+ /// </summary>
+ SecurityCenter = 0x22,
+
}
--
Gitblit v1.8.0