From ea0b1e8e5f43c5fd0a7d479e25ede3b8cbea464a Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期一, 02 十二月 2024 17:17:19 +0800 Subject: [PATCH] tcp;可视对讲; --- HDL_ON/DAL/Server/NewApiRes.cs | 79 +++++++++++++++------------------------ 1 files changed, 31 insertions(+), 48 deletions(-) diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs index a237ab4..d874292 100644 --- a/HDL_ON/DAL/Server/NewApiRes.cs +++ b/HDL_ON/DAL/Server/NewApiRes.cs @@ -633,6 +633,28 @@ /// </summary> public bool gatewayStatus; + /// <summary> + /// 鏄惁鏀寔缇ゆ帶 + /// </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> @@ -885,7 +907,7 @@ /// <summary> /// 瀛愯处鍙稩D childAccountId /// </summary> - public string childAccountId; + public string childId; /// <summary> /// 浣忓畢 /// </summary> @@ -908,7 +930,7 @@ /// <summary> /// 瀛愯处鎴风被鍨� ORDINARY銆丏EBUG銆丄DMIN /// </summary> - public string childAccountType; + //public string childAccountType; ///// <summary> ///// 鏄惁鍏佽杩滅▼鎺у埗 0:鍏佽 1:涓嶅厑璁� ///// </summary> @@ -1096,7 +1118,7 @@ /// <summary> /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus /// </summary> - public string software = SoftwareType.ON_Plus.ToString(); + public string software = "ON_PRO_SANTAN"; /// <summary> /// 灏忓尯codes锛堜笉浼狅紝榛樿缁戝畾鎵�鏈変綇瀹呭拰灏忓尯鐨勬帹閫侊級 /// </summary> @@ -1246,51 +1268,6 @@ public string packageUrl;//": "http://hdl-hz-test.oss-cn-hangzhou.aliyuncs.com/20/2022/11/51b8b0b2-0ebc-4632-a3b5-0be1e5d104e4.apk", public string remark; } - - /// <summary> - /// - /// </summary> - [System.Serializable] - public class AppVersionRes - { - /// <summary> - /// 搴旂敤甯傚満鍚嶇О - /// </summary> - public string appMarket; - /// <summary> - /// app鍚嶇О - /// </summary> - public string appName; - /// <summary> - /// ios涓嬭浇鍦板潃 - /// </summary> - public string iosUrl; - /// <summary> - /// 瀹夊崜涓嬭浇鍦板潃 - /// </summary> - public string androidUrl; - /// <summary> - /// 鏄惁鏄己鍒舵洿鏂� - /// </summary> - public bool isEnforce; - /// <summary> - /// 鍙戝竷绯荤粺锛孖OS銆丄ndroid - /// </summary> - public string releaseSystem; - /// <summary> - /// 澶囨敞 - /// </summary> - public string remark; - /// <summary> - /// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙f瀽 - /// </summary> - public string updateDescription; - /// <summary> - /// 鐗堟湰鍙� - /// </summary> - public string version; - } - /// <summary> /// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙f瀽 /// </summary> @@ -1546,6 +1523,12 @@ /// </summary> public string sipAccount; + /// <summary> + /// 鏄惁鏄悗鍙拌繘鍏ョ殑淇℃伅 + /// 缁欏畨鍗撲娇鐢ㄧ殑锛屽畨鍗撲粠閫氱煡鏍忚繘鍏ユ墦寮�鍙瀵硅鐣岄潰鏈夊紓甯� + /// 搴旇鏄墦寮�浜嗕袱娆$殑闂 + /// </summary> + public bool isNotificationGoing = false; } /// <summary> -- Gitblit v1.8.0