From 38980826f9789745c7288e2e9c800873315a9228 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 04 三月 2024 14:32:57 +0800
Subject: [PATCH] 修复平台删除时未移除心跳超时重新注册任务的问题 #1329
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index 1318c59..c0e4913 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -165,7 +165,7 @@
* 鏄惁寮�鍚痵src鏍￠獙锛岄粯璁ゅ叧闂紝寮�鍚彲浠ラ槻姝覆娴�
*/
@Schema(description = "鏄惁寮�鍚痵src鏍￠獙锛岄粯璁ゅ叧闂紝寮�鍚彲浠ラ槻姝覆娴�")
- private boolean ssrcCheck = true;
+ private boolean ssrcCheck = false;
/**
* 鍦扮悊鍧愭爣绯伙紝 鐩墠鏀寔 WGS84,GCJ02
@@ -244,6 +244,9 @@
}
public Integer getStreamModeForParam() {
+ if (streamMode == null) {
+ return 0;
+ }
if (streamMode.equalsIgnoreCase("UDP")) {
return 0;
}else if (streamMode.equalsIgnoreCase("TCP-PASSIVE")) {
@@ -449,20 +452,5 @@
public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
this.sipTransactionInfo = sipTransactionInfo;
}
-
- /*======================璁惧涓诲瓙鐮佹祦閫昏緫START=========================*/
- @Schema(description = "寮�鍚富瀛愮爜娴佸垏鎹㈢殑寮�鍏筹紙false-涓嶅紑鍚紝true-寮�鍚級")
- private boolean switchPrimarySubStream;
-
- public boolean isSwitchPrimarySubStream() {
- return switchPrimarySubStream;
- }
-
- public void setSwitchPrimarySubStream(boolean switchPrimarySubStream) {
- this.switchPrimarySubStream = switchPrimarySubStream;
- }
-
- /*======================璁惧涓诲瓙鐮佹祦閫昏緫END=========================*/
-
}
--
Gitblit v1.8.0