Merge branch 'talk' into main-dev

648540858

2023-03-20 039fbf7e243d4bf0f46b44e7dae2a5d36e978056

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

@@ -11,11 +11,18 @@
public class AudioBroadcastCatch {


    public AudioBroadcastCatch(String deviceId, String channelId, AudioBroadcastCatchStatus status, MediaServerItem mediaServerItem) {
    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() {
@@ -30,6 +37,21 @@
     * 通道编号
     */
    private String channelId;

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

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

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

    /**
     * 语音广播状态
@@ -72,6 +94,30 @@
        return sipTransactionInfo;
    }

    public MediaServerItem getMediaServerItem() {
        return mediaServerItem;
    }

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

    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;
    }