From 0a12bfc2e9594345a0a6cf136bcf234c62450d9d Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 14 十月 2023 16:31:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 eceef2f..586c9f6 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
@@ -17,8 +17,11 @@
public interface IHikClientService {
void loadHCNetSDKLib();
- //鐧诲綍
- void login(ArdCameras cameras);
+ //鍚屾鐧诲綍
+ void syncLogin(ArdCameras cameras);
+
+ //寮傛鐧诲綍
+ void asyncLogin(ArdCameras cameras);
//鐧诲綍鎵�鏈夌浉鏈�
void loginAll();
@@ -36,7 +39,7 @@
boolean setFocusPos(CameraCmd cmd);
//鑾峰彇鑱氱劍鍊�
- Map<String,Object> getFocusPos(CameraCmd cmd);
+ Map<String, Object> getFocusPos(CameraCmd cmd);
//璁剧疆棰勭疆浣�
boolean setPreset(CameraCmd cmd);
@@ -45,7 +48,7 @@
boolean gotoPreset(CameraCmd cmd);
//鑾峰彇鐮佹祦鍘嬬缉鍙傛暟
- Map<String,String> getVideoCompressionCfg(CameraCmd cmd);
+ Map<String, String> getVideoCompressionCfg(CameraCmd cmd);
//閫忛浘
boolean controlDefogcfg(CameraCmd cmd);
@@ -109,6 +112,7 @@
//鑾峰彇鐩告満閫氶亾淇℃伅
public List<ArdChannel> getCameraChannelList(ArdCameras camera);
+
//鑾峰彇GIS淇℃伅鏁版嵁
- public Map<String,Object> getGisInfo(CameraCmd cmd);
+ public Map<String, Object> getGisInfo(CameraCmd cmd);
}
--
Gitblit v1.9.3