优化sip消息

648540858

2022-09-09 221f99c764b51c3cd284c6e5a41492c26c5c7ffc

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

@@ -10,9 +10,12 @@
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;

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.SipUtils;

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.ZlmHttpHookSubscribe;

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

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

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

@@ -29,17 +32,16 @@
import org.springframework.beans.factory.annotation.Qualifier;

import org.springframework.context.annotation.DependsOn;

import org.springframework.stereotype.Component;

import org.springframework.util.StringUtils;

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.message.Request;

import java.lang.reflect.Field;

import java.text.ParseException;

import java.util.ArrayList;

import java.util.HashSet;

import java.util.List;



/**    

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

@@ -82,7 +84,7 @@
   private UserSetting userSetting;



   @Autowired

   private ZLMHttpHookSubscribe subscribe;

   private ZlmHttpHookSubscribe subscribe;



   @Autowired

   private SipSubscribe sipSubscribe;

@@ -242,13 +244,11 @@
         ptzXml.append("<ControlPriority>5</ControlPriority>\r\n");

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

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

			
         String tm = Long.toString(System.currentTimeMillis());



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

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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);

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

         

         transmitRequest(device, request);

         return true;

@@ -286,12 +286,11 @@
         ptzXml.append("</Info>\r\n");

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

         

         String tm = Long.toString(System.currentTimeMillis());



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

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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);

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

         transmitRequest(device, request);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -322,12 +321,11 @@
         ptzXml.append("</Info>\r\n");

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

         

         String tm = Long.toString(System.currentTimeMillis());



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

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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);

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

         transmitRequest(device, request, errorEvent, okEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -345,26 +343,20 @@
   */

   @Override

   public void playStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,

                       ZLMHttpHookSubscribe.Event event, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {

      String streamId = ssrcInfo.getStream();

                       ZlmHttpHookSubscribe.Event event, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {

      String stream = ssrcInfo.getStream();

      try {

         if (device == null) {

            return;

         }

         String streamMode = device.getStreamMode().toUpperCase();

//         String streamMode = device.getStreamMode().toUpperCase();



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

         // 添加订阅

         JSONObject subscribeKey = new JSONObject();

         subscribeKey.put("app", "rtp");

         subscribeKey.put("stream", streamId);

         subscribeKey.put("regist", true);

         subscribeKey.put("schema", "rtmp");

         subscribeKey.put("mediaServerId", mediaServerItem.getId());

         subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,

               (MediaServerItem mediaServerItemInUse, JSONObject json)->{

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

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

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

            if (event != null) {

               event.response(mediaServerItemInUse, json);

               subscribe.removeSubscribe(hookSubscribe);

            }

         });

         //

@@ -376,11 +368,11 @@
         content.append("t=0 0\r\n");



         if (userSetting.isSeniorSdp()) {

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

            if("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())) {

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

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

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

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

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

            }else if("UDP".equalsIgnoreCase(device.getStreamMode())) {

               content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 126 125 99 34 98 97\r\n");

            }

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

@@ -392,19 +384,19 @@
            content.append("a=rtpmap:99 H265/90000\r\n");

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

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

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

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

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

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

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

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

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

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

            }

         }else {

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

            if("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())) {

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");

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

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

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");

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

            }else if("UDP".equalsIgnoreCase(device.getStreamMode())) {

               content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n");

            }

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

@@ -412,10 +404,10 @@
            content.append("a=rtpmap:98 H264/90000\r\n");

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

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

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

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

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

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

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

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

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

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

            }

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

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



         String tm = Long.toString(System.currentTimeMillis());



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

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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), null, "FromInvt" + tm, null, ssrcInfo.getSsrc(), callIdHeader);

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



         transmitRequest(device, request, (e -> {

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

@@ -438,7 +428,7 @@
            errorEvent.response(e);

         }), e ->{

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

            streamSession.put(device.getDeviceId(), channelId ,"play", streamId, ssrcInfo.getSsrc(), mediaServerItem.getId(), ((ResponseEvent)e.event).getClientTransaction(), VideoStreamSessionManager.SessionType.play);

            streamSession.put(device.getDeviceId(), channelId ,"play", stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), ((ResponseEvent)e.event).getClientTransaction(), VideoStreamSessionManager.SessionType.play);

            streamSession.put(device.getDeviceId(), channelId ,"play", e.dialog);

            okEvent.response(e);

         });

@@ -460,7 +450,7 @@
   @Override

   public void playbackStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,

                          String startTime, String endTime, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,

                          SipSubscribe.Event errorEvent) {

                          SipSubscribe.Event okEvent,SipSubscribe.Event errorEvent) {

      try {



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

@@ -474,14 +464,14 @@
           content.append("t="+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime)+" "

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



         String streamMode = device.getStreamMode().toUpperCase();

         String streamMode = device.getStreamMode();



         if (userSetting.isSeniorSdp()) {

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

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

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

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

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

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

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

            }else if("UDP".equalsIgnoreCase(streamMode)) {

               content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 126 125 99 34 98 97\r\n");

            }

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

@@ -493,19 +483,19 @@
            content.append("a=rtpmap:99 H265/90000\r\n");

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

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

            if("TCP-PASSIVE".equals(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".equals(streamMode)) { // tcp主动模式

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

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

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

            }

         }else {

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

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

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");

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

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

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");

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

            }else if("UDP".equalsIgnoreCase(streamMode)) {

               content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n");

            }

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

@@ -513,43 +503,35 @@
            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".equals(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".equals(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

	        
         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



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

         // 添加订阅

         JSONObject subscribeKey = new JSONObject();

         subscribeKey.put("app", "rtp");

         subscribeKey.put("stream", ssrcInfo.getStream());

         subscribeKey.put("regist", true);

         subscribeKey.put("schema", "rtmp");

         subscribeKey.put("mediaServerId", mediaServerItem.getId());

         logger.debug("录像回放添加订阅，订阅内容：" + subscribeKey);

         subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,

               (MediaServerItem mediaServerItemInUse, JSONObject json)->{

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

                  if (hookEvent != null) {

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

                     hookEvent.call(inviteStreamInfo);

                  }

                  subscribe.removeSubscribe(hookSubscribe);

               });

           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "fromplybck" + tm, null, callIdHeader, ssrcInfo.getSsrc());

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



           transmitRequest(device, request, errorEvent, okEvent -> {

            ResponseEvent responseEvent = (ResponseEvent) okEvent.event;

           transmitRequest(device, request, errorEvent, event -> {

            ResponseEvent responseEvent = (ResponseEvent) event.event;

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

            streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), okEvent.dialog);

            streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), event.dialog);

            okEvent.response(event);

         });

         if (inviteStreamCallback != null) {

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

@@ -635,34 +617,29 @@
         content.append("a=downloadspeed:" + downloadSpeed + "\r\n");



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

	        
         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



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

         // 添加订阅

         JSONObject subscribeKey = new JSONObject();

         subscribeKey.put("app", "rtp");

         subscribeKey.put("stream", ssrcInfo.getStream());

         subscribeKey.put("regist", true);

         subscribeKey.put("mediaServerId", mediaServerItem.getId());

         logger.debug("录像回放添加订阅，订阅内容：" + subscribeKey.toString());

         subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,

               (MediaServerItem mediaServerItemInUse, JSONObject json)->{

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

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

                  subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey);

                  subscribeKey.put("regist", false);

                  subscribeKey.put("schema", "rtmp");

                  subscribe.removeSubscribe(hookSubscribe);

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

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

                  // 添加流注销的订阅，注销了后向设备发送bye

                  subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,

                  subscribe.addSubscribe(hookSubscribe,

                        (MediaServerItem mediaServerItemForEnd, JSONObject jsonForEnd)->{

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

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

                           ClientTransaction transaction = streamSession.getTransaction(device.getDeviceId(), channelId, ssrcInfo.getStream(), callIdHeader.getCallId());

                           if (transaction != null) {

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

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

                           }

                        });

               });



           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "fromplybck" + tm, null, callIdHeader, ssrcInfo.getSsrc());

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

         if (inviteStreamCallback != null) {

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

         }

@@ -705,22 +682,19 @@
         }

         SIPDialog dialog;

         if (callId != null) {

            dialog = streamSession.getDialogByCallId(deviceId, channelId, callId);

            dialog = streamSession.getDialogByCallId(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), callId);

         }else {

            if (stream == null) {

            if (stream == null && ssrcTransaction == null && ssrcTransaction.getStream() == null) {

               return;

            }

            dialog = streamSession.getDialogByStream(deviceId, channelId, stream);

            dialog = streamSession.getDialogByStream(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());

         }

         if (ssrcTransaction != null) {

            MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransaction.getMediaServerId());

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

            mediaServerService.closeRTPServer(deviceId, channelId, ssrcTransaction.getStream());

            streamSession.remove(deviceId, channelId, ssrcTransaction.getStream());

         }

         mediaServerService.releaseSsrc(ssrcTransaction.getMediaServerId(), ssrcTransaction.getSsrc());

         mediaServerService.closeRTPServer(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());

         streamSession.remove(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());



         if (dialog == null) {

            logger.warn("[ {} -> {}]停止视频流的时候发现对话已丢失", deviceId, channelId);

            logger.warn("[ {} -> {}]停止视频流的时候发现对话已丢失", ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId());

            return;

         }

         SipStack sipStack = udpSipProvider.getSipStack();

@@ -746,8 +720,15 @@
         SIPRequest request = (SIPRequest)transaction.getRequest();

         byeURI.setHost(request.getRemoteAddress().getHostAddress());

         byeURI.setPort(request.getRemotePort());

         byeURI.setUser(channelId);

         ViaHeader viaHeader = (ViaHeader) byeRequest.getHeader(ViaHeader.NAME);

         String protocol = viaHeader.getTransport().toUpperCase();

         viaHeader.setRPort();

         // 增加Contact header

         Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort()));

         byeRequest.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));

         UserAgentHeader userAgentHeader = SipUtils.createUserAgentHeader(sipFactory);

         byeRequest.addHeader(userAgentHeader);

         ClientTransaction clientTransaction = null;

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

            clientTransaction = tcpSipProvider.getNewClientTransaction(byeRequest);

@@ -759,11 +740,14 @@
         if (okEvent != null) {

            sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), okEvent);

         }



         CSeqHeader cSeqHeader = (CSeqHeader)byeRequest.getHeader(CSeqHeader.NAME);

         cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ());

         dialog.sendRequest(clientTransaction);



      } catch (SipException | ParseException e) {

         e.printStackTrace();

      } catch (InvalidArgumentException e) {

         throw new RuntimeException(e);

      }

   }



@@ -796,13 +780,11 @@
         broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");

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

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

			
         String tm = Long.toString(System.currentTimeMillis());

			


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

               : udpSipProvider.getNewCallId();

                        

         Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), "z9hG4bK-ViaBcst-" + tm, "FromBcst" + tm, null, callIdHeader);

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

         transmitRequest(device, request);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -822,13 +804,11 @@
         broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");

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

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

			
         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();

                        

         Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), "z9hG4bK-ViaBcst-" + tm, "FromBcst" + tm, null, callIdHeader);

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

         transmitRequest(device, request, errorEvent);

      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

@@ -852,20 +832,18 @@
         cmdXml.append("<Control>\r\n");

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

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

         if (StringUtils.isEmpty(channelId)) {

         if (ObjectUtils.isEmpty(channelId)) {

            cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         } else {

            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

         }

         cmdXml.append("<RecordCmd>" + recordCmdStr + "</RecordCmd>\r\n");

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

			
         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, "FromRecord" + tm, null, callIdHeader);

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

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -891,13 +869,11 @@
         cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

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

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

			
         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, "FromBoot" + tm, null, callIdHeader);

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

         transmitRequest(device, request);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -924,13 +900,11 @@
         cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         cmdXml.append("<GuardCmd>" + guardCmdStr + "</GuardCmd>\r\n");

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

			
         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, "FromGuard" + tm, null, callIdHeader);

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

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -955,26 +929,24 @@
         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

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

         if (!StringUtils.isEmpty(alarmMethod) || !StringUtils.isEmpty(alarmType)) {

         if (!ObjectUtils.isEmpty(alarmMethod) || !ObjectUtils.isEmpty(alarmType)) {

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

         }

         if (!StringUtils.isEmpty(alarmMethod)) {

         if (!ObjectUtils.isEmpty(alarmMethod)) {

            cmdXml.append("<AlarmMethod>" + alarmMethod + "</AlarmMethod>\r\n");

         }

         if (!StringUtils.isEmpty(alarmType)) {

         if (!ObjectUtils.isEmpty(alarmType)) {

            cmdXml.append("<AlarmType>" + alarmType + "</AlarmType>\r\n");

         }

         if (!StringUtils.isEmpty(alarmMethod) || !StringUtils.isEmpty(alarmType)) {

         if (!ObjectUtils.isEmpty(alarmMethod) || !ObjectUtils.isEmpty(alarmType)) {

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

         }

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

			
         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, "FromAlarm" + tm, null, callIdHeader);

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

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -998,20 +970,18 @@
         cmdXml.append("<Control>\r\n");

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

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

         if (StringUtils.isEmpty(channelId)) {

         if (ObjectUtils.isEmpty(channelId)) {

            cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         } else {

            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

         }

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

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

			
         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, "FromBoot" + tm, null, callIdHeader);

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

         transmitRequest(device, request);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1037,7 +1007,7 @@
         cmdXml.append("<Control>\r\n");

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

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

         if (StringUtils.isEmpty(channelId)) {

         if (ObjectUtils.isEmpty(channelId)) {

            cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         } else {

            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

@@ -1060,13 +1030,11 @@
         }

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

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

			
         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, "FromGuard" + tm, null, callIdHeader);

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

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1106,13 +1074,13 @@
         cmdXml.append("<Control>\r\n");

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

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

         if (StringUtils.isEmpty(channelId)) {

         if (ObjectUtils.isEmpty(channelId)) {

            cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         } else {

            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

         }

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

         if (!StringUtils.isEmpty(name)) {

         if (!ObjectUtils.isEmpty(name)) {

            cmdXml.append("<Name>" + name + "</Name>\r\n");

         }

         if (NumericUtil.isInteger(expiration)) {

@@ -1132,13 +1100,11 @@
         }

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

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

			
         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, "FromConfig" + tm, null, callIdHeader);

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

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1163,13 +1129,11 @@
         catalogXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         catalogXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

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

			
         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), null, "FromStatus" + tm, null, callIdHeader);

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



         transmitRequest(device, request, errorEvent);

         return true;

@@ -1196,13 +1160,11 @@
         catalogXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         catalogXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

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

			
         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), "z9hG4bK-ViaDeviceInfo-" + tm, "FromDev" + tm, null, callIdHeader);

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



         transmitRequest(device, request);

         

@@ -1225,17 +1187,15 @@
         String charset = device.getCharset();

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

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

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

         catalogXml.append("<SN>" + sn + "</SN>\r\n");

         catalogXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

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

         catalogXml.append("  <SN>" + sn + "</SN>\r\n");

         catalogXml.append("  <DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

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

			
         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), "z9hG4bK-ViaCatalog-" + tm, "FromCat" + tm, null, callIdHeader);

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



         transmitRequest(device, request, errorEvent);

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1283,13 +1243,11 @@
         }

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

         

         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



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

               "z9hG4bK-ViaRecordInfo-" + tm, "fromRec" + tm, null, callIdHeader);

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



         transmitRequest(device, request, errorEvent, okEvent);

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1322,32 +1280,30 @@
         cmdXml.append("<CmdType>Alarm</CmdType>\r\n");

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

         cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         if (!StringUtils.isEmpty(startPriority)) {

         if (!ObjectUtils.isEmpty(startPriority)) {

            cmdXml.append("<StartAlarmPriority>" + startPriority + "</StartAlarmPriority>\r\n");

         }

         if (!StringUtils.isEmpty(endPriority)) {

         if (!ObjectUtils.isEmpty(endPriority)) {

            cmdXml.append("<EndAlarmPriority>" + endPriority + "</EndAlarmPriority>\r\n");

         }

         if (!StringUtils.isEmpty(alarmMethod)) {

         if (!ObjectUtils.isEmpty(alarmMethod)) {

            cmdXml.append("<AlarmMethod>" + alarmMethod + "</AlarmMethod>\r\n");

         }

         if (!StringUtils.isEmpty(alarmType)) {

         if (!ObjectUtils.isEmpty(alarmType)) {

            cmdXml.append("<AlarmType>" + alarmType + "</AlarmType>\r\n");

         }

         if (!StringUtils.isEmpty(startTime)) {

         if (!ObjectUtils.isEmpty(startTime)) {

            cmdXml.append("<StartAlarmTime>" + startTime + "</StartAlarmTime>\r\n");

         }

         if (!StringUtils.isEmpty(endTime)) {

         if (!ObjectUtils.isEmpty(endTime)) {

            cmdXml.append("<EndAlarmTime>" + endTime + "</EndAlarmTime>\r\n");

         }

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

         

         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, "FromAlarm" + tm, null, callIdHeader);

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

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1372,7 +1328,7 @@
         cmdXml.append("<Query>\r\n");

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

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

         if (StringUtils.isEmpty(channelId)) {

         if (ObjectUtils.isEmpty(channelId)) {

            cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         } else {

            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

@@ -1380,12 +1336,10 @@
         cmdXml.append("<ConfigType>" + configType + "</ConfigType>\r\n");

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

         

         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, "FromConfig" + tm, null, callIdHeader);

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

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1408,19 +1362,17 @@
         cmdXml.append("<Query>\r\n");

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

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

         if (StringUtils.isEmpty(channelId)) {

         if (ObjectUtils.isEmpty(channelId)) {

            cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         } else {

            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

         }

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

         

         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, "FromConfig" + tm, null, callIdHeader);

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

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1447,12 +1399,10 @@
         mobilePostitionXml.append("<Interval>60</Interval>\r\n");

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

         

         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, mobilePostitionXml.toString(), "z9hG4bK-viaPos-" + tm, "fromTagPos" + tm, null, callIdHeader);

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



         transmitRequest(device, request, errorEvent);

         

@@ -1486,17 +1436,24 @@


         Request request;

         if (dialog != null) {

            logger.info("发送移动位置订阅消息时 dialog的状态为： {}", dialog.getState());

            SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());

            request = dialog.createRequest(Request.SUBSCRIBE);

            ExpiresHeader expiresHeader = sipFactory.createHeaderFactory().createExpiresHeader(device.getSubscribeCycleForCatalog());

            request.setExpires(expiresHeader);



            request.setRequestURI(requestURI);



            ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");

            request.setContent(subscribePostitionXml.toString(), contentTypeHeader);

            ExpiresHeader expireHeader = sipFactory.createHeaderFactory().createExpiresHeader(device.getSubscribeCycleForMobilePosition());

            request.addHeader(expireHeader);



            CSeqHeader cSeqHeader = (CSeqHeader)request.getHeader(CSeqHeader.NAME);

            cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ());

            request.removeHeader(CSeqHeader.NAME);

            request.addHeader(cSeqHeader);

         }else {

            String tm = Long.toString(System.currentTimeMillis());

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

                  : udpSipProvider.getNewCallId();

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

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

         }

         transmitRequest(device, request, errorEvent, okEvent);



@@ -1531,32 +1488,30 @@
         cmdXml.append("<CmdType>Alarm</CmdType>\r\n");

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

         cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         if (!StringUtils.isEmpty(startPriority)) {

         if (!ObjectUtils.isEmpty(startPriority)) {

            cmdXml.append("<StartAlarmPriority>" + startPriority + "</StartAlarmPriority>\r\n");

         }

         if (!StringUtils.isEmpty(endPriority)) {

         if (!ObjectUtils.isEmpty(endPriority)) {

            cmdXml.append("<EndAlarmPriority>" + endPriority + "</EndAlarmPriority>\r\n");

         }

         if (!StringUtils.isEmpty(alarmMethod)) {

         if (!ObjectUtils.isEmpty(alarmMethod)) {

            cmdXml.append("<AlarmMethod>" + alarmMethod + "</AlarmMethod>\r\n");

         }

         if (!StringUtils.isEmpty(alarmType)) {

         if (!ObjectUtils.isEmpty(alarmType)) {

            cmdXml.append("<AlarmType>" + alarmType + "</AlarmType>\r\n");

         }

         if (!StringUtils.isEmpty(startTime)) {

         if (!ObjectUtils.isEmpty(startTime)) {

            cmdXml.append("<StartAlarmTime>" + startTime + "</StartAlarmTime>\r\n");

         }

         if (!StringUtils.isEmpty(endTime)) {

         if (!ObjectUtils.isEmpty(endTime)) {

            cmdXml.append("<EndAlarmTime>" + endTime + "</EndAlarmTime>\r\n");

         }

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



         String tm = Long.toString(System.currentTimeMillis());



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), "z9hG4bK-viaPos-" + tm, "fromTagPos" + tm, null, expires, "presence" , callIdHeader);

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

         transmitRequest(device, request);



         return true;

@@ -1582,21 +1537,28 @@


         Request request;

         if (dialog != null) {

            logger.info("发送目录订阅消息时 dialog的状态为： {}", dialog.getState());

            SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());

            request = dialog.createRequest(Request.SUBSCRIBE);

            ExpiresHeader expiresHeader = sipFactory.createHeaderFactory().createExpiresHeader(device.getSubscribeCycleForCatalog());

            request.setExpires(expiresHeader);



            request.setRequestURI(requestURI);



            ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");

            request.setContent(cmdXml.toString(), contentTypeHeader);

            ExpiresHeader expireHeader = sipFactory.createHeaderFactory().createExpiresHeader(device.getSubscribeCycleForMobilePosition());

            request.addHeader(expireHeader);

         }else {

            String tm = Long.toString(System.currentTimeMillis());



            CSeqHeader cSeqHeader = (CSeqHeader)request.getHeader(CSeqHeader.NAME);

            cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ());

            request.removeHeader(CSeqHeader.NAME);

            request.addHeader(cSeqHeader);



         }else {

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

                  : udpSipProvider.getNewCallId();



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

            request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), "z9hG4bK-viaPos-" + tm,

                  "fromTagPos" + tm, null, device.getSubscribeCycleForCatalog(), "Catalog" ,

            request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), SipUtils.getNewViaTag(),

                  SipUtils.getNewFromTag(), null, device.getSubscribeCycleForCatalog(), "Catalog" ,

                  callIdHeader);



         }

@@ -1618,17 +1580,16 @@
         dragXml.append("<Control>\r\n");

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

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

         if (StringUtils.isEmpty(channelId)) {

         if (ObjectUtils.isEmpty(channelId)) {

            dragXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         } else {

            dragXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

         }

         dragXml.append(cmdString);

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

         String tm = Long.toString(System.currentTimeMillis());

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

               : udpSipProvider.getNewCallId();

         Request request = headerProvider.createMessageRequest(device, dragXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);

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

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

         transmitRequest(device, request);

         return true;

@@ -1655,14 +1616,11 @@
         clientTransaction = udpSipProvider.getNewClientTransaction(request);

      }

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

         List<String> agentParam = new ArrayList<>();

         agentParam.add("wvp-pro");

         // TODO 添加版本信息以及日期

         UserAgentHeader userAgentHeader = null;

         try {

            userAgentHeader = sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);

            userAgentHeader = SipUtils.createUserAgentHeader(sipFactory);

         } catch (ParseException e) {

            throw new RuntimeException(e);

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

         }

         request.addHeader(userAgentHeader);

      }

@@ -1694,10 +1652,9 @@
   @Override

   public void playPauseCmd(Device device, StreamInfo streamInfo) {

      try {

         Long cseq = redisCatchStorage.getCSEQ(Request.INFO);

         StringBuffer content = new StringBuffer(200);

         content.append("PAUSE RTSP/1.0\r\n");

         content.append("CSeq: " + cseq + "\r\n");

         content.append("CSeq: " + getInfoCseq() + "\r\n");

         content.append("PauseTime: now\r\n");

         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());

         if (request == null) {

@@ -1725,10 +1682,9 @@
   @Override

   public void playResumeCmd(Device device, StreamInfo streamInfo) {

      try {

         Long cseq = redisCatchStorage.getCSEQ(Request.INFO);

         StringBuffer content = new StringBuffer(200);

         content.append("PLAY RTSP/1.0\r\n");

         content.append("CSeq: " + cseq + "\r\n");

         content.append("CSeq: " + getInfoCseq() + "\r\n");

         content.append("Range: npt=now-\r\n");

         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());

         if (request == null) {

@@ -1755,10 +1711,9 @@
   @Override

   public void playSeekCmd(Device device, StreamInfo streamInfo, long seekTime) {

      try {

         Long cseq = redisCatchStorage.getCSEQ(Request.INFO);

         StringBuffer content = new StringBuffer(200);

         content.append("PLAY RTSP/1.0\r\n");

         content.append("CSeq: " + cseq + "\r\n");

         content.append("CSeq: " + getInfoCseq() + "\r\n");

         content.append("Range: npt=" + Math.abs(seekTime) + "-\r\n");



         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());

@@ -1786,11 +1741,11 @@
   @Override

   public void playSpeedCmd(Device device, StreamInfo streamInfo, Double speed) {

      try {

         Long cseq = redisCatchStorage.getCSEQ(Request.INFO);



         StringBuffer content = new StringBuffer(200);

         content.append("PLAY RTSP/1.0\r\n");

         content.append("CSeq: " + cseq + "\r\n");

         content.append("Scale: " + String.format("%.1f",speed) + "\r\n");

         content.append("CSeq: " + getInfoCseq() + "\r\n");

         content.append("Scale: " + String.format("%.6f",speed) + "\r\n");

         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());

         if (request == null) {

            return;

@@ -1805,6 +1760,46 @@


         clientTransaction.sendRequest();



      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      }

   }



   private int getInfoCseq() {

      return (int) ((Math.random() * 9 + 1) * Math.pow(10, 8));

   }

	
   @Override

   public void playbackControlCmd(Device device, StreamInfo streamInfo, String content,SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) {

      try {

         Request request = headerProvider.createInfoRequest(device, streamInfo, content);

         if (request == null) {

            return;

         }

         ClientTransaction clientTransaction = null;

         if ("TCP".equals(device.getTransport())) {

            clientTransaction = tcpSipProvider.getNewClientTransaction(request);

         } else if ("UDP".equals(device.getTransport())) {

            clientTransaction = udpSipProvider.getNewClientTransaction(request);

         }

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

            });

         }

         clientTransaction.sendRequest();

			
      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      }

@@ -1838,8 +1833,7 @@


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

               : udpSipProvider.getNewCallId();

         String tm = Long.toString(System.currentTimeMillis());

         Request request = headerProvider.createMessageRequest(device, deviceStatusXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);

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

         transmitRequest(device, request);





@@ -1854,7 +1848,7 @@


   private void sendNotify(Device device, String catalogXmlContent,

                     SubscribeInfo subscribeInfo, SipSubscribe.Event errorEvent,  SipSubscribe.Event okEvent )

         throws NoSuchFieldException, IllegalAccessException, SipException, ParseException {

         throws SipException, ParseException {

      MessageFactoryImpl messageFactory = (MessageFactoryImpl) sipFactory.createMessageFactory();

      String characterSet = device.getCharset();

      // 设置编码， 防止中文乱码