Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

648540858

2022-07-03 e78c402a248ff252ee93e724396c62d806087fab

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

@@ -717,8 +717,7 @@
            }

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

         }

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

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

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

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

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



@@ -744,42 +743,34 @@
            }

         }



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

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

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

         ClientTransaction clientTransaction = null;

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

            clientTransaction = tcpSipProvider.getNewClientTransaction(byeRequest);

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

            clientTransaction = udpSipProvider.getNewClientTransaction(byeRequest);

         }



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

         if (okEvent != null) {

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

         }



         dialog.sendRequest(clientTransaction);

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



      } catch (SipException | ParseException e) {

         e.printStackTrace();

      }

   }



   /**

    * 语音广播

    * 
    * @param device  视频设备

    * @param channelId  预览通道

    */

   @Override

   public boolean audioBroadcastCmd(Device device, String channelId) {

      // 改为新的实现

      return false;

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

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

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

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

      byeURI.setPort(request.getRemotePort());

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

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

      ClientTransaction clientTransaction = null;

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

         clientTransaction = tcpSipProvider.getNewClientTransaction(byeRequest);

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

         clientTransaction = udpSipProvider.getNewClientTransaction(byeRequest);

      }



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

      if (okEvent != null) {

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

      }



      dialog.sendRequest(clientTransaction);

   }



   /**

@@ -788,7 +779,7 @@
    * @param device  视频设备

    */

   @Override

   public boolean audioBroadcastCmd(Device device) {

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

      try {

         StringBuffer broadcastXml = new StringBuffer(200);

         String charset = device.getCharset();

@@ -797,7 +788,7 @@
         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("<TargetID>" + channelId + "</TargetID>\r\n");

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

         

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

@@ -806,39 +797,14 @@
               : udpSipProvider.getNewCallId();

                        

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

         transmitRequest(device, request);

         transmitRequest(device, request, errorEvent, okEvent);

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

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

      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      } 
   } 
	
	
   /**

    * 音视频录像控制

    * 

@@ -1829,6 +1795,43 @@
         e.printStackTrace();

      }

   }

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

         }

         logger.info(request.toString());

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

      }

   }



   @Override

   public boolean sendAlarmMessage(Device device, DeviceAlarm deviceAlarm) {