From 7732a1d180f04ea8e3cd569a73a9288bca5626e9 Mon Sep 17 00:00:00 2001
From: wendy512 <wendy512@yeah.net>
Date: 星期四, 18 七月 2024 13:40:47 +0800
Subject: [PATCH] 解决国标视频回放判断streamMode时空指针异常问题
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
index 5d4af3d..18114c5 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -21,7 +21,7 @@
private Boolean seniorSdp = Boolean.FALSE;
- private Integer playTimeout = 18000;
+ private Integer playTimeout = 10000;
private int platformPlayTimeout = 20000;
@@ -33,7 +33,7 @@
private Boolean logInDatabase = Boolean.TRUE;
- private Boolean usePushingAsStatus = Boolean.TRUE;
+ private Boolean usePushingAsStatus = Boolean.FALSE;
private Boolean useSourceIpAsStreamIp = Boolean.FALSE;
@@ -54,9 +54,13 @@
private Boolean deviceStatusNotify = Boolean.TRUE;
private Boolean useCustomSsrcForParentInvite = Boolean.TRUE;
+ private Boolean docEnable = Boolean.TRUE;
+
private String serverId = "000000";
private String thirdPartyGBIdReg = "[\\s\\S]*";
+
+ private String broadcastForPlatform = "UDP";
private String civilCodeFile = "classpath:civilCode.csv";
@@ -64,11 +68,13 @@
private List<String> allowedOrigins = new ArrayList<>();
- private int maxNotifyCountQueue = 10000;
+ private int maxNotifyCountQueue = 100000;
private int registerAgainAfterTime = 60;
private boolean registerKeepIntDialog = false;
+
+ private int gbDeviceOnline = 1;
public Boolean getSavePositionHistory() {
return savePositionHistory;
@@ -210,6 +216,14 @@
this.syncChannelOnDeviceOnline = syncChannelOnDeviceOnline;
}
+ public String getBroadcastForPlatform() {
+ return broadcastForPlatform;
+ }
+
+ public void setBroadcastForPlatform(String broadcastForPlatform) {
+ this.broadcastForPlatform = broadcastForPlatform;
+ }
+
public Boolean getSipUseSourceIpAsRemoteAddress() {
return sipUseSourceIpAsRemoteAddress;
}
@@ -305,4 +319,20 @@
public void setRegisterKeepIntDialog(boolean registerKeepIntDialog) {
this.registerKeepIntDialog = registerKeepIntDialog;
}
+
+ public Boolean getDocEnable() {
+ return docEnable;
+ }
+
+ public void setDocEnable(Boolean docEnable) {
+ this.docEnable = docEnable;
+ }
+
+ public int getGbDeviceOnline() {
+ return gbDeviceOnline;
+ }
+
+ public void setGbDeviceOnline(int gbDeviceOnline) {
+ this.gbDeviceOnline = gbDeviceOnline;
+ }
}
--
Gitblit v1.8.0