From 49207386ea4a3d663628347eef443af9c7cc7f39 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 17 十月 2023 17:20:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 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 620712e..b740fc8 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,40 +2,45 @@
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);
//浜戝彴鎺у埗
- boolean PTZControlWithSpeed(CameraCmd cmd);
+ boolean pTZControlWithSpeed(CameraCmd cmd);
//璁剧疆鑱氱劍鍊�
boolean setFocusPos(CameraCmd cmd);
//鑾峰彇鑱氱劍鍊�
- Map getFocusPos(CameraCmd cmd);
+ Map<String, Object> getFocusPos(CameraCmd cmd);
//璁剧疆棰勭疆浣�
boolean setPreset(CameraCmd cmd);
@@ -43,8 +48,8 @@
//璋冪敤棰勭疆浣�
boolean gotoPreset(CameraCmd cmd);
- //鍒嗚鲸鐜囪幏鍙�
- String getVideoResolution(CameraCmd cmd);
+ //鑾峰彇鐮佹祦鍘嬬缉鍙傛暟
+ Map<String, String> getVideoCompressionCfg(CameraCmd cmd);
//閫忛浘
boolean controlDefogcfg(CameraCmd cmd);
@@ -55,6 +60,9 @@
//鑱氱劍妯″紡
boolean controlFocusMode(CameraCmd cmd);
+ //鑾峰彇鑱氱劍妯″紡
+ String getFocusMode(CameraCmd cmd);
+
//浜戝彴鍔犵儹
boolean controlPTHeateRpwron(CameraCmd cmd);
@@ -63,6 +71,9 @@
//閰嶇疆閿佸畾
boolean controlLock(CameraCmd cmd);
+
+ //閰嶇疆瑙ｉ攣
+ boolean controlUnLock(CameraCmd cmd);
//鑾峰彇浜戝彴閿佸畾淇℃伅
int getPTZLockInfo(CameraCmd cmd);
@@ -87,9 +98,22 @@
//鎵嬪姩褰曞儚
String record(CameraCmd cmd);
- //鎵嬪姩褰曞儚
- void recordToMinio(CameraCmd cmd);
//寮曞鐩爣浣嶇疆
- boolean setTargetPosition(CameraCmd cmd);
+ boolean guideTargetPosition(CameraCmd cmd);
+
+ //寮�濮嬪綍鍍�
+ boolean recordStart(CameraCmd cmd);
+
+ //鍋滄褰曞儚-涓婁紶minio-杩斿洖褰曞儚url
+ String recordStopToMinio(CameraCmd cmd);
+
+ //鍋滄褰曞儚-涓嶄笂浼爉inio
+ void recordStopNotToMinio(CameraCmd cmd);
+
+ //鑾峰彇鐩告満閫氶亾淇℃伅
+ public List<ArdChannel> getCameraChannelList(ArdCameras camera);
+
+ //鑾峰彇GIS淇℃伅鏁版嵁
+ public Map<String, Object> getGisInfo(CameraCmd cmd);
}
--
Gitblit v1.9.3