From 4bd4f50b4165953018a9f9174056d29d087fdaee Mon Sep 17 00:00:00 2001
From: szy833 <31844882+szy833@users.noreply.github.com>
Date: 星期日, 16 一月 2022 23:32:51 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
index 709fe9c..6fa802d 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -1,9 +1,7 @@
package com.genersoft.iot.vmp.conf;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
@Component
@@ -27,9 +25,11 @@
Integer ptzSpeed = 50;
- Integer keepaliveTimeOut = 180;
+ Integer keepaliveTimeOut = 255;
- Integer registerTimeInterval = 60;
+ Integer registerTimeInterval = 120;
+
+ private boolean alarm = false;
public void setIp(String ip) {
this.ip = ip;
@@ -106,4 +106,12 @@
public Integer getRegisterTimeInterval() {
return registerTimeInterval;
}
+
+ public boolean isAlarm() {
+ return alarm;
+ }
+
+ public void setAlarm(boolean alarm) {
+ this.alarm = alarm;
+ }
}
--
Gitblit v1.8.0