From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/Entity/Enumerative/MyEnum.cs | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index 3b7ebca..9bac1cb 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -45,32 +45,48 @@
/// <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,
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>
- /// 鍔熻兘绫诲瀷
+ /// 鍔熻兘绫诲埆
/// </summary>
public enum FunctionCategory
{
@@ -79,7 +95,7 @@
/// 寮�鍏崇被
/// </summary>
SwitchDevice = 0x01,
-
+
/// <summary>
/// 鍦烘櫙
/// </summary>
@@ -116,14 +132,14 @@
///// 鎸夐敭
///// </summary>
//Key = 0x09,
- ///// <summary>
- ///// 闊充箰
- ///// </summary>
- //Music = 0x0A,
- ///// <summary>
- ///// 浼犳劅鍣�
- ///// </summary>
- //Sensor = 0x0B,
+ /// <summary>
+ /// 闊充箰
+ /// </summary>
+ Music = 0x09,
+ /// <summary>
+ /// 浼犳劅鍣�
+ /// </summary>
+ Sensor = 0x05,
///// <summary>
///// 闂ㄩ攣
///// </summary>
@@ -140,10 +156,10 @@
///// 鍦扮悊鍥存爮
///// </summary>
//GeographicalFence = 0x0F,
- ///// <summary>
- ///// 骞叉帴鐐�
- ///// </summary>
- //DryContact = 0x10,
+ /// <summary>
+ /// 鐢靛櫒
+ /// </summary>
+ Electrical = 0x10,
///// <summary>
///// 绾㈠
///// </summary>
@@ -273,5 +289,32 @@
}
-
+ 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