From c2f74dd7b1df9829385c8fa7fcff860f6a5aae1f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 12 七月 2024 14:23:40 +0800
Subject: [PATCH] Merge branch 'Wxr-UnuitTest' into Dev_v2.4.8_google
---
HDL_ON/Entity/Enumerative/MyEnum.cs | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index 0edd947..83cea42 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -164,7 +164,7 @@
/// <summary>
/// 瀹夐槻鐩戞帶
/// </summary>
- SecurityMonitoring = 0x20,
+ //SecurityMonitoring = 0x20,
/// <summary>
/// 鍙瀵硅
/// </summary>
@@ -181,6 +181,22 @@
/// 鏈烘鑷�
/// </summary>
MechanicalArm=0x24,
+ /// <summary>
+ /// ip鎽勫儚澶�
+ /// </summary>
+ IpCam = 0x25,
+ /// <summary>
+ /// 钀ょ煶瑙嗛闂ㄩ攣
+ /// </summary>
+ //VideoDoorLock = 0x26,
+ /// <summary>
+ /// 璺戦┈鐏紙搴忓垪锛�
+ /// </summary>
+ Series = 0x27,
+ /// <summary>
+ /// 褰遍煶涓帶
+ /// </summary>
+ //Aks = 0x28,
}
@@ -224,4 +240,28 @@
Right,//00024=鍙�
Down,//00025=涓�
}
+
+ /// <summary>
+ /// 琛ㄧず鏉ヨ嚜閭ｄ釜鐣岄潰
+ /// </summary>
+ public enum Comerom
+ {
+ function,//鍔熻兘
+ collect,//鏀惰棌
+ room,//鎴块棿
+ push,//鎺ㄩ��
+ sanfan,//娣诲姞绗笁鏂硅澶�
+ }
+
+ /// <summary>
+ /// 寮规绫诲瀷
+ /// </summary>
+ public enum TipType
+ {
+ none,//鏃犳彁绀�
+ flicker,//闂儊妗�
+ confirmation//纭妗�
+ }
+
+
}
--
Gitblit v1.8.0