From 0533bbabfe22484a84c85d13a391a1fd5cb949c2 Mon Sep 17 00:00:00 2001 From: Administrator <1144154118@qq.com> Date: 星期二, 25 七月 2023 14:48:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java index 6ef6268..2d43e0e 100644 --- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java +++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java @@ -2,13 +2,11 @@ import com.ruoyi.device.camera.domain.ArdCameras; import com.ruoyi.device.camera.domain.CameraCmd; - -import java.io.IOException; import java.util.Map; /** * @ClassName: sdkClinet - * @Description:娴峰悍鎿嶄綔瀹㈡埛绔帴鍙g被 + * @Description: 娴峰悍鎿嶄綔瀹㈡埛绔帴鍙g被 * @Author: Administrator * @Date: 2023骞�01鏈�17鏃� 15:59 * @Version: 1.0 @@ -35,7 +33,7 @@ boolean setFocusPos(CameraCmd cmd); //鑾峰彇鑱氱劍鍊� - Map getFocusPos(CameraCmd cmd); + Map<String,Object> getFocusPos(CameraCmd cmd); //璁剧疆棰勭疆浣� boolean setPreset(CameraCmd cmd); @@ -54,8 +52,10 @@ //鑱氱劍妯″紡 boolean controlFocusMode(CameraCmd cmd); + //鑾峰彇鑱氱劍妯″紡 String getFocusMode(CameraCmd cmd); + //浜戝彴鍔犵儹 boolean controlPTHeateRpwron(CameraCmd cmd); @@ -64,8 +64,10 @@ //閰嶇疆閿佸畾 boolean controlLock(CameraCmd cmd); + //閰嶇疆瑙i攣 boolean controlUnLock(CameraCmd cmd); + //鑾峰彇浜戝彴閿佸畾淇℃伅 int getPTZLockInfo(CameraCmd cmd); @@ -89,9 +91,16 @@ //鎵嬪姩褰曞儚 String record(CameraCmd cmd); - //鎵嬪姩褰曞儚 - String recordToMinio(CameraCmd cmd); //寮曞鐩爣浣嶇疆 boolean guideTargetPosition(CameraCmd cmd); + + //寮�濮嬪綍鍍� + void recordStart(CameraCmd cmd); + + //鍋滄褰曞儚-涓婁紶minio-杩斿洖褰曞儚url + String recordStopToMinio(CameraCmd cmd); + + //鍋滄褰曞儚-涓嶄笂浼爉inio + void recordStopNotToMinio(CameraCmd cmd); } -- Gitblit v1.9.3