From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 06 六月 2023 11:51:12 +0800 Subject: [PATCH] Merge branch 'Dev-Branch' --- HDL_ON/Entity/Function/Function.cs | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs index 99332a5..171de78 100644 --- a/HDL_ON/Entity/Function/Function.cs +++ b/HDL_ON/Entity/Function/Function.cs @@ -277,6 +277,10 @@ /// </summary> public string extDevId = string.Empty; /// <summary> + /// 鐗╃悊璁惧(妯″潡)鍨嬪彿 + /// </summary> + public string omodel =string.Empty; + /// <summary> /// 璁惧spk /// </summary> public string spk = ""; @@ -562,11 +566,14 @@ new System.Threading.Thread(() => { 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 @@ -1408,10 +1415,20 @@ list.Add(DoorLock); return list; } + + + /// <summary> + /// 鐚溂 + /// </summary> + public const string Peephole = "peephole"; /// <summary> /// 钀ょ煶瑙嗛闂ㄩ攣 /// </summary> public const string VideoDoorLock="security.door.ezviz"; + /// <summary> + /// 钀ょ煶鎽勫儚澶� + /// </summary> + public const string Ev_Ipcam = "security.ipcam.ez"; /// <summary> /// 钀ょ煶瑙嗛闂ㄩ攣spk鍒楄〃 /// </summary> @@ -1420,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; } @@ -1514,7 +1542,7 @@ public const string HvacAC = "hvac.ac"; /// <summary> /// 姣涚粏绠$┖璋� - /// </summary> + /// </summaryc public const string HvacCac = "hvac.cac"; /// <summary> @@ -1653,6 +1681,10 @@ /// </summary> public const string SensorPir = "sensor.pir"; /// <summary> + /// 浜轰綋瀛樺湪浼犳劅鍣� + /// </summary> + public const string SensorPirHold = "sensor.pir_hold"; + /// <summary> /// 锛堥棬绐椾紶鎰熷櫒锛� /// </summary> public const string SensorDoorWindow = "sensor.doorwindow"; @@ -1707,6 +1739,7 @@ var spkList = new List<string>(); //spkList.Add(SensorLight); spkList.Add(SensorPir); + spkList.Add(SensorPirHold); spkList.Add(SensorHelp); spkList.Add(SensorDoorWindow); spkList.Add(SensorSmoke); -- Gitblit v1.8.0