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 | 137 +++++++++++++++++++++++++++++++++------------
1 files changed, 101 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index 685e459..1282a71 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,21 @@
/// <summary>
/// 鏅�氬満鏅�
/// </summary>
- OrdinaryScenes = 0x01,
+ OrdinaryScenes = 0,
/// <summary>
- /// 鐢靛奖changing
+ /// 鐢靛奖鍦烘櫙
/// </summary>
- MovieScene = 0x02,
+ MovieScene = 1,
+ /// <summary>
+ /// 鐏厜鍦烘櫙
+ /// </summary>
+ LightScene = 2,
}
-
- /// <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,
- }
-
/// <summary>
/// 鍔熻兘绫诲瀷
/// </summary>
- public enum FunctionCategory
+ public enum ShowFunction
{
- UnKown = int.MaxValue,
-
-
/// <summary>
/// 鍦烘櫙
/// </summary>
@@ -134,21 +141,79 @@
/// </summary>
Weather = 0x14,
-
- DoorLock=0x15,
-
- Electric=0x16,
-
+ /// <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,
+
}
+ /// <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