Merge branch 'talk' into main-dev

648540858

2023-03-20 039fbf7e243d4bf0f46b44e7dae2a5d36e978056

 src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java

@@ -1,10 +1,8 @@
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.MediaServerItem;
import gov.nist.javax.sip.message.SIPResponse;

/**
 * 缓存语音广播的状态
@@ -13,10 +11,18 @@
public class AudioBroadcastCatch {


    public AudioBroadcastCatch(String deviceId, String channelId, AudioBroadcastCatchStatus status) {
    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() {
@@ -33,6 +39,21 @@
    private String channelId;

    /**
     * 使用的流媒体
     */
    private MediaServerItem mediaServerItem;

    /**
     * 待推送给设备的流应用名
     */
    private String app;

    /**
     * 待推送给设备的流ID
     */
    private String stream;

    /**
     * 语音广播状态
     */
    private AudioBroadcastCatchStatus status;
@@ -40,12 +61,9 @@
    /**
     * 请求信息
     */
    private SIPRequest request;
    private SipTransactionInfo sipTransactionInfo;

    /**
     * 会话信息
     */
    private SIPDialog dialog;
    private MediaServerItem mediaServerItem;


    public String getDeviceId() {
@@ -72,19 +90,47 @@
        this.status = status;
    }

    public void setDialog(SIPDialog dialog) {
        this.dialog = dialog;
    public SipTransactionInfo getSipTransactionInfo() {
        return sipTransactionInfo;
    }

    public SIPDialog getDialog() {
        return dialog;
    public MediaServerItem getMediaServerItem() {
        return mediaServerItem;
    }

    public SIPRequest getRequest() {
        return request;
    public void setMediaServerItem(MediaServerItem 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 void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
        this.sipTransactionInfo = sipTransactionInfo;
    }

    public void setSipTransactionInfoByRequset(SIPResponse response) {
        this.sipTransactionInfo = new SipTransactionInfo(response, false);
    }

    public MediaServerItem getMediaServerItem() {
        return mediaServerItem;
    }

    public void setMediaServerItem(MediaServerItem mediaServerItem) {
        this.mediaServerItem = mediaServerItem;
    }
}