From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/Common/Constant.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Common/Constant.cs b/HDL_ON/Common/Constant.cs
index 3d949c0..79920f1 100644
--- a/HDL_ON/Common/Constant.cs
+++ b/HDL_ON/Common/Constant.cs
@@ -199,17 +199,21 @@
public enum ShareType
{
/// <summary>
- ///
+ /// 鎴块棿绫诲瀷
/// </summary>
ROOM = 1,
/// <summary>
- ///
+ /// 璁惧绫诲瀷
/// </summary>
DEVICE,
/// <summary>
- ///
+ /// 鍦烘櫙绫诲瀷
/// </summary>
SCENE,
+ /// <summary>
+ ///
+ /// </summary>
+ LOGIC,
}
/// <summary>
@@ -231,6 +235,56 @@
Prompt,
}
+ /// <summary>
+ /// 鎺ㄩ�佹秷鎭疢essageType
+ /// </summary>
+ public enum PushMessageType
+ {
+ /// <summary>
+ /// Prompt
+ /// </summary>
+ Prompt = 0,
+ /// <summary>
+ /// 鎶ヨ绫�
+ /// </summary>
+ Alarm,
+ /// <summary>
+ /// 涓版灄鍙瀵硅鍛煎彨
+ /// </summary>
+ FLCall,
+ /// <summary>
+ /// 鎸や笅绾挎帹閫�
+ /// </summary>
+ OffLine,
+ /// <summary>
+ /// 鑷姩鍖栨墽琛�
+ /// </summary>
+ LogicExecute,
+ /// <summary>
+ /// 瀹夐槻鎶ヨ
+ /// </summary>
+ SecurityAlarm,
+ }
+
+ /// <summary>
+ /// BottomLine 绫诲瀷
+ /// </summary>
+ public enum BottomLineType
+ {
+ /// <summary>
+ /// 鏅��
+ /// </summary>
+ Normal = 0,
+ /// <summary>
+ /// 鑾峰彇鐒︾偣
+ /// </summary>
+ GotFocus,
+ /// <summary>
+ /// 閿欒
+ /// </summary>
+ Error,
+ }
+
#endregion
}
--
Gitblit v1.8.0