From a19e58425e44c8a83c3d1b23de292659c38a6b1e Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 05 六月 2023 14:09:20 +0800 Subject: [PATCH] Merge branch 'Dev-Branch' into wjc --- HDL_ON/Entity/Function/Function.cs | 44 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 39 insertions(+), 5 deletions(-) diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs index 96d30fd..6e468e9 100644 --- a/HDL_ON/Entity/Function/Function.cs +++ b/HDL_ON/Entity/Function/Function.cs @@ -565,13 +565,27 @@ new System.Threading.Thread(() => { - if (collect) - { - result = ApiUtlis.Ins.HttpRequest.CollectDevice(deviceId).Code; + if (spk == SPK.GroupControl) { + var groupControl = FunctionList.List.groupControls.Find((obj) => obj.sid == sid); + if (collect) + { + result = ApiUtlis.Ins.HttpRequest.CollectGroupControl(groupControl.userDeviceGroupControlId).Code; + } + else + { + result = ApiUtlis.Ins.HttpRequest.CancelCollectGroupControl(groupControl.userDeviceGroupControlId).Code; + } } else { - result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(deviceId).Code; + if (collect) + { + result = ApiUtlis.Ins.HttpRequest.CollectDevice(deviceId).Code; + } + else + { + result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(deviceId).Code; + } } //鎻愮ず閿欒 if (result != StateCode.SUCCESS) @@ -1360,6 +1374,10 @@ public static class SPK { /// <summary> + /// 缇ゆ帶锛堣嚜瀹氫箟锛� + /// </summary> + public const string GroupControl = "GroupControl"; + /// <summary> /// 閫氱敤寮�鍏� /// </summary> public const string OtherCommon = "other.common"; @@ -1398,6 +1416,7 @@ return list; } + /// <summary> /// 鐚溂 /// </summary> @@ -1407,6 +1426,10 @@ /// </summary> public const string VideoDoorLock="security.door.ezviz"; /// <summary> + /// 钀ょ煶鎽勫儚澶� + /// </summary> + public const string Ev_Ipcam = "security.ipcam.ez"; + /// <summary> /// 钀ょ煶瑙嗛闂ㄩ攣spk鍒楄〃 /// </summary> /// <returns></returns> @@ -1414,6 +1437,17 @@ { var list = new List<string>(); list.Add(VideoDoorLock); + return list; + } + + /// <summary> + /// 钀ょ煶鎽勫儚澶磗pk鍒楄〃 + /// </summary> + /// <returns></returns> + public static List<string> GetEvIpcamSPKList() + { + var list = new List<string>(); + list.Add(Ev_Ipcam); return list; } @@ -1508,7 +1542,7 @@ public const string HvacAC = "hvac.ac"; /// <summary> /// 姣涚粏绠$┖璋� - /// </summary> + /// </summaryc public const string HvacCac = "hvac.cac"; /// <summary> -- Gitblit v1.8.0