From 509d9b3cbba7ba8fdc7466c34e46db70d41517a8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 27 二月 2024 10:22:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 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 9bfab63..a9752f1 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
@@ -452,27 +452,11 @@
public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
this.sipTransactionInfo = sipTransactionInfo;
}
+ public boolean isBroadcastPushAfterAck() {
+ return broadcastPushAfterAck;
+ }
- /*======================璁惧涓诲瓙鐮佹祦閫昏緫START=========================*/
- @Schema(description = "寮�鍚富瀛愮爜娴佸垏鎹㈢殑寮�鍏筹紙false-涓嶅紑鍚紝true-寮�鍚級")
- private boolean switchPrimarySubStream;
-
- public boolean isSwitchPrimarySubStream() {
- return switchPrimarySubStream;
- }
-
- public void setSwitchPrimarySubStream(boolean switchPrimarySubStream) {
- this.switchPrimarySubStream = switchPrimarySubStream;
- }
-
- /*======================璁惧涓诲瓙鐮佹祦閫昏緫END=========================*/
-
-
- public boolean isBroadcastPushAfterAck() {
- return broadcastPushAfterAck;
- }
-
- public void setBroadcastPushAfterAck(boolean broadcastPushAfterAck) {
- this.broadcastPushAfterAck = broadcastPushAfterAck;
- }
+ public void setBroadcastPushAfterAck(boolean broadcastPushAfterAck) {
+ this.broadcastPushAfterAck = broadcastPushAfterAck;
+ }
}
--
Gitblit v1.8.0