From 5d6626e390f7bccbbfbc0df1e95f8fb86a53af58 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 15 十二月 2020 18:25:47 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/Entity/Enumerative/MyEnum.cs | 241 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 217 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index 685e459..eaa4801 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -6,11 +6,35 @@
namespace HDL_ON
{
/// <summary>
- /// 鎺у埗鍛戒护绫诲瀷
+ /// a鍗忚鍛戒护
/// </summary>
- public enum CommandType
+ public enum CommandType_A
{
+ write,
+ read,
+ }
+ /// <summary>
+ /// 鍔熻兘鏄剧ず鎺掑簭鏂瑰紡
+ /// </summary>
+ public enum SortOrder
+ {
+ /// <summary>
+ /// 鏃犳帓搴忔柟寮�
+ /// </summary>
+ None,
+ /// <summary>
+ /// 浣跨敤娆℃暟
+ /// </summary>
+ UsageCount,
+ /// <summary>
+ /// 浣跨敤棰戠巼
+ /// </summary>
+ UsageFrequency,
+ /// <summary>
+ /// 鎵嬪姩鎺掑簭
+ /// </summary>
+ FixedSerialNumber,
}
/// <summary>
@@ -21,38 +45,168 @@
/// <summary>
/// 鏅�氬満鏅�
/// </summary>
- OrdinaryScenes = 0x01,
+ OrdinaryScenes = 1,
/// <summary>
/// 鐢靛奖changing
/// </summary>
- MovieScene = 0x02,
- }
-
- /// <summary>
- /// 鍔熻兘绫诲埆
- /// </summary>
- public enum FunctionType
- {
- Scene = 0x0001,
- MovieScene = 0x0002,
- Relay = 0x0101,
- Dimmer = 0x0102,
- RGB = 0x0103,
- Curtain = 0x0201,
- MotorCurtain = 0x0202,
- RollingShutter = 0x0203,
- AC = 0x0301,
- FloorHeating = 0x0401,
+ 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
{
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>
+ public enum ShowFunction
+ {
/// <summary>
/// 鍦烘櫙
/// </summary>
@@ -135,9 +289,9 @@
Weather = 0x14,
- DoorLock=0x15,
+ DoorLock = 0x15,
- Electric=0x16,
+ Electric = 0x16,
EnergyMonitoring = 0x17,
@@ -151,4 +305,43 @@
}
+ /// <summary>
+ /// 鎿嶄綔绫诲瀷
+ /// </summary>
+ public enum OptionType
+ {
+ Add,
+ Update,
+ Delete,
+ Cover,
+ }
+
+ public enum InfraredCode_TV
+ {
+ VolDown = 1,
+ ChannelUp,//00002=棰戦亾+
+ Menu,//00003=鑿滃崟
+ ChannelDown,//00004=棰戦亾-
+ VolUp,//00005=闊抽噺+
+ Power,//00006=鐢垫簮閿�
+ Mute,//00007=闈欓煶
+ One,//00008=1
+ Two,//00009=2
+ Three,//00010=3
+ Four,//00011=4
+ Five,//00012=5
+ Six,//00013=6
+ Seven,//00014=7
+ Eight,//00015=8
+ Nine,//00016=9
+ Change,//00017=-/--
+ Zero,//00018=0
+ AV_TV,//00019=AV/TV
+ Back,//00020=杩斿洖
+ Confrim,//00021=纭畾
+ Up,//00022=涓�
+ Left,//00023=宸�
+ Right,//00024=鍙�
+ Down,//00025=涓�
+ }
}
--
Gitblit v1.8.0