修复回放、停止预览bug，增加ZLM hook监听，长时间无人观看，停止摄像头推流。需开启ZLM的hook并配置url

songww

2020-05-14 805fa42a2c010d92b1c8fc29a60d32fd99fb4ea3

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

@@ -24,7 +24,7 @@
import com.genersoft.iot.vmp.gb28181.bean.Host;



/**

 * @Description:TODO(这里用一句话描述这个类的作用)

 * @Description:摄像头命令request创造器 TODO 冗余代码太多待优化

 * @author: songww

 * @date: 2020年5月6日 上午9:29:02

 */

@@ -35,7 +35,7 @@
   private SipLayer layer;



   @Autowired

   private SipConfig config;

   private SipConfig sipConfig;

   

   public Request createMessageRequest(Device device, String content, String viaTag, String fromTag, String toTag) throws ParseException, InvalidArgumentException {

      Request request = null;

@@ -44,16 +44,17 @@
      SipURI requestURI = layer.getAddressFactory().createSipURI(device.getDeviceId(), host.getAddress());

      // via

      ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();

      ViaHeader viaHeader = layer.getHeaderFactory().createViaHeader(config.getSipIp(), config.getSipPort(),

      ViaHeader viaHeader = layer.getHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(),

            device.getTransport(), viaTag);

      viaHeader.setRPort();

      viaHeaders.add(viaHeader);

      // from

      SipURI fromSipURI = layer.getAddressFactory().createSipURI(device.getDeviceId(),

            config.getSipIp() + ":" + config.getSipPort());

      SipURI fromSipURI = layer.getAddressFactory().createSipURI(sipConfig.getSipId(),

            sipConfig.getSipIp() + ":" + sipConfig.getSipPort());

      Address fromAddress = layer.getAddressFactory().createAddress(fromSipURI);

      FromHeader fromHeader = layer.getHeaderFactory().createFromHeader(fromAddress, fromTag);

      // to

      SipURI toSipURI = layer.getAddressFactory().createSipURI(device.getDeviceId(), host.getAddress());

      SipURI toSipURI = layer.getAddressFactory().createSipURI(device.getDeviceId(), sipConfig.getSipDomain());

      Address toAddress = layer.getAddressFactory().createAddress(toSipURI);

      ToHeader toHeader = layer.getHeaderFactory().createToHeader(toAddress, toTag);

      // callid

@@ -71,22 +72,22 @@
      return request;

   }

   

   public Request createInviteRequest(Device device, String content, String viaTag, String fromTag, String toTag) throws ParseException, InvalidArgumentException {

   public Request createInviteRequest(Device device, String channelId, String content, String viaTag, String fromTag, String toTag) throws ParseException, InvalidArgumentException {

      Request request = null;

      Host host = device.getHost();

      //请求行

      SipURI requestLine = layer.getAddressFactory().createSipURI(device.getDeviceId(), host.getAddress());

      SipURI requestLine = layer.getAddressFactory().createSipURI(channelId, host.getAddress());

      //via

      ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();

      ViaHeader viaHeader = layer.getHeaderFactory().createViaHeader(config.getSipIp(), config.getSipPort(), device.getTransport(), viaTag);

      ViaHeader viaHeader = layer.getHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);

      viaHeader.setRPort();

      viaHeaders.add(viaHeader);

      //from

      SipURI fromSipURI = layer.getAddressFactory().createSipURI(device.getDeviceId(),config.getSipIp()+":"+config.getSipPort());

      SipURI fromSipURI = layer.getAddressFactory().createSipURI(sipConfig.getSipId(),sipConfig.getSipDomain());

      Address fromAddress = layer.getAddressFactory().createAddress(fromSipURI);

      FromHeader fromHeader = layer.getHeaderFactory().createFromHeader(fromAddress, fromTag); //必须要有标记，否则无法创建会话，无法回应ack

      //to

      SipURI toSipURI = layer.getAddressFactory().createSipURI(device.getDeviceId(),host.getAddress()); 
      SipURI toSipURI = layer.getAddressFactory().createSipURI(channelId,sipConfig.getSipDomain()); 
      Address toAddress = layer.getAddressFactory().createAddress(toSipURI);

      ToHeader toHeader = layer.getHeaderFactory().createToHeader(toAddress,null);



@@ -101,9 +102,57 @@
      

      //Forwards

      MaxForwardsHeader maxForwards = layer.getHeaderFactory().createMaxForwardsHeader(70);

		
      //ceq

      CSeqHeader cSeqHeader = layer.getHeaderFactory().createCSeqHeader(1L, Request.INVITE);

      request = layer.getMessageFactory().createRequest(requestLine, Request.INVITE, callIdHeader, cSeqHeader,fromHeader, toHeader, viaHeaders, maxForwards);

		
      Address concatAddress = layer.getAddressFactory().createAddress(layer.getAddressFactory().createSipURI(sipConfig.getSipId(), sipConfig.getSipIp()+":"+sipConfig.getSipPort()));

      request.addHeader(layer.getHeaderFactory().createContactHeader(concatAddress));

		
      ContentTypeHeader contentTypeHeader = layer.getHeaderFactory().createContentTypeHeader("Application", "SDP");

      request.setContent(content, contentTypeHeader);

      return request;

   }

	
   public Request createPlaybackInviteRequest(Device device, String channelId, String content, String viaTag, String fromTag, String toTag) throws ParseException, InvalidArgumentException {

      Request request = null;

      Host host = device.getHost();

      //请求行

      SipURI requestLine = layer.getAddressFactory().createSipURI(device.getDeviceId(), host.getAddress());

      //via

      ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();

      ViaHeader viaHeader = layer.getHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);

      viaHeader.setRPort();

      viaHeaders.add(viaHeader);

      //from

      SipURI fromSipURI = layer.getAddressFactory().createSipURI(sipConfig.getSipId(),sipConfig.getSipDomain());

      Address fromAddress = layer.getAddressFactory().createAddress(fromSipURI);

      FromHeader fromHeader = layer.getHeaderFactory().createFromHeader(fromAddress, fromTag); //必须要有标记，否则无法创建会话，无法回应ack

      //to

      SipURI toSipURI = layer.getAddressFactory().createSipURI(channelId,sipConfig.getSipDomain()); 
      Address toAddress = layer.getAddressFactory().createAddress(toSipURI);

      ToHeader toHeader = layer.getHeaderFactory().createToHeader(toAddress,null);



      //callid

      CallIdHeader callIdHeader = null;

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

         callIdHeader = layer.getTcpSipProvider().getNewCallId();

      }

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

         callIdHeader = layer.getUdpSipProvider().getNewCallId();

      }

		
      //Forwards

      MaxForwardsHeader maxForwards = layer.getHeaderFactory().createMaxForwardsHeader(70);

		
      //ceq

      CSeqHeader cSeqHeader = layer.getHeaderFactory().createCSeqHeader(1L, Request.INVITE);

      request = layer.getMessageFactory().createRequest(requestLine, Request.INVITE, callIdHeader, cSeqHeader,fromHeader, toHeader, viaHeaders, maxForwards);

		
      Address concatAddress = layer.getAddressFactory().createAddress(layer.getAddressFactory().createSipURI(sipConfig.getSipId(), sipConfig.getSipIp()+":"+sipConfig.getSipPort()));

      request.addHeader(layer.getHeaderFactory().createContactHeader(concatAddress));

		
      ContentTypeHeader contentTypeHeader = layer.getHeaderFactory().createContentTypeHeader("Application", "SDP");

      request.setContent(content, contentTypeHeader);

      return request;