From 5cae58c69129631c80c611d1870c3a20721cebf4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 14 二月 2023 10:04:48 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main2
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java | 89 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 83 insertions(+), 6 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 e2adddc..d9e89fa 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
@@ -1,11 +1,9 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import gov.nist.javax.sip.message.SIPRequest;
+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;
-import gov.nist.javax.sip.stack.SIPDialog;
-
-import javax.sip.Dialog;
/**
* 缂撳瓨璇煶骞挎挱鐨勭姸鎬�
@@ -14,10 +12,24 @@
public class AudioBroadcastCatch {
- public AudioBroadcastCatch(String deviceId, String channelId, AudioBroadcastCatchStatus status) {
+ 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.event = event;
+ this.isFromPlatform = isFromPlatform;
+ this.app = app;
+ this.stream = stream;
+ this.mediaServerItem = mediaServerItem;
}
public AudioBroadcastCatch() {
@@ -34,6 +46,26 @@
private String channelId;
/**
+ * 娴佸獟浣撲俊鎭�
+ */
+ private MediaServerItem mediaServerItem;
+
+ /**
+ * 鍏宠仈鐨勬祦APP
+ */
+ private String app;
+
+ /**
+ * 鍏宠仈鐨勬祦STREAM
+ */
+ private String stream;
+
+ /**
+ * 鏄惁鏄骇鑱旇闊冲枈璇�
+ */
+ private boolean isFromPlatform;
+
+ /**
* 璇煶骞挎挱鐘舵��
*/
private AudioBroadcastCatchStatus status;
@@ -42,6 +74,11 @@
* 璇锋眰淇℃伅
*/
private SipTransactionInfo sipTransactionInfo;
+
+ /**
+ * 璇锋眰缁撴灉鍥炶皟
+ */
+ private AudioBroadcastEvent event;
public String getDeviceId() {
@@ -77,6 +114,46 @@
}
public void setSipTransactionInfoByRequset(SIPResponse response) {
- this.sipTransactionInfo = new SipTransactionInfo(response);
+ this.sipTransactionInfo = new SipTransactionInfo(response, false);
+ }
+
+ 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