From fd2ef6effe7b484c70079a7ac054ac4834b394d9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 01 四月 2024 15:29:49 +0800
Subject: [PATCH] 修复国标点播
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 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 4c3d7bd..237be7e 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,7 +1,8 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;
+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,
+ MediaServer 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;
+ private MediaServer mediaServerItem;
/**
- * 寰呮帹閫佺粰璁惧鐨勬祦搴旂敤鍚�
+ * 鍏宠仈鐨勬祦APP
*/
private String app;
/**
- * 寰呮帹閫佺粰璁惧鐨勬祦ID
+ * 鍏宠仈鐨勬祦STREAM
*/
private String stream;
+
+ /**
+ * 鏄惁鏄骇鑱旇闊冲枈璇�
+ */
+ private boolean isFromPlatform;
/**
* 璇煶骞挎挱鐘舵��
@@ -63,7 +75,10 @@
*/
private SipTransactionInfo sipTransactionInfo;
- private MediaServerItem mediaServerItem;
+ /**
+ * 璇锋眰缁撴灉鍥炶皟
+ */
+ private AudioBroadcastEvent event;
public String getDeviceId() {
@@ -94,11 +109,11 @@
return sipTransactionInfo;
}
- public MediaServerItem getMediaServerItem() {
+ public MediaServer getMediaServerItem() {
return mediaServerItem;
}
- public void setMediaServerItem(MediaServerItem mediaServerItem) {
+ public void setMediaServerItem(MediaServer mediaServerItem) {
this.mediaServerItem = mediaServerItem;
}
@@ -118,19 +133,27 @@
this.stream = stream;
}
+ public boolean isFromPlatform() {
+ return isFromPlatform;
+ }
+
+ public void setFromPlatform(boolean fromPlatform) {
+ isFromPlatform = fromPlatform;
+ }
+
public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
this.sipTransactionInfo = sipTransactionInfo;
}
- public void setSipTransactionInfoByRequset(SIPResponse response) {
- this.sipTransactionInfo = new SipTransactionInfo(response, false);
+ public AudioBroadcastEvent getEvent() {
+ return event;
}
- public MediaServerItem getMediaServerItem() {
- return mediaServerItem;
+ public void setEvent(AudioBroadcastEvent event) {
+ this.event = event;
}
- public void setMediaServerItem(MediaServerItem mediaServerItem) {
- this.mediaServerItem = mediaServerItem;
+ public void setSipTransactionInfoByRequset(SIPResponse sipResponse) {
+ this.sipTransactionInfo = new SipTransactionInfo(sipResponse);
}
}
--
Gitblit v1.8.0