From 9b44e30275621a48335fbea7b32b5065a2859c9c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 三月 2021 16:54:33 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/Common/Constant.cs | 65 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Common/Constant.cs b/HDL_ON/Common/Constant.cs
index 8d28c11..79920f1 100644
--- a/HDL_ON/Common/Constant.cs
+++ b/HDL_ON/Common/Constant.cs
@@ -28,7 +28,10 @@
/// </summary>
public const string URL_APPSTORE = "https://apps.apple.com/cn/app/on/id1532353432";
-
+ /// <summary>
+ /// 瑁佸壀鍥剧墖鐨勯珮澶у皬
+ /// </summary>
+ public const int CROP_IMAGE_YSIZE = 300;
}
#endregion
@@ -196,17 +199,21 @@
public enum ShareType
{
/// <summary>
- ///
+ /// 鎴块棿绫诲瀷
/// </summary>
ROOM = 1,
/// <summary>
- ///
+ /// 璁惧绫诲瀷
/// </summary>
DEVICE,
/// <summary>
- ///
+ /// 鍦烘櫙绫诲瀷
/// </summary>
SCENE,
+ /// <summary>
+ ///
+ /// </summary>
+ LOGIC,
}
/// <summary>
@@ -228,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