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 | 101 ++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 85 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 93a0d16..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,10 +1,9 @@ package com.genersoft.iot.vmp.gb28181.bean; -import gov.nist.javax.sip.message.SIPRequest; -import gov.nist.javax.sip.stack.SIPDialog; - -import javax.sip.Dialog; +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; /** * 缂撳瓨璇煶骞挎挱鐨勭姸鎬� @@ -13,10 +12,24 @@ public class AudioBroadcastCatch { - public AudioBroadcastCatch(String deviceId, String channelId, AudioBroadcastCatchStatus status) { + 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.event = event; + this.isFromPlatform = isFromPlatform; + this.app = app; + this.stream = stream; + this.mediaServerItem = mediaServerItem; } public AudioBroadcastCatch() { @@ -33,6 +46,26 @@ private String channelId; /** + * 娴佸獟浣撲俊鎭� + */ + private MediaServer mediaServerItem; + + /** + * 鍏宠仈鐨勬祦APP + */ + private String app; + + /** + * 鍏宠仈鐨勬祦STREAM + */ + private String stream; + + /** + * 鏄惁鏄骇鑱旇闊冲枈璇� + */ + private boolean isFromPlatform; + + /** * 璇煶骞挎挱鐘舵�� */ private AudioBroadcastCatchStatus status; @@ -40,12 +73,12 @@ /** * 璇锋眰淇℃伅 */ - private SIPRequest request; + private SipTransactionInfo sipTransactionInfo; /** - * 浼氳瘽淇℃伅 + * 璇锋眰缁撴灉鍥炶皟 */ - private SIPDialog dialog; + private AudioBroadcastEvent event; public String getDeviceId() { @@ -72,19 +105,55 @@ this.status = status; } - public void setDialog(SIPDialog dialog) { - this.dialog = dialog; + public SipTransactionInfo getSipTransactionInfo() { + return sipTransactionInfo; } - public SIPDialog getDialog() { - return dialog; + public MediaServer getMediaServerItem() { + return mediaServerItem; } - public SIPRequest getRequest() { - return request; + public void setMediaServerItem(MediaServer mediaServerItem) { + this.mediaServerItem = mediaServerItem; } - public void setRequest(SIPRequest request) { - this.request = request; + 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 void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) { + this.sipTransactionInfo = sipTransactionInfo; + } + + 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