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 | 147 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 129 insertions(+), 18 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 01aa341..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
@@ -3,15 +3,17 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import okhttp3.*;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.io.IOException;
+import java.net.ConnectException;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
+import java.util.Objects;
@Component
public class ZLMRESTfulUtils {
@@ -27,7 +29,11 @@
@Value("${media.secret}")
private String mediaSecret;
- public JSONObject sendPost(String api, Map<String, Object> param) {
+ public interface RequestCallback{
+ void run(JSONObject response);
+ }
+
+ public JSONObject sendPost(String api, Map<String, Object> param, RequestCallback callback) {
OkHttpClient client = new OkHttpClient();
String url = String.format("http://%s:%s/index/api/%s", mediaIp, mediaPort, api);
JSONObject responseJSON = null;
@@ -35,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());
+ }
}
}
@@ -47,40 +55,143 @@
.post(body)
.url(url)
.build();
- try {
- Response response = client.newCall(request).execute();
- if (response.isSuccessful()) {
- String responseStr = response.body().string();
- if (responseStr != null) {
- responseJSON = JSON.parseObject(responseStr);
+ if (callback == null) {
+ try {
+ Response response = client.newCall(request).execute();
+ if (response.isSuccessful()) {
+ String responseStr = response.body().string();
+ if (responseStr != null) {
+ responseJSON = JSON.parseObject(responseStr);
+ }
+ }
+ } catch (ConnectException e) {
+ logger.error(String.format("杩炴帴ZLM澶辫触: %s, %s", e.getCause().getMessage(), e.getMessage()));
+ logger.info("璇锋鏌edia閰嶇疆骞剁‘璁LM宸插惎鍔�...");
+ }catch (IOException e) {
+ logger.error(String.format("[ %s ]璇锋眰澶辫触: %s", url, e.getMessage()));
}
+ }else {
+ client.newCall(request).enqueue(new Callback(){
+
+ @Override
+ public void onResponse(@NotNull Call call, @NotNull Response response){
+ if (response.isSuccessful()) {
+ try {
+ String responseStr = Objects.requireNonNull(response.body()).string();
+ callback.run(JSON.parseObject(responseStr));
+ } catch (IOException e) {
+ logger.error(String.format("[ %s ]璇锋眰澶辫触: %s", url, e.getMessage()));
+ }
+ }
+ }
+
+ @Override
+ public void onFailure(@NotNull Call call, @NotNull IOException e) {
+ logger.error(String.format("杩炴帴ZLM澶辫触: %s, %s", e.getCause().getMessage(), e.getMessage()));
+ logger.info("璇锋鏌edia閰嶇疆骞剁‘璁LM宸插惎鍔�...");
+ }
+ });
}
- } catch (IOException e) {
- e.printStackTrace();
- }
+
+
return responseJSON;
}
- public JSONObject getMediaList(String app, String schema){
+ public JSONObject getMediaList(String app, String stream, String schema, RequestCallback callback){
+ Map<String, Object> param = new HashMap<>();
+ if (app != null) param.put("app",app);
+ if (stream != null) param.put("stream",stream);
+ if (schema != null) param.put("schema",schema);
+ param.put("vhost","__defaultVhost__");
+ return sendPost("getMediaList",param, callback);
+ }
+
+ public JSONObject getMediaList(String app, String stream){
+ return getMediaList(app, stream,null, null);
+ }
+
+ public JSONObject getMediaList(RequestCallback callback){
+ return sendPost("getMediaList",null, callback);
+ }
+
+ public JSONObject getMediaInfo(String app, String schema, String stream){
Map<String, Object> param = new HashMap<>();
param.put("app",app);
param.put("schema",schema);
+ param.put("stream",stream);
param.put("vhost","__defaultVhost__");
- return sendPost("getMediaList",param);
+ return sendPost("getMediaInfo",param, null);
}
public JSONObject getRtpInfo(String stream_id){
Map<String, Object> param = new HashMap<>();
param.put("stream_id",stream_id);
- return sendPost("getRtpInfo",param);
+ return sendPost("getRtpInfo",param, null);
+ }
+
+ public JSONObject addFFmpegSource(String src_url, String dst_url, String timeout_ms){
+ System.out.println(src_url);
+ System.out.println(dst_url);
+ Map<String, Object> param = new HashMap<>();
+ param.put("src_url", src_url);
+ param.put("dst_url", dst_url);
+ param.put("timeout_ms", timeout_ms);
+ return sendPost("addFFmpegSource",param, null);
+ }
+
+ public JSONObject delFFmpegSource(String key){
+ Map<String, Object> param = new HashMap<>();
+ param.put("key", key);
+ return sendPost("delFFmpegSource",param, null);
}
public JSONObject getMediaServerConfig(){
- return sendPost("getServerConfig",null);
+ return sendPost("getServerConfig",null, null);
}
public JSONObject setServerConfig(Map<String, Object> param){
- return sendPost("setServerConfig",param);
+ return sendPost("setServerConfig",param, null);
+ }
+
+ public JSONObject openRtpServer(Map<String, Object> param){
+ return sendPost("openRtpServer",param, null);
+ }
+
+ public JSONObject closeRtpServer(Map<String, Object> param) {
+ 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);
+ }
+
+ public JSONObject stopSendRtp(Map<String, Object> param) {
+ return sendPost("stopSendRtp",param, null);
+ }
+
+ public JSONObject addStreamProxy(String app, String stream, String url, boolean enable_hls, boolean enable_mp4, String rtp_type) {
+ Map<String, Object> param = new HashMap<>();
+ param.put("vhost", "__defaultVhost__");
+ param.put("app", app);
+ param.put("stream", stream);
+ param.put("url", url);
+ param.put("enable_hls", enable_hls?1:0);
+ param.put("enable_mp4", enable_mp4?1:0);
+ param.put("rtp_type", rtp_type);
+ return sendPost("addStreamProxy",param, null);
+ }
+
+ public JSONObject closeStreams(String app, String stream) {
+ Map<String, Object> param = new HashMap<>();
+ param.put("vhost", "__defaultVhost__");
+ param.put("app", app);
+ param.put("stream", stream);
+ param.put("force", 1);
+ return sendPost("close_streams",param, null);
}
}
--
Gitblit v1.8.0