From 009e46f7f235b081f69bb7cb82e7cb1cc76154a6 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期六, 24 十月 2020 15:22:48 +0800
Subject: [PATCH] 对通道列表查询结果排序，避免设备通道列表乱序的问题
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
index 8114814..5421206 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
@@ -38,6 +38,9 @@
@Value("${media.secret}")
private String mediaSecret;
+ @Value("${media.streamNoneReaderDelayMS}")
+ private String streamNoneReaderDelayMS;
+
@Value("${sip.ip}")
private String sipIP;
@@ -54,9 +57,10 @@
MediaServerConfig mediaServerConfig = getMediaServerConfig();
if (mediaServerConfig != null) {
logger.info("zlm鎺ュ叆鎴愬姛...");
- storager.updateMediaInfo(mediaServerConfig);
logger.info("璁剧疆zlm...");
saveZLMConfig();
+ mediaServerConfig = getMediaServerConfig();
+ storager.updateMediaInfo(mediaServerConfig);
}
}
@@ -79,7 +83,7 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
- getMediaServerConfig();
+ mediaServerConfig = getMediaServerConfig();
}
return mediaServerConfig;
}
@@ -95,6 +99,7 @@
param.put("secret",mediaSecret);
param.put("hook.enable","1");
param.put("hook.on_flow_report","");
+ param.put("hook.on_play","");
param.put("hook.on_http_access","");
param.put("hook.on_publish",String.format("%s/on_publish", hookPrex));
param.put("hook.on_record_mp4","");
@@ -103,9 +108,11 @@
param.put("hook.on_rtsp_realm","");
param.put("hook.on_server_started",String.format("%s/on_server_started", hookPrex));
param.put("hook.on_shell_login",String.format("%s/on_shell_login", hookPrex));
+ param.put("hook.on_stream_changed",String.format("%s/on_stream_changed", hookPrex));
param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrex));
param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex));
param.put("hook.timeoutSec","20");
+ param.put("general.streamNoneReaderDelayMS",streamNoneReaderDelayMS);
JSONObject responseJSON = zlmresTfulUtils.setServerConfig(param);
--
Gitblit v1.8.0