From 26bdf2e7768ee5dfc400c3970a5aa129fed49453 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 15:31:43 +0800
Subject: [PATCH] Merge branch '级联' into main-dev
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java | 77 +++++++++++++++++++++++++++++++++-----
1 files changed, 67 insertions(+), 10 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 a57f7a3..4fff352 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
@@ -2,6 +2,7 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.AudioBroadcastEvent;
import gov.nist.javax.sip.message.SIPResponse;
/**
@@ -11,18 +12,24 @@
public class AudioBroadcastCatch {
- public AudioBroadcastCatch(String deviceId,
- String channelId,
- AudioBroadcastCatchStatus status,
- MediaServerItem mediaServerItem,
- String app,
- String stream) {
+ public AudioBroadcastCatch(
+ String deviceId,
+ String channelId,
+ MediaServerItem mediaServerItem,
+ String app,
+ String stream,
+ AudioBroadcastEvent event,
+ AudioBroadcastCatchStatus status,
+ boolean isFromPlatform
+ ) {
this.deviceId = deviceId;
this.channelId = channelId;
this.status = status;
- this.mediaServerItem = mediaServerItem;
+ this.event = event;
+ this.isFromPlatform = isFromPlatform;
this.app = app;
this.stream = stream;
+ this.mediaServerItem = mediaServerItem;
}
public AudioBroadcastCatch() {
@@ -39,19 +46,24 @@
private String channelId;
/**
- * 浣跨敤鐨勬祦濯掍綋
+ * 娴佸獟浣撲俊鎭�
*/
private MediaServerItem mediaServerItem;
/**
- * 寰呮帹閫佺粰璁惧鐨勬祦搴旂敤鍚�
+ * 鍏宠仈鐨勬祦APP
*/
private String app;
/**
- * 寰呮帹閫佺粰璁惧鐨勬祦ID
+ * 鍏宠仈鐨勬祦STREAM
*/
private String stream;
+
+ /**
+ * 鏄惁鏄骇鑱旇闊冲枈璇�
+ */
+ private boolean isFromPlatform;
/**
* 璇煶骞挎挱鐘舵��
@@ -62,6 +74,11 @@
* 璇锋眰淇℃伅
*/
private SipTransactionInfo sipTransactionInfo;
+
+ /**
+ * 璇锋眰缁撴灉鍥炶皟
+ */
+ private AudioBroadcastEvent event;
public String getDeviceId() {
@@ -123,4 +140,44 @@
public void setMediaServerItem(MediaServerItem mediaServerItem) {
this.mediaServerItem = mediaServerItem;
}
+
+ public AudioBroadcastEvent getEvent() {
+ return event;
+ }
+
+ public void setEvent(AudioBroadcastEvent event) {
+ this.event = event;
+ }
+
+ 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 boolean isFromPlatform() {
+ return isFromPlatform;
+ }
+
+ public void setFromPlatform(boolean fromPlatform) {
+ isFromPlatform = fromPlatform;
+ }
+
+ public MediaServerItem getMediaServerItem() {
+ return mediaServerItem;
+ }
+
+ public void setMediaServerItem(MediaServerItem mediaServerItem) {
+ this.mediaServerItem = mediaServerItem;
+ }
}
--
Gitblit v1.8.0