From a29a0a0785f966294ba01982fba62c1ff0f23bea Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 22 四月 2021 17:33:07 +0800
Subject: [PATCH] 增加对设备的兼容性
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 0265815..42ad823 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
@@ -13,6 +13,7 @@
import java.net.ConnectException;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
@Component
public class ZLMRESTfulUtils {
@@ -40,9 +41,11 @@
FormBody.Builder builder = new FormBody.Builder();
builder.add("secret",mediaSecret);
- if (param != null) {
+ if (param != null && param.keySet().size() > 0) {
for (String key : param.keySet()){
- builder.add(key, param.get(key).toString());
+ if (param.get(key) != null) {
+ builder.add(key, param.get(key).toString());
+ }
}
}
@@ -65,7 +68,7 @@
logger.error(String.format("杩炴帴ZLM澶辫触: %s, %s", e.getCause().getMessage(), e.getMessage()));
logger.info("璇锋鏌edia閰嶇疆骞剁‘璁LM宸插惎鍔�...");
}catch (IOException e) {
- e.printStackTrace();
+ logger.error(String.format("[ %s ]璇锋眰澶辫触: %s", url, e.getMessage()));
}
}else {
client.newCall(request).enqueue(new Callback(){
@@ -74,14 +77,10 @@
public void onResponse(@NotNull Call call, @NotNull Response response){
if (response.isSuccessful()) {
try {
- String responseStr = response.body().string();
- if (responseStr != null) {
- callback.run(JSON.parseObject(responseStr));
- }else {
- callback.run(null);
- }
+ String responseStr = Objects.requireNonNull(response.body()).string();
+ callback.run(JSON.parseObject(responseStr));
} catch (IOException e) {
- e.printStackTrace();
+ logger.error(String.format("[ %s ]璇锋眰澶辫触: %s", url, e.getMessage()));
}
}
}
@@ -163,6 +162,10 @@
return sendPost("closeRtpServer",param, null);
}
+ public JSONObject listRtpServer() {
+ return sendPost("listRtpServer",null, null);
+ }
+
public JSONObject startSendRtp(Map<String, Object> param) {
return sendPost("startSendRtp",param, null);
}
--
Gitblit v1.8.0