From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/Common/Constant.cs | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Common/Constant.cs b/HDL_ON/Common/Constant.cs
index ff3f1b5..a5c0598 100644
--- a/HDL_ON/Common/Constant.cs
+++ b/HDL_ON/Common/Constant.cs
@@ -199,15 +199,15 @@
public enum ShareType
{
/// <summary>
- ///
+ /// 鎴块棿绫诲瀷
/// </summary>
ROOM = 1,
/// <summary>
- ///
+ /// 璁惧绫诲瀷
/// </summary>
DEVICE,
/// <summary>
- ///
+ /// 鍦烘櫙绫诲瀷
/// </summary>
SCENE,
/// <summary>
@@ -236,6 +236,41 @@
}
/// <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>
+ /// HDL鍙瀵硅
+ /// </summary>
+ HDL_INTERPHONE,
+ }
+
+ /// <summary>
/// BottomLine 绫诲瀷
/// </summary>
public enum BottomLineType
@@ -253,7 +288,35 @@
/// </summary>
Error,
}
-
+
+ public enum SpeakerType
+ {
+ /// <summary>
+ /// 灏忓害
+ /// </summary>
+ DuerOS = 0,
+ /// <summary>
+ /// Google Home
+ /// </summary>
+ Google,
+ /// <summary>
+ /// Alexa Echo
+ /// </summary>
+ Alexa,
+ /// <summary>
+ /// Alice
+ /// </summary>
+ Alice,
+ /// <summary>
+ /// 澶╃尗绮剧伒
+ /// </summary>
+ Aligenie,
+ /// <summary>
+ /// 鎬濆繀椹�
+ /// </summary>
+ AISpeech
+ }
+
#endregion
-}
+ }
--
Gitblit v1.8.0