From 8cb8a874db01acd1113cfeb5c2c5bf7e9555ff65 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 21 十月 2023 15:26:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java |   51 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 35 insertions(+), 16 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 4cb73e6..2c2c2c9 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,28 +2,33 @@
 
 import com.ruoyi.device.camera.domain.ArdCameras;
 import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.channel.domain.ArdChannel;
 
-import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
 /**
- * @ClassName: sdkClinet
- * @Description:娴峰悍鎿嶄綔瀹㈡埛绔帴鍙ｇ被
+ * @ClassName: IHikClientService
+ * @Description: 娴峰悍鎿嶄綔瀹㈡埛绔帴鍙ｇ被
  * @Author: Administrator
  * @Date: 2023骞�01鏈�17鏃� 15:59
  * @Version: 1.0
  **/
 public interface IHikClientService {
-    void loadHCNetSDKLib();
+    //sdk鍒濆鍖�
+    boolean init();
 
-    //鐧诲綍
-    void login(ArdCameras cameras);
+    //鍚屾鐧诲綍
+    void syncLogin(ArdCameras cameras);
+
+    //寮傛鐧诲綍
+    void asyncLogin(ArdCameras cameras);
 
     //鐧诲綍鎵�鏈夌浉鏈�
     void loginAll();
 
     //娉ㄩ攢
-    boolean loginOut(String cameraId);
+    boolean logout(String cameraId);
 
     //鍦ㄧ嚎鐘舵��
     boolean isOnLine(CameraCmd cmd);
@@ -35,7 +40,7 @@
     boolean setFocusPos(CameraCmd cmd);
 
     //鑾峰彇鑱氱劍鍊�
-    Map getFocusPos(CameraCmd cmd);
+    int getFocusPos(CameraCmd cmd);
 
     //璁剧疆棰勭疆浣�
     boolean setPreset(CameraCmd cmd);
@@ -43,26 +48,26 @@
     //璋冪敤棰勭疆浣�
     boolean gotoPreset(CameraCmd cmd);
 
-    //鍒嗚鲸鐜囪幏鍙�
-    String getVideoResolution(CameraCmd cmd);
+    //鑾峰彇鐮佹祦鍘嬬缉鍙傛暟
+    Map<String, Object> getVideoCompressionCfg(CameraCmd cmd);
 
     //閫忛浘
     boolean controlDefogcfg(CameraCmd cmd);
 
-    //绾㈠?
+    //绾㈠
     boolean controlInfrarecfg(CameraCmd cmd);
 
     //鑱氱劍妯″紡
     boolean controlFocusMode(CameraCmd cmd);
+
+    //鑾峰彇鑱氱劍妯″紡
+    String getFocusMode(CameraCmd cmd);
 
     //浜戝彴鍔犵儹
     boolean controlPTHeateRpwron(CameraCmd cmd);
 
     //闀滃ご闄ゅ啺
     boolean controlCameraDeicing(CameraCmd cmd);
-
-    //閰嶇疆閿佸畾
-    boolean controlLock(CameraCmd cmd);
 
     //鑾峰彇浜戝彴閿佸畾淇℃伅
     int getPTZLockInfo(CameraCmd cmd);
@@ -79,6 +84,7 @@
     //鑾峰彇ptz鑼冨洿
     Map<String, Object> getPtzScope(CameraCmd cmd);
 
+    //璁剧疆ptz
     boolean setPtz(CameraCmd cmd);
 
     //璁剧疆闆舵柟浣嶈
@@ -87,9 +93,22 @@
     //鎵嬪姩褰曞儚
     String record(CameraCmd cmd);
 
-    //鎵嬪姩褰曞儚
-    String recordToMinio(CameraCmd cmd);
 
     //寮曞鐩爣浣嶇疆
     boolean guideTargetPosition(CameraCmd cmd);
+
+    //寮�濮嬪綍鍍�
+    boolean recordStart(CameraCmd cmd);
+
+    //鍋滄褰曞儚-涓婁紶minio-杩斿洖褰曞儚url
+    String recordStopToMinio(CameraCmd cmd);
+
+    //鍋滄褰曞儚-涓嶄笂浼爉inio
+    boolean recordStopNotToMinio(CameraCmd cmd);
+
+    //鑾峰彇鐩告満閫氶亾淇℃伅
+    public List<ArdChannel> getCameraChannelList(ArdCameras camera);
+
+    //鑾峰彇GIS淇℃伅鏁版嵁
+    public Map<String, Object> getGisInfo(CameraCmd cmd);
 }

--
Gitblit v1.9.3