Merge branch 'wvp-28181-2.0'

648540858

2022-09-14 ab74d1cff90cc563e0eca8deb8f154d84eb51908

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

@@ -10,7 +10,7 @@
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.HeaderUtils;

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;

@@ -21,6 +21,7 @@
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.GitUtil;

import gov.nist.javax.sip.SipProviderImpl;

import gov.nist.javax.sip.SipStackImpl;

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

@@ -61,6 +62,9 @@


   @Autowired

   private SipFactory sipFactory;



   @Autowired

   private GitUtil gitUtil;



   @Autowired

   @Qualifier(value="tcpSipProvider")

@@ -246,13 +250,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;

@@ -289,13 +291,12 @@
         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;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -325,13 +326,12 @@
         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, errorEvent, okEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -355,10 +355,10 @@
         if (device == null) {

            return;

         }

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

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



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

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

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

@@ -374,11 +374,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");

@@ -390,19 +390,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");

@@ -410,10 +410,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");

            }

@@ -423,12 +423,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());

@@ -458,7 +456,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());

@@ -472,14 +470,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");

@@ -491,19 +489,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");

@@ -511,22 +509,20 @@
            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, "rtmp", mediaServerItem.getId());

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

         // 添加订阅

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

                  if (hookEvent != null) {

@@ -535,12 +531,13 @@
                  }

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

@@ -626,8 +623,6 @@
         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();

@@ -650,7 +645,7 @@
                        });

               });



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

         }

@@ -733,7 +728,7 @@
            dialog = streamSession.getDialogByStream(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());

         }

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

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

         mediaServerService.closeRTPServer(ssrcTransaction.getMediaServerId(), ssrcTransaction.getStream());

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



         if (dialog == null) {

@@ -770,7 +765,7 @@
         // 增加Contact header

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

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

         UserAgentHeader userAgentHeader = HeaderUtils.createUserAgentHeader(sipFactory);

         UserAgentHeader userAgentHeader = SipUtils.createUserAgentHeader(sipFactory, gitUtil);

         byeRequest.addHeader(userAgentHeader);

         ClientTransaction clientTransaction = null;

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

@@ -811,20 +806,41 @@
         broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");

         broadcastXml.append("<TargetID>" + channelId + "</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);

         transmitRequest(device, request, errorEvent, okEvent);

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

         transmitRequest(device, request);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      } 

      return false;

   }

   @Override

   public void audioBroadcastCmd(Device device, 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>" + device.getDeviceId() + "</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, request, errorEvent);

      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      }

   }





   /**

    * 音视频录像控制

@@ -849,13 +865,11 @@
         }

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

@@ -881,13 +895,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) {

@@ -914,13 +926,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) {

@@ -958,13 +968,11 @@
            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) {

@@ -995,13 +1003,11 @@
         }

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

@@ -1050,13 +1056,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) {

@@ -1122,13 +1126,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) {

@@ -1153,13 +1155,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;

@@ -1186,13 +1186,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);

         

@@ -1215,17 +1213,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) {

@@ -1272,14 +1268,12 @@
            recordInfoXml.append("<Type>" + type+"</Type>\r\n");

         }

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

@@ -1331,13 +1325,11 @@
            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) {

@@ -1369,13 +1361,11 @@
         }

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

@@ -1404,13 +1394,11 @@
            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) {

@@ -1436,13 +1424,11 @@
         mobilePostitionXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

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

         

@@ -1491,10 +1477,9 @@
            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);



@@ -1549,12 +1534,10 @@
         }

         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;

@@ -1596,14 +1579,12 @@
            request.addHeader(cSeqHeader);



         }else {

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



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



         }

@@ -1632,10 +1613,9 @@
         }

         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;

@@ -1662,13 +1642,11 @@
         clientTransaction = udpSipProvider.getNewClientTransaction(request);

      }

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

         UserAgentHeader userAgentHeader = null;

         try {

            userAgentHeader = HeaderUtils.createUserAgentHeader(sipFactory);

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

         } catch (ParseException e) {

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

         }

         request.addHeader(userAgentHeader);

      }

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

      // 添加错误订阅

@@ -1879,8 +1857,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);





@@ -1895,7 +1872,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();

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