From 6e4fc1e79b7b4b91d6eb36f6b5638fa902665a50 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期六, 23 四月 2022 23:34:36 +0800
Subject: [PATCH] 1.修正了播放地址无法正常播放视频的问题，包含两个错误： 1.1修正播放器界面路由（此页面不需要layout边框，之前已经修复但在地图代码合并时又被错误覆盖） 1.2修正播放器id属性，此属性现在不需要父级组件传入（这是之前导致独立播放页面失效的主要原因） 2.调整滚动条美化样式到app.vue中，使其真正全局生效
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
index c1a9bd2..db4ab76 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
@@ -32,7 +32,7 @@
private String generalMaxStreamWaitMS;
@JSONField(name = "general.streamNoneReaderDelayMS")
- private String generalStreamNoneReaderDelayMS;
+ private int generalStreamNoneReaderDelayMS;
@JSONField(name = "ip")
private String ip;
@@ -64,6 +64,9 @@
@JSONField(name = "hook.admin_params")
private String hookAdminParams;
+
+ @JSONField(name = "hook.alive_interval")
+ private int hookAliveInterval;
@JSONField(name = "hook.enable")
private String hookEnable;
@@ -191,6 +194,9 @@
@JSONField(name = "rtp_proxy.port")
private int rtpProxyPort;
+ @JSONField(name = "rtp_proxy.port_range")
+ private String portRange;
+
@JSONField(name = "rtp_proxy.timeoutSec")
private String rtpProxyTimeoutSec;
@@ -296,11 +302,11 @@
this.generalMaxStreamWaitMS = generalMaxStreamWaitMS;
}
- public String getGeneralStreamNoneReaderDelayMS() {
+ public int getGeneralStreamNoneReaderDelayMS() {
return generalStreamNoneReaderDelayMS;
}
- public void setGeneralStreamNoneReaderDelayMS(String generalStreamNoneReaderDelayMS) {
+ public void setGeneralStreamNoneReaderDelayMS(int generalStreamNoneReaderDelayMS) {
this.generalStreamNoneReaderDelayMS = generalStreamNoneReaderDelayMS;
}
@@ -791,4 +797,20 @@
public void setShellPhell(String shellPhell) {
this.shellPhell = shellPhell;
}
+
+ public int getHookAliveInterval() {
+ return hookAliveInterval;
+ }
+
+ public void setHookAliveInterval(int hookAliveInterval) {
+ this.hookAliveInterval = hookAliveInterval;
+ }
+
+ public String getPortRange() {
+ return portRange;
+ }
+
+ public void setPortRange(String portRange) {
+ this.portRange = portRange;
+ }
}
--
Gitblit v1.8.0