From ab00d30e72fea3b9cb33dc065861e92e5d0eeb14 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 21 十月 2023 14:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 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 b740fc8..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
@@ -40,7 +40,7 @@
boolean setFocusPos(CameraCmd cmd);
//鑾峰彇鑱氱劍鍊�
- Map<String, Object> getFocusPos(CameraCmd cmd);
+ int getFocusPos(CameraCmd cmd);
//璁剧疆棰勭疆浣�
boolean setPreset(CameraCmd cmd);
@@ -49,12 +49,12 @@
boolean gotoPreset(CameraCmd cmd);
//鑾峰彇鐮佹祦鍘嬬缉鍙傛暟
- Map<String, String> getVideoCompressionCfg(CameraCmd cmd);
+ Map<String, Object> getVideoCompressionCfg(CameraCmd cmd);
//閫忛浘
boolean controlDefogcfg(CameraCmd cmd);
- //绾㈠?
+ //绾㈠
boolean controlInfrarecfg(CameraCmd cmd);
//鑱氱劍妯″紡
@@ -68,12 +68,6 @@
//闀滃ご闄ゅ啺
boolean controlCameraDeicing(CameraCmd cmd);
-
- //閰嶇疆閿佸畾
- boolean controlLock(CameraCmd cmd);
-
- //閰嶇疆瑙ｉ攣
- boolean controlUnLock(CameraCmd cmd);
//鑾峰彇浜戝彴閿佸畾淇℃伅
int getPTZLockInfo(CameraCmd cmd);
@@ -90,6 +84,7 @@
//鑾峰彇ptz鑼冨洿
Map<String, Object> getPtzScope(CameraCmd cmd);
+ //璁剧疆ptz
boolean setPtz(CameraCmd cmd);
//璁剧疆闆舵柟浣嶈
@@ -109,7 +104,7 @@
String recordStopToMinio(CameraCmd cmd);
//鍋滄褰曞儚-涓嶄笂浼爉inio
- void recordStopNotToMinio(CameraCmd cmd);
+ boolean recordStopNotToMinio(CameraCmd cmd);
//鑾峰彇鐩告満閫氶亾淇℃伅
public List<ArdChannel> getCameraChannelList(ArdCameras camera);
--
Gitblit v1.9.3