From f6320c7dd3dfd25e98bb63f41d79a33af5009a93 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 17:02:16 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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 4776551..ea2655e 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -19,7 +19,7 @@
private Boolean seniorSdp = Boolean.FALSE;
- private Long playTimeout = 18000L;
+ private Integer playTimeout = 18000;
private int platformPlayTimeout = 60000;
@@ -31,7 +31,9 @@
private Boolean logInDatebase = Boolean.TRUE;
- private Boolean redisConfig = Boolean.TRUE;
+ private Boolean usePushingAsStatus = Boolean.TRUE;
+
+ private Boolean streamOnDemand = Boolean.TRUE;
private String serverId = "000000";
@@ -55,7 +57,7 @@
return seniorSdp;
}
- public Long getPlayTimeout() {
+ public Integer getPlayTimeout() {
return playTimeout;
}
@@ -83,7 +85,7 @@
this.seniorSdp = seniorSdp;
}
- public void setPlayTimeout(Long playTimeout) {
+ public void setPlayTimeout(Integer playTimeout) {
this.playTimeout = playTimeout;
}
@@ -123,14 +125,6 @@
this.thirdPartyGBIdReg = thirdPartyGBIdReg;
}
- public Boolean getRedisConfig() {
- return redisConfig;
- }
-
- public void setRedisConfig(Boolean redisConfig) {
- this.redisConfig = redisConfig;
- }
-
public Boolean getRecordSip() {
return recordSip;
}
@@ -146,4 +140,20 @@
public void setPlatformPlayTimeout(int platformPlayTimeout) {
this.platformPlayTimeout = platformPlayTimeout;
}
+
+ public Boolean isUsePushingAsStatus() {
+ return usePushingAsStatus;
+ }
+
+ public void setUsePushingAsStatus(Boolean usePushingAsStatus) {
+ this.usePushingAsStatus = usePushingAsStatus;
+ }
+
+ public Boolean getStreamOnDemand() {
+ return streamOnDemand;
+ }
+
+ public void setStreamOnDemand(Boolean streamOnDemand) {
+ this.streamOnDemand = streamOnDemand;
+ }
}
--
Gitblit v1.8.0