完善语音对讲级联

648540858

2023-03-21 82adc0cb23f3ee47322e78889cdaba57e9309000

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -1,56 +1,44 @@
package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;



import com.alibaba.fastjson.JSONObject;

import com.alibaba.fastjson2.JSONObject;

import com.genersoft.iot.vmp.common.StreamInfo;

import com.genersoft.iot.vmp.conf.DynamicTask;

import com.genersoft.iot.vmp.conf.SipConfig;

import com.genersoft.iot.vmp.conf.UserSetting;

import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;

import com.genersoft.iot.vmp.gb28181.SipLayer;

import com.genersoft.iot.vmp.gb28181.bean.*;

import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;

import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;

import com.genersoft.iot.vmp.gb28181.transmit.SIPSender;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;

import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;

import com.genersoft.iot.vmp.gb28181.utils.SipUtils;

import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;

import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;

import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeFactory;

import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForStreamChange;

import com.genersoft.iot.vmp.utils.DateUtil;

import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;

import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;

import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForStreamPush;

import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;

import com.genersoft.iot.vmp.service.IMediaServerService;

import com.genersoft.iot.vmp.service.bean.SSRCInfo;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import com.genersoft.iot.vmp.storager.IVideoManagerStorage;

import com.genersoft.iot.vmp.utils.DateUtil;

import com.genersoft.iot.vmp.utils.GitUtil;

import gov.nist.javax.sip.SIPConstants;

import gov.nist.javax.sip.SipProviderImpl;

import gov.nist.javax.sip.SipStackImpl;

import gov.nist.javax.sip.message.SIPRequest;

import gov.nist.javax.sip.message.SIPResponse;

import gov.nist.javax.sip.stack.SIPClientTransaction;

import gov.nist.javax.sip.stack.SIPClientTransactionImpl;

import gov.nist.javax.sip.stack.SIPDialog;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Qualifier;

import org.springframework.context.annotation.DependsOn;

import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Component;

import org.springframework.util.ObjectUtils;



import javax.sip.*;

import javax.sip.address.Address;

import javax.sip.address.SipURI;

import javax.sip.header.*;

import javax.sip.InvalidArgumentException;

import javax.sip.ResponseEvent;

import javax.sip.SipException;

import javax.sip.header.CallIdHeader;

import javax.sip.message.Request;

import javax.sip.message.Response;

import java.lang.reflect.Field;

import java.text.ParseException;

import java.util.ArrayList;

import java.util.HashSet;

import java.util.List;



/**

 * @description:设备能力接口，用于定义设备的控制、查询能力

@@ -67,18 +55,10 @@
    private SipConfig sipConfig;



    @Autowired

    private SipFactory sipFactory;

    private SipLayer sipLayer;



    @Autowired

    private GitUtil gitUtil;



    @Autowired

    @Qualifier(value = "tcpSipProvider")

    private SipProviderImpl tcpSipProvider;



    @Autowired

    @Qualifier(value = "udpSipProvider")

    private SipProviderImpl udpSipProvider;

    private SIPSender sipSender;



    @Autowired

    private SIPRequestHeaderProvider headerProvider;

@@ -93,10 +73,15 @@
    private ZlmHttpHookSubscribe subscribe;



    @Autowired

    private SipSubscribe sipSubscribe;

    private GitUtil gitUtil;







    @Autowired

    private IMediaServerService mediaServerService;



    @Autowired

    private ZLMRTPServerFactory zlmrtpServerFactory;





    /**

@@ -192,7 +177,7 @@
    public void ptzCmd(Device device, String channelId, int leftRight, int upDown, int inOut, int moveSpeed,

                       int zoomSpeed) throws InvalidArgumentException, SipException, ParseException {

        String cmdStr = SipUtils.cmdString(leftRight, upDown, inOut, moveSpeed, zoomSpeed);

        StringBuffer ptzXml = new StringBuffer(200);

        StringBuilder ptzXml = new StringBuilder(200);

        String charset = device.getCharset();

        ptzXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

        ptzXml.append("<Control>\r\n");

@@ -205,12 +190,9 @@
        ptzXml.append("</Info>\r\n");

        ptzXml.append("</Control>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();

        Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));



        Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);



        transmitRequest(device.getTransport(), request);

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()),request);

    }



    /**

@@ -241,11 +223,10 @@
        ptzXml.append("</Control>\r\n");





        CallIdHeader callIdHeader = device.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        SIPRequest request = (SIPRequest) headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request);



        SIPRequest request = (SIPRequest) headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()),request);



    }



@@ -273,11 +254,8 @@
        ptzXml.append("</Control>\r\n");





        CallIdHeader callIdHeader = device.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request, errorEvent, okEvent);

        Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()),request, errorEvent, okEvent);



    }



@@ -306,12 +284,17 @@
                subscribe.removeSubscribe(hookSubscribe);

            }

        });

        //

        String sdpIp;

        if (!ObjectUtils.isEmpty(device.getSdpIp())) {

            sdpIp = device.getSdpIp();

        }else {

            sdpIp = mediaServerItem.getSdpIp();

        }

        StringBuffer content = new StringBuffer(200);

        content.append("v=0\r\n");

        content.append("o=" + channelId + " 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

        content.append("o=" + channelId + " 0 0 IN IP4 " + sdpIp + "\r\n");

        content.append("s=Play\r\n");

        content.append("c=IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

        content.append("c=IN IP4 " + sdpIp + "\r\n");

        content.append("t=0 0\r\n");



        if (userSetting.isSeniorSdp()) {

@@ -364,11 +347,10 @@
        // f字段:f= v/编码格式/分辨率/帧率/码率类型/码率大小a/编码格式/码率大小/采样率

//         content.append("f=v/2/5/25/1/4000a/1/8/1" + "\r\n"); // 未发现支持此特性的设备



        CallIdHeader callIdHeader = device.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null, ssrcInfo.getSsrc(), callIdHeader);

        transmitRequest(device.getTransport(), request, (e -> {



        Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, ssrcInfo.getSsrc(),sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, (e -> {

            streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());

            mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());

            errorEvent.response(e);

@@ -396,13 +378,18 @@




        logger.info("{} 分配的ZLM为: {} [{}:{}]", ssrcInfo.getStream(), mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());



        String sdpIp;

        if (!ObjectUtils.isEmpty(device.getSdpIp())) {

            sdpIp = device.getSdpIp();

        }else {

            sdpIp = mediaServerItem.getSdpIp();

        }

        StringBuffer content = new StringBuffer(200);

        content.append("v=0\r\n");

        content.append("o=" + channelId + " 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

        content.append("o=" + channelId + " 0 0 IN IP4 " + sdpIp + "\r\n");

        content.append("s=Playback\r\n");

        content.append("u=" + channelId + ":0\r\n");

        content.append("c=IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

        content.append("c=IN IP4 " + sdpIp + "\r\n");

        content.append("t=" + DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime) + " "

                + DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) + "\r\n");



@@ -445,38 +432,39 @@
            content.append("a=rtpmap:97 MPEG4/90000\r\n");

            content.append("a=rtpmap:98 H264/90000\r\n");

            content.append("a=rtpmap:99 H265/90000\r\n");

            if ("TCP-PASSIVE".equalsIgnoreCase(streamMode)) { // tcp被动模式

            if ("TCP-PASSIVE".equalsIgnoreCase(streamMode)) {

                // tcp被动模式

                content.append("a=setup:passive\r\n");

                content.append("a=connection:new\r\n");

            } else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) { // tcp主动模式

            } else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) {

                // tcp主动模式

                content.append("a=setup:active\r\n");

                content.append("a=connection:new\r\n");

            }

        }



        content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc

        //ssrc

        content.append("y=" + ssrcInfo.getSsrc() + "\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();

        HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, "rtsp", mediaServerItem.getId());

        // 添加订阅

        subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject json) -> {

            if (hookEvent != null) {

                InviteStreamInfo inviteStreamInfo = new InviteStreamInfo(mediaServerItemInUse, json, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream());

                InviteStreamInfo inviteStreamInfo = new InviteStreamInfo(mediaServerItemInUse, json,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()).getCallId(), "rtp", ssrcInfo.getStream());

                hookEvent.call(inviteStreamInfo);

            }

            subscribe.removeSubscribe(hookSubscribe);

        });

        Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader, ssrcInfo.getSsrc());

        Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()), ssrcInfo.getSsrc());



        transmitRequest(device.getTransport(), request, errorEvent, event -> {

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent, event -> {

            ResponseEvent responseEvent = (ResponseEvent) event.event;

            SIPResponse response = (SIPResponse) responseEvent.getResponse();

            streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), response, VideoStreamSessionManager.SessionType.playback);

            streamSession.put(device.getDeviceId(), channelId,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()).getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), response, VideoStreamSessionManager.SessionType.playback);

            okEvent.response(event);

        });

        if (inviteStreamCallback != null) {

            inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));

            inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()).getCallId(), "rtp", ssrcInfo.getStream()));

        }

    }



@@ -495,13 +483,18 @@
                                  SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {



        logger.info("{} 分配的ZLM为: {} [{}:{}]", ssrcInfo.getStream(), mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());



        String sdpIp;

        if (!ObjectUtils.isEmpty(device.getSdpIp())) {

            sdpIp = device.getSdpIp();

        }else {

            sdpIp = mediaServerItem.getSdpIp();

        }

        StringBuffer content = new StringBuffer(200);

        content.append("v=0\r\n");

        content.append("o=" + channelId + " 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

        content.append("o=" + channelId + " 0 0 IN IP4 " + sdpIp + "\r\n");

        content.append("s=Download\r\n");

        content.append("u=" + channelId + ":0\r\n");

        content.append("c=IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

        content.append("c=IN IP4 " + sdpIp + "\r\n");

        content.append("t=" + DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime) + " "

                + DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) + "\r\n");



@@ -557,13 +550,10 @@


        content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, null, mediaServerItem.getId());

        // 添加订阅

        subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject json) -> {

            hookEvent.call(new InviteStreamInfo(mediaServerItem, json, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));

            hookEvent.call(new InviteStreamInfo(mediaServerItem, json,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()).getCallId(), "rtp", ssrcInfo.getStream()));

            subscribe.removeSubscribe(hookSubscribe);

            hookSubscribe.getContent().put("regist", false);

            hookSubscribe.getContent().put("schema", "rtsp");

@@ -572,7 +562,7 @@
                    (MediaServerItem mediaServerItemForEnd, JSONObject jsonForEnd) -> {

                        logger.info("[录像]下载结束， 发送BYE");

                        try {

                            streamByeCmd(device, channelId, ssrcInfo.getStream(), callIdHeader.getCallId());

                            streamByeCmd(device, channelId, ssrcInfo.getStream(),sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()).getCallId());

                        } catch (InvalidArgumentException | ParseException | SipException |

                                 SsrcTransactionNotFoundException e) {

                            logger.error("[录像]下载结束， 发送BYE失败 {}", e.getMessage());

@@ -580,14 +570,79 @@
                    });

        });



        Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader, ssrcInfo.getSsrc());

        Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()), ssrcInfo.getSsrc());

        if (inviteStreamCallback != null) {

            inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));

            inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()).getCallId(), "rtp", ssrcInfo.getStream()));

        }

        transmitRequest(device.getTransport(), request, errorEvent, okEvent -> {



        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent, okEvent -> {

            ResponseEvent responseEvent = (ResponseEvent) okEvent.event;

            SIPResponse response = (SIPResponse) responseEvent.getResponse();

            streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), response, VideoStreamSessionManager.SessionType.download);

            streamSession.put(device.getDeviceId(), channelId, response.getCallIdHeader().getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), response, VideoStreamSessionManager.SessionType.download);

        });

    }



    @Override

    public void talkStreamCmd(MediaServerItem mediaServerItem, SendRtpItem sendRtpItem, Device device, String channelId, String callId, ZlmHttpHookSubscribe.Event event, ZlmHttpHookSubscribe.Event eventForPush, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {



        String stream = sendRtpItem.getStream();



        if (device == null) {

            return;

        }

        if (!mediaServerItem.isRtpEnable()) {

            // 单端口暂不支持语音喊话

            logger.info("[语音喊话] 单端口暂不支持此操作");

            return;

        }



        logger.info("[语音喊话] {} 分配的ZLM为: {} [{}:{}]", stream, mediaServerItem.getId(), mediaServerItem.getIp(), sendRtpItem.getPort());

        HookSubscribeForStreamChange hookSubscribeForStreamChange = HookSubscribeFactory.on_stream_changed("rtp", stream, true, "rtsp", mediaServerItem.getId());

        subscribe.addSubscribe(hookSubscribeForStreamChange, (MediaServerItem mediaServerItemInUse, JSONObject json) -> {

            if (event != null) {

                event.response(mediaServerItemInUse, json);

                subscribe.removeSubscribe(hookSubscribeForStreamChange);

            }

        });



        CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()), device.getTransport());

        callIdHeader.setCallId(callId);

        HookSubscribeForStreamPush hookSubscribeForStreamPush = HookSubscribeFactory.on_publish("rtp", stream,  null, mediaServerItem.getId());

        subscribe.addSubscribe(hookSubscribeForStreamPush, (MediaServerItem mediaServerItemInUse, JSONObject json) -> {

            if (eventForPush != null) {

                eventForPush.response(mediaServerItemInUse, json);

            }

        });

        //

        StringBuffer content = new StringBuffer(200);

        content.append("v=0\r\n");

        content.append("o=" + channelId + " 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

        content.append("s=Talk\r\n");

        content.append("c=IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

        content.append("t=0 0\r\n");



        content.append("m=audio " + sendRtpItem.getPort() + " TCP/RTP/AVP 8\r\n");

        content.append("a=setup:passive\r\n");

        content.append("a=connection:new\r\n");

        content.append("a=sendrecv\r\n");

        content.append("a=rtpmap:8 PCMA/8000\r\n");



        content.append("y=" + sendRtpItem.getSsrc() + "\r\n");//ssrc

        // f字段:f= v/编码格式/分辨率/帧率/码率类型/码率大小a/编码格式/码率大小/采样率

        content.append("f=v/////a/1/8/1" + "\r\n");



        Request request = headerProvider.createInviteRequest(device, channelId, content.toString(),

                SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, sendRtpItem.getSsrc(), callIdHeader);

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, (e -> {

            streamSession.remove(device.getDeviceId(), channelId, sendRtpItem.getStream());

            mediaServerService.releaseSsrc(mediaServerItem.getId(), sendRtpItem.getSsrc());

            errorEvent.response(e);

        }), e -> {

            // 这里为例避免一个通道的点播只有一个callID这个参数使用一个固定值

            ResponseEvent responseEvent = (ResponseEvent) e.event;

            SIPResponse response = (SIPResponse) responseEvent.getResponse();

            streamSession.put(device.getDeviceId(), channelId, "talk", stream, sendRtpItem.getSsrc(), mediaServerItem.getId(), response, VideoStreamSessionManager.SessionType.talk);

            okEvent.response(e);

        });

    }



@@ -604,7 +659,12 @@
     */

    @Override

    public void streamByeCmd(Device device, String channelId, String stream, String callId, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException, SsrcTransactionNotFoundException {

        SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, callId, stream);

        SsrcTransaction ssrcTransaction;

        if (callId != null) {

            ssrcTransaction = streamSession.getSsrcTransaction(null, null, callId, null);

        }else {

            ssrcTransaction = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, null, stream);

        }

        if (ssrcTransaction == null) {

            throw new SsrcTransactionNotFoundException(device.getDeviceId(), channelId, callId, stream);

        }

@@ -614,7 +674,13 @@
        streamSession.remove(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());



        Request byteRequest = headerProvider.createByteRequest(device, channelId, ssrcTransaction.getSipTransactionInfo());

        transmitRequest(device.getTransport(), byteRequest, null, okEvent);

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), byteRequest, null, okEvent);

    }



    @Override

    public void streamByeCmd(Device device, String channelId, SipTransactionInfo sipTransactionInfo, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException, SsrcTransactionNotFoundException {

        Request byteRequest = headerProvider.createByteRequest(device, channelId, sipTransactionInfo);

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), byteRequest, null, okEvent);

    }



    /**

@@ -622,62 +688,20 @@
     *

     * @param device 视频设备

     */

    @Override

    public void audioBroadcastCmd(Device device) throws InvalidArgumentException, SipException, ParseException {



        StringBuffer broadcastXml = new StringBuffer(200);

        String charset = device.getCharset();

        broadcastXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

        broadcastXml.append("<Notify>\r\n");

        broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");

        broadcastXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");

        broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");

        broadcastXml.append("<TargetID>" + device.getDeviceId() + "</TargetID>\r\n");

        broadcastXml.append("</Notify>\r\n");

   /**

    * 语音广播

    *

    * @param device  视频设备

    */

   @Override

   public boolean audioBroadcastCmd(Device device,String channelId, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer broadcastXml = new StringBuffer(200);

         String charset = device.getCharset();

         broadcastXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         broadcastXml.append("<Notify>\r\n");

         broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");

         broadcastXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");

         broadcastXml.append("<TargetID>" + channelId + "</TargetID>\r\n");

         broadcastXml.append("</Notify>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request);



    }



    @Override

    public void audioBroadcastCmd(Device device, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {



   public void audioBroadcastCmd(Device device, String channelId, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {

        StringBuffer broadcastXml = new StringBuffer(200);

        String charset = device.getCharset();

        broadcastXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

        broadcastXml.append("<Notify>\r\n");

        broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");

        broadcastXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");

        broadcastXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

        broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");

        broadcastXml.append("<TargetID>" + device.getDeviceId() + "</TargetID>\r\n");

        broadcastXml.append("<TargetID>" + channelId + "</TargetID>\r\n");

        broadcastXml.append("</Notify>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request, errorEvent);

        Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent, okEvent);



    }



@@ -690,7 +714,7 @@
     * @param recordCmdStr 录像命令：Record / StopRecord

     */

    @Override

    public void recordCmd(Device device, String channelId, String recordCmdStr, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {

    public void recordCmd(Device device, String channelId, String recordCmdStr, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {

        StringBuffer cmdXml = new StringBuffer(200);

        String charset = device.getCharset();

        cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

@@ -705,11 +729,10 @@
        cmdXml.append("<RecordCmd>" + recordCmdStr + "</RecordCmd>\r\n");

        cmdXml.append("</Control>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request, errorEvent);



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent,okEvent);

    }



    /**

@@ -730,11 +753,10 @@
        cmdXml.append("<TeleBoot>Boot</TeleBoot>\r\n");

        cmdXml.append("</Control>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request);



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request);

    }



    /**

@@ -744,7 +766,7 @@
     * @param guardCmdStr "SetGuard"/"ResetGuard"

     */

    @Override

    public void guardCmd(Device device, String guardCmdStr, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {

    public void guardCmd(Device device, String guardCmdStr, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {



        StringBuffer cmdXml = new StringBuffer(200);

        String charset = device.getCharset();

@@ -756,11 +778,10 @@
        cmdXml.append("<GuardCmd>" + guardCmdStr + "</GuardCmd>\r\n");

        cmdXml.append("</Control>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();

        


        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request, errorEvent);

        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent,okEvent);

    }



    /**

@@ -769,7 +790,7 @@
     * @param device 视频设备

     */

    @Override

    public void alarmCmd(Device device, String alarmMethod, String alarmType, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {

    public void alarmCmd(Device device, String alarmMethod, String alarmType, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {



        StringBuffer cmdXml = new StringBuffer(200);

        String charset = device.getCharset();

@@ -793,11 +814,10 @@
        }

        cmdXml.append("</Control>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request, errorEvent);



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent,okEvent);

    }



    /**

@@ -823,23 +843,24 @@
        cmdXml.append("<IFameCmd>Send</IFameCmd>\r\n");

        cmdXml.append("</Control>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request);



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request);

    }



    /**

     * 看守位控制命令

     *

     * @param device      视频设备

     * @param channelId      通道id，非通道则是设备本身

     * @param frontCmd     上级平台的指令，如果存在则直接下发

     * @param enabled     看守位使能：1 = 开启，0 = 关闭

     * @param resetTime   自动归位时间间隔，开启看守位时使用，单位:秒(s)

     * @param presetIndex 调用预置位编号，开启看守位时使用，取值范围0~255

     */

    @Override

    public void homePositionCmd(Device device, String channelId, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {

    public void homePositionCmd(Device device, String channelId, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent,SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {



        StringBuffer cmdXml = new StringBuffer(200);

        String charset = device.getCharset();

@@ -871,11 +892,10 @@
        cmdXml.append("</HomePosition>\r\n");

        cmdXml.append("</Control>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request, errorEvent);



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent,okEvent);

    }



    /**

@@ -935,11 +955,10 @@
        cmdXml.append("</BasicParam>\r\n");

        cmdXml.append("</Control>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request, errorEvent);



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent);

    }



    /**

@@ -959,12 +978,11 @@
        catalogXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

        catalogXml.append("</Query>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);



        transmitRequest(device.getTransport(), request, errorEvent);

        Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));



        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent);

    }



    /**

@@ -984,12 +1002,11 @@
        catalogXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

        catalogXml.append("</Query>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);



        transmitRequest(device.getTransport(), request);

        Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));



        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request);



    }



@@ -1010,12 +1027,11 @@
        catalogXml.append("  <DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

        catalogXml.append("</Query>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);



        transmitRequest(device.getTransport(), request, errorEvent);

        Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));



        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent);

    }



    /**

@@ -1056,13 +1072,12 @@
        }

        recordInfoXml.append("</Query>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();





        Request request = headerProvider.createMessageRequest(device, recordInfoXml.toString(),

                SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);

                SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));



        transmitRequest(device.getTransport(), request, errorEvent, okEvent);

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent, okEvent);

    }



    /**

@@ -1108,11 +1123,10 @@
        }

        cmdXml.append("</Query>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request, errorEvent);



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent);

    }



    /**

@@ -1139,11 +1153,10 @@
        cmdXml.append("<ConfigType>" + configType + "</ConfigType>\r\n");

        cmdXml.append("</Query>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request, errorEvent);



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent);

    }



    /**

@@ -1167,11 +1180,10 @@
        }

        cmdXml.append("</Query>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request, errorEvent);



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent);

    }



    /**

@@ -1192,12 +1204,11 @@
        mobilePostitionXml.append("<Interval>60</Interval>\r\n");

        mobilePostitionXml.append("</Query>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createMessageRequest(device, mobilePostitionXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);



        transmitRequest(device.getTransport(), request, errorEvent);

        Request request = headerProvider.createMessageRequest(device, mobilePostitionXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));



        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent);



    }



@@ -1225,14 +1236,13 @@
        CallIdHeader callIdHeader;



        if (requestOld != null) {

            callIdHeader = sipFactory.createHeaderFactory().createCallIdHeader(requestOld.getCallIdHeader().getCallId());

            callIdHeader = sipLayer.getSipFactory().createHeaderFactory().createCallIdHeader(requestOld.getCallIdHeader().getCallId());

        } else {

            callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                    : udpSipProvider.getNewCallId();

            callIdHeader = sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport());

        }

        SIPRequest request = (SIPRequest) headerProvider.createSubscribeRequest(device, subscribePostitionXml.toString(), requestOld, device.getSubscribeCycleForMobilePosition(), "presence", callIdHeader); //Position;id=" + tm.substring(tm.length() - 4));

        SIPRequest request = (SIPRequest) headerProvider.createSubscribeRequest(device, subscribePostitionXml.toString(), requestOld, device.getSubscribeCycleForMobilePosition(), "presence",callIdHeader); //Position;id=" + tm.substring(tm.length() - 4));



        transmitRequest(device.getTransport(), request, errorEvent, okEvent);

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent, okEvent);

        return request;

    }



@@ -1279,11 +1289,10 @@
        }

        cmdXml.append("</Query>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();



        Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), null, expires, "presence", callIdHeader);

        transmitRequest(device.getTransport(), request);



        Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), null, expires, "presence",sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request);



    }



@@ -1302,16 +1311,15 @@
        CallIdHeader callIdHeader;



        if (requestOld != null) {

            callIdHeader = sipFactory.createHeaderFactory().createCallIdHeader(requestOld.getCallIdHeader().getCallId());

            callIdHeader = sipLayer.getSipFactory().createHeaderFactory().createCallIdHeader(requestOld.getCallIdHeader().getCallId());

        } else {

            callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                    : udpSipProvider.getNewCallId();

            callIdHeader = sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport());

        }



        // 有效时间默认为60秒以上

        SIPRequest request = (SIPRequest) headerProvider.createSubscribeRequest(device, cmdXml.toString(), requestOld, device.getSubscribeCycleForCatalog(), "Catalog",

                callIdHeader);

        transmitRequest(device.getTransport(), request, errorEvent, okEvent);

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent, okEvent);

        return request;

    }



@@ -1331,59 +1339,12 @@
        }

        dragXml.append(cmdString);

        dragXml.append("</Control>\r\n");

        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();

        Request request = headerProvider.createMessageRequest(device, dragXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);



        Request request = headerProvider.createMessageRequest(device, dragXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        logger.debug("拉框信令： " + request.toString());

        transmitRequest(device.getTransport(), request);

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()),request);

    }





    @Override

    public void transmitRequest(String transport, Request request) throws SipException, ParseException {

        transmitRequest(transport, request, null, null);

    }



    @Override

    public void transmitRequest(String transport, Request request, SipSubscribe.Event errorEvent) throws SipException, ParseException {

        transmitRequest(transport, request, errorEvent, null);

    }



    @Override

    public void transmitRequest(String transport, Request request, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) throws SipException, ParseException {



        if (request.getHeader(UserAgentHeader.NAME) == null) {

            try {

                request.addHeader(SipUtils.createUserAgentHeader(sipFactory, gitUtil));

            } catch (ParseException e) {

                logger.error("添加UserAgentHeader失败", e);

            }

        }



        CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME);

        // 添加错误订阅

        if (errorEvent != null) {

            sipSubscribe.addErrorSubscribe(callIdHeader.getCallId(), (eventResult -> {

                errorEvent.response(eventResult);

                sipSubscribe.removeErrorSubscribe(eventResult.callId);

                sipSubscribe.removeOkSubscribe(eventResult.callId);

            }));

        }

        // 添加订阅

        if (okEvent != null) {

            sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), eventResult -> {

                okEvent.response(eventResult);

                sipSubscribe.removeOkSubscribe(eventResult.callId);

                sipSubscribe.removeErrorSubscribe(eventResult.callId);

            });

        }

        if ("TCP".equals(transport)) {

            tcpSipProvider.sendRequest(request);

        } else if ("UDP".equals(transport)) {

            udpSipProvider.sendRequest(request);

        }



    }





    /**

@@ -1458,7 +1419,7 @@
            return;

        }



        transmitRequest(device.getTransport(), request, errorEvent, okEvent);

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent, okEvent);

    }



    @Override

@@ -1487,10 +1448,9 @@
        deviceStatusXml.append("</info>\r\n");

        deviceStatusXml.append("</Notify>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();

        Request request = headerProvider.createMessageRequest(device, deviceStatusXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);

        transmitRequest(device.getTransport(), request);



        Request request = headerProvider.createMessageRequest(device, deviceStatusXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()),request);





    }