From 1fcdf5a8f369e020e78d524db2fe3cc7ffc86293 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 08 三月 2024 09:30:48 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
index d9e89fa..814d984 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
@@ -109,20 +109,12 @@
return sipTransactionInfo;
}
- public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
- this.sipTransactionInfo = sipTransactionInfo;
+ public MediaServerItem getMediaServerItem() {
+ return mediaServerItem;
}
- public void setSipTransactionInfoByRequset(SIPResponse response) {
- this.sipTransactionInfo = new SipTransactionInfo(response, false);
- }
-
- public AudioBroadcastEvent getEvent() {
- return event;
- }
-
- public void setEvent(AudioBroadcastEvent event) {
- this.event = event;
+ public void setMediaServerItem(MediaServerItem mediaServerItem) {
+ this.mediaServerItem = mediaServerItem;
}
public String getApp() {
@@ -149,11 +141,19 @@
isFromPlatform = fromPlatform;
}
- public MediaServerItem getMediaServerItem() {
- return mediaServerItem;
+ public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
+ this.sipTransactionInfo = sipTransactionInfo;
}
- public void setMediaServerItem(MediaServerItem mediaServerItem) {
- this.mediaServerItem = mediaServerItem;
+ public AudioBroadcastEvent getEvent() {
+ return event;
+ }
+
+ public void setEvent(AudioBroadcastEvent event) {
+ this.event = event;
+ }
+
+ public void setSipTransactionInfoByRequset(SIPResponse sipResponse) {
+ this.sipTransactionInfo = new SipTransactionInfo(sipResponse);
}
}
--
Gitblit v1.8.0