From 61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 12 九月 2023 09:48:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 95464a3..eceef2f 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
@@ -44,8 +44,8 @@
     //璋冪敤棰勭疆浣�
     boolean gotoPreset(CameraCmd cmd);
 
-    //鍒嗚鲸鐜囪幏鍙�
-    String getVideoResolution(CameraCmd cmd);
+    //鑾峰彇鐮佹祦鍘嬬缉鍙傛暟
+    Map<String,String> getVideoCompressionCfg(CameraCmd cmd);
 
     //閫忛浘
     boolean controlDefogcfg(CameraCmd cmd);

--
Gitblit v1.9.3