Merge branch 'wvp-28181-2.0'

648540858

2022-08-15 cb16cabb64e99d7f505822a49665725ff5b61ff6

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

@@ -727,21 +727,28 @@
            }

         }



         streamByeCmd(dialog, (SIPRequest)transaction.getRequest(), okEvent);



      } catch (SipException | ParseException e) {

         e.printStackTrace();

      }

   }



   @Override

   public void streamByeCmd(SIPDialog dialog, SIPRequest request, SipSubscribe.Event okEvent) throws SipException, ParseException {

      Request byeRequest = dialog.createRequest(Request.BYE);

      SipURI byeURI = (SipURI) byeRequest.getRequestURI();

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

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

         agentParam.add("wvp-pro");

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

         UserAgentHeader userAgentHeader = null;

         try {

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

         } catch (ParseException e) {

            throw new RuntimeException(e);

         }

         byeRequest.addHeader(userAgentHeader);

      ClientTransaction clientTransaction = null;

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

         clientTransaction = tcpSipProvider.getNewClientTransaction(byeRequest);

@@ -753,8 +760,15 @@
      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);

      }

   }



   /**

@@ -1450,7 +1464,7 @@
            request.setContent(subscribePostitionXml.toString(), contentTypeHeader);



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

            cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ(Request.SUBSCRIBE));

            cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ());

            request.removeHeader(CSeqHeader.NAME);

            request.addHeader(cSeqHeader);

         }else {

@@ -1554,7 +1568,7 @@
            request.setContent(cmdXml.toString(), contentTypeHeader);



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

            cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ(Request.SUBSCRIBE));

            cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ());

            request.removeHeader(CSeqHeader.NAME);

            request.addHeader(cSeqHeader);



@@ -1664,10 +1678,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) {

@@ -1695,10 +1708,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) {

@@ -1725,10 +1737,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());

@@ -1756,11 +1767,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;

@@ -1780,6 +1791,10 @@
      }

   }

   

   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 {

@@ -1787,7 +1802,6 @@
         if (request == null) {

            return;

         }

         logger.info(request.toString());

         ClientTransaction clientTransaction = null;

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

            clientTransaction = tcpSipProvider.getNewClientTransaction(request);