From d9cfe061b9b501511f5d769f751c8ff6bbcb1bf9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 八月 2023 15:20:25 +0800
Subject: [PATCH] 优化对讲释放流程
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
index a2fd1e3..baf0f5a 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -87,6 +87,7 @@
if (callback == null) {
try {
Response response = client.newCall(request).execute();
+
if (response.isSuccessful()) {
ResponseBody responseBody = response.body();
if (responseBody != null) {
@@ -94,6 +95,8 @@
responseJSON = JSON.parseObject(responseStr);
}
}else {
+ System.out.println( 2222);
+ System.out.println( response.code());
response.close();
Objects.requireNonNull(response.body()).close();
}
@@ -102,11 +105,11 @@
if(e instanceof SocketTimeoutException){
//璇诲彇瓒呮椂瓒呮椂寮傚父
- logger.error(String.format("璇诲彇ZLM鏁版嵁澶辫触: %s, %s", url, e.getMessage()));
+ logger.error(String.format("璇诲彇ZLM鏁版嵁瓒呮椂澶辫触: %s, %s", url, e.getMessage()));
}
if(e instanceof ConnectException){
//鍒ゆ柇杩炴帴寮傚父锛屾垜杩欓噷鏄姤Failed to connect to 10.7.5.144
- logger.error(String.format("杩炴帴ZLM澶辫触: %s, %s", url, e.getMessage()));
+ logger.error(String.format("杩炴帴ZLM杩炴帴澶辫触: %s, %s", url, e.getMessage()));
}
}catch (Exception e){
@@ -154,7 +157,6 @@
public void sendGetForImg(MediaServerItem mediaServerItem, String api, Map<String, Object> params, String targetPath, String fileName) {
String url = String.format("http://%s:%s/index/api/%s", mediaServerItem.getIp(), mediaServerItem.getHttpPort(), api);
- logger.debug(url);
HttpUrl parseUrl = HttpUrl.parse(url);
if (parseUrl == null) {
return;
@@ -193,10 +195,10 @@
} else {
logger.error(String.format("[ %s ]璇锋眰澶辫触: %s %s", url, response.code(), response.message()));
}
- Objects.requireNonNull(response.body()).close();
} else {
logger.error(String.format("[ %s ]璇锋眰澶辫触: %s %s", url, response.code(), response.message()));
}
+ Objects.requireNonNull(response.body()).close();
} catch (ConnectException e) {
logger.error(String.format("杩炴帴ZLM澶辫触: %s, %s", e.getCause().getMessage(), e.getMessage()));
logger.info("璇锋鏌edia閰嶇疆骞剁‘璁LM宸插惎鍔�...");
@@ -290,6 +292,14 @@
return sendPost(mediaServerItem, "startSendRtp",param, null);
}
+ public JSONObject startSendRtpPassive(MediaServerItem mediaServerItem, Map<String, Object> param) {
+ return sendPost(mediaServerItem, "startSendRtpPassive",param, null);
+ }
+
+ public JSONObject startSendRtpPassive(MediaServerItem mediaServerItem, Map<String, Object> param, RequestCallback callback) {
+ return sendPost(mediaServerItem, "startSendRtpPassive",param, callback);
+ }
+
public JSONObject stopSendRtp(MediaServerItem mediaServerItem, Map<String, Object> param) {
return sendPost(mediaServerItem, "stopSendRtp",param, null);
}
--
Gitblit v1.8.0