From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/DAL/Server/NewApiRes.cs | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 2d97f12..c132a75 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -638,6 +638,23 @@
/// </summary>
public bool isSupportGroupControl = false;
+
+ public string linkDriverVersion = "3.0.0";
+ /// <summary>
+ /// 鏄惁鏀寔鍦烘櫙鎺у埗鑷姩鍖栦娇鑳�
+ /// </summary>
+ public bool isSupportSceneEnableAutomation
+ {
+ get
+ {
+#if DEBUG
+ linkDriverVersion = "V03.08.00";
+#endif
+ return string.Compare(linkDriverVersion, "V03.07.99", false) == 1 ? true : false;
+
+ }
+ }
+
///// <summary>
/////
///// </summary>
@@ -1379,7 +1396,7 @@
/// </summary>
public string childAccountId;
/// <summary>
- /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
+ /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE 4.DEVICE_GROUP_CONTROL
/// </summary>
public string shareType = "DEVICE";
}
@@ -1506,6 +1523,13 @@
/// </summary>
public string sipAccount;
+ /// <summary>
+ /// 鏄惁鏄悗鍙拌繘鍏ョ殑淇℃伅
+ /// 缁欏畨鍗撲娇鐢ㄧ殑锛屽畨鍗撲粠閫氱煡鏍忚繘鍏ユ墦寮�鍙瀵硅鐣岄潰鏈夊紓甯�
+ /// 搴旇鏄墦寮�浜嗕袱娆＄殑闂
+ /// </summary>
+ public bool isNotificationGoing = false;
+
}
/// <summary>
--
Gitblit v1.8.0