From 039fbf7e243d4bf0f46b44e7dae2a5d36e978056 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 14:32:53 +0800
Subject: [PATCH] Merge branch 'talk' into main-dev
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 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 ef5829e..4c3d7bd 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
@@ -11,11 +11,18 @@
public class AudioBroadcastCatch {
- public AudioBroadcastCatch(String deviceId, String channelId, AudioBroadcastCatchStatus status, MediaServerItem mediaServerItem) {
+ public AudioBroadcastCatch(String deviceId,
+ String channelId,
+ AudioBroadcastCatchStatus status,
+ MediaServerItem mediaServerItem,
+ String app,
+ String stream) {
this.deviceId = deviceId;
this.channelId = channelId;
this.status = status;
this.mediaServerItem = mediaServerItem;
+ this.app = app;
+ this.stream = stream;
}
public AudioBroadcastCatch() {
@@ -30,6 +37,21 @@
* 閫氶亾缂栧彿
*/
private String channelId;
+
+ /**
+ * 浣跨敤鐨勬祦濯掍綋
+ */
+ private MediaServerItem mediaServerItem;
+
+ /**
+ * 寰呮帹閫佺粰璁惧鐨勬祦搴旂敤鍚�
+ */
+ private String app;
+
+ /**
+ * 寰呮帹閫佺粰璁惧鐨勬祦ID
+ */
+ private String stream;
/**
* 璇煶骞挎挱鐘舵��
@@ -72,6 +94,30 @@
return sipTransactionInfo;
}
+ public MediaServerItem getMediaServerItem() {
+ return mediaServerItem;
+ }
+
+ public void setMediaServerItem(MediaServerItem mediaServerItem) {
+ this.mediaServerItem = mediaServerItem;
+ }
+
+ public String getApp() {
+ return app;
+ }
+
+ public void setApp(String app) {
+ this.app = app;
+ }
+
+ public String getStream() {
+ return stream;
+ }
+
+ public void setStream(String stream) {
+ this.stream = stream;
+ }
+
public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
this.sipTransactionInfo = sipTransactionInfo;
}
--
Gitblit v1.8.0