From c88681c7ad06391fa8cce0b910f45cf4f479889d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 07 八月 2024 10:41:54 +0800
Subject: [PATCH] 合并分支
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 96253d6..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;
@@ -73,6 +73,8 @@
private int registerAgainAfterTime = 60;
private boolean registerKeepIntDialog = false;
+
+ private int gbDeviceOnline = 1;
public Boolean getSavePositionHistory() {
return savePositionHistory;
@@ -325,4 +327,12 @@
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