From a01295603af6ef75776bdee328c9df18b1a9a9f2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 03 十一月 2023 17:32:37 +0800
Subject: [PATCH] 简化配置
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 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
old mode 100644
new mode 100755
index 222fbd4..52bc902
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -32,13 +32,20 @@
}
private OkHttpClient getClient(){
+ return getClient(null);
+ }
+
+ private OkHttpClient getClient(Integer readTimeOut){
if (client == null) {
+ if (readTimeOut == null) {
+ readTimeOut = 10;
+ }
OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
//todo 鏆傛椂鍐欐瓒呮椂鏃堕棿 鍧囦负5s
// 璁剧疆杩炴帴瓒呮椂鏃堕棿
- httpClientBuilder.connectTimeout(5,TimeUnit.SECONDS);
+ httpClientBuilder.connectTimeout(8,TimeUnit.SECONDS);
// 璁剧疆璇诲彇瓒呮椂鏃堕棿
- httpClientBuilder.readTimeout(10,TimeUnit.SECONDS);
+ httpClientBuilder.readTimeout(readTimeOut,TimeUnit.SECONDS);
// 璁剧疆杩炴帴姹�
httpClientBuilder.connectionPool(new ConnectionPool(16, 5, TimeUnit.MINUTES));
if (logger.isDebugEnabled()) {
@@ -55,9 +62,13 @@
}
-
public JSONObject sendPost(MediaServerItem mediaServerItem, String api, Map<String, Object> param, RequestCallback callback) {
- OkHttpClient client = getClient();
+ return sendPost(mediaServerItem, api, param, callback, null);
+ }
+
+
+ public JSONObject sendPost(MediaServerItem mediaServerItem, String api, Map<String, Object> param, RequestCallback callback, Integer readTimeOut) {
+ OkHttpClient client = getClient(readTimeOut);
if (mediaServerItem == null) {
return null;
@@ -204,6 +215,21 @@
}
}
+ public JSONObject isMediaOnline(MediaServerItem mediaServerItem, String app, String stream, String schema){
+ 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(mediaServerItem, "isMediaOnline", param, null);
+ }
+
public JSONObject getMediaList(MediaServerItem mediaServerItem, String app, String stream, String schema, RequestCallback callback){
Map<String, Object> param = new HashMap<>();
if (app != null) {
@@ -261,6 +287,12 @@
return sendPost(mediaServerItem, "delFFmpegSource",param, null);
}
+ public JSONObject delStreamProxy(MediaServerItem mediaServerItem, String key){
+ Map<String, Object> param = new HashMap<>();
+ param.put("key", key);
+ return sendPost(mediaServerItem, "delStreamProxy",param, null);
+ }
+
public JSONObject getMediaServerConfig(MediaServerItem mediaServerItem){
return sendPost(mediaServerItem, "getServerConfig",null, null);
}
@@ -270,11 +302,6 @@
}
public JSONObject openRtpServer(MediaServerItem mediaServerItem, Map<String, Object> param){
- System.out.println("==============openRtpServer=================");
- for (String s : param.keySet()) {
- System.out.println(s + "-->" + param.get(s));
- }
- System.out.println("===============================");
return sendPost(mediaServerItem, "openRtpServer",param, null);
}
@@ -294,6 +321,10 @@
return sendPost(mediaServerItem, "startSendRtp",param, null);
}
+ public JSONObject startSendRtpPassive(MediaServerItem mediaServerItem, Map<String, Object> param) {
+ return sendPost(mediaServerItem, "startSendRtpPassive",param, null);
+ }
+
public JSONObject stopSendRtp(MediaServerItem mediaServerItem, Map<String, Object> param) {
return sendPost(mediaServerItem, "stopSendRtp",param, null);
}
@@ -311,7 +342,7 @@
param.put("enable_mp4", enable_mp4?1:0);
param.put("enable_audio", enable_audio?1:0);
param.put("rtp_type", rtp_type);
- return sendPost(mediaServerItem, "addStreamProxy",param, null);
+ return sendPost(mediaServerItem, "addStreamProxy",param, null, 20);
}
public JSONObject closeStreams(MediaServerItem mediaServerItem, String app, String stream) {
--
Gitblit v1.8.0