From 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:20:01 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/Entity/Enumerative/MyEnum.cs | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index 233725a..9bac1cb 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -45,11 +45,11 @@
/// <summary>
/// 鏅�氬満鏅�
/// </summary>
- OrdinaryScenes = 0x01,
+ OrdinaryScenes = 1,
/// <summary>
/// 鐢靛奖changing
/// </summary>
- MovieScene = 0x02,
+ MovieScene = 2,
}
/// <summary>
@@ -95,7 +95,7 @@
/// 寮�鍏崇被
/// </summary>
SwitchDevice = 0x01,
-
+
/// <summary>
/// 鍦烘櫙
/// </summary>
@@ -288,9 +288,6 @@
VideoIntercom = 0x21,
}
-
-
-
public enum InfraredCode_TV
{
--
Gitblit v1.8.0