From 509d9b3cbba7ba8fdc7466c34e46db70d41517a8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 27 二月 2024 10:22:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 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 baf0f5a..044f9f3
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -25,20 +25,25 @@
private OkHttpClient client;
-
-
public interface RequestCallback{
void run(JSONObject response);
}
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 +60,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;
@@ -207,6 +216,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) {
@@ -264,6 +288,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);
}
@@ -317,7 +347,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) {
@@ -373,4 +403,14 @@
param.put("stream_id", streamId);
return sendPost(mediaServerItem, "updateRtpServerSSRC",param, null);
}
+
+ public JSONObject deleteRecordDirectory(MediaServerItem mediaServerItem, String app, String stream, String date, String fileName) {
+ Map<String, Object> param = new HashMap<>(1);
+ param.put("vhost", "__defaultVhost__");
+ param.put("app", app);
+ param.put("stream", stream);
+ param.put("period", date);
+ param.put("name", fileName);
+ return sendPost(mediaServerItem, "deleteRecordDirectory",param, null);
+ }
}
--
Gitblit v1.8.0