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

panlinlin

2021-01-15 cf8a22f50b81fa30abaa518bdce660cd65deabea

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

@@ -2,6 +2,7 @@


import java.text.ParseException;

import java.util.ArrayList;

import java.util.UUID;



import javax.sip.InvalidArgumentException;

import javax.sip.PeerUnavailableException;

@@ -9,15 +10,11 @@
import javax.sip.SipProvider;

import javax.sip.address.Address;

import javax.sip.address.SipURI;

import javax.sip.header.CSeqHeader;

import javax.sip.header.CallIdHeader;

import javax.sip.header.ContentTypeHeader;

import javax.sip.header.FromHeader;

import javax.sip.header.MaxForwardsHeader;

import javax.sip.header.ToHeader;

import javax.sip.header.ViaHeader;

import javax.sip.header.*;

import javax.sip.message.Request;

import javax.validation.constraints.NotNull;



import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Qualifier;

import org.springframework.stereotype.Component;

@@ -25,6 +22,7 @@
import com.genersoft.iot.vmp.conf.SipConfig;

import com.genersoft.iot.vmp.gb28181.bean.Device;

import com.genersoft.iot.vmp.gb28181.bean.Host;

import org.springframework.util.DigestUtils;



/**

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

@@ -50,9 +48,8 @@
   

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

      Request request = null;

      Host host = device.getHost();

      // sipuri

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

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

      // via

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

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(),

@@ -78,22 +75,21 @@


      request = sipFactory.createMessageFactory().createRequest(requestURI, Request.MESSAGE, callIdHeader, cSeqHeader, fromHeader,

            toHeader, viaHeaders, maxForwards);

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

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

      request.setContent(content, contentTypeHeader);

      return request;

   }

   

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

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

      Request request = null;

      Host host = device.getHost();

      //请求行

      SipURI requestLine = sipFactory.createAddressFactory().createSipURI(channelId, host.getAddress());

      SipURI requestLine = sipFactory.createAddressFactory().createSipURI(channelId, device.getHostAddress());

      //via

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

      // ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(device.getHost().getIp(), device.getHost().getPort(), device.getTransport(), viaTag);

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(device.getIp(), device.getPort(), device.getTransport(), viaTag);

      viaHeader.setRPort();

      viaHeaders.add(viaHeader);



      //from

      SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(),sipConfig.getSipDomain());

      Address fromAddress = sipFactory.createAddressFactory().createAddress(fromSipURI);

@@ -122,21 +118,21 @@
      Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(), sipConfig.getSipIp()+":"+sipConfig.getSipPort()));

      // Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(), device.getHost().getIp()+":"+device.getHost().getPort()));

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

		
      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "SDP");

      // Subject

      SubjectHeader subjectHeader = sipFactory.createHeaderFactory().createSubjectHeader(String.format("%s:%s,%s:%s", channelId, ssrc, sipConfig.getSipId(), 0));

      request.addHeader(subjectHeader);

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().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, PeerUnavailableException {

      Request request = null;

      Host host = device.getHost();

      //请求行

      SipURI requestLine = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), host.getAddress());

      //via

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

      // via

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

      // ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(device.getHost().getIp(), device.getHost().getPort(), device.getTransport(), viaTag);

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(device.getIp(), device.getPort(), device.getTransport(), viaTag);

      viaHeader.setRPort();

      viaHeaders.add(viaHeader);

      //from

@@ -168,7 +164,7 @@
      // Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(), device.getHost().getIp()+":"+device.getHost().getPort()));

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

      

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "SDP");

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "SDP");

      request.setContent(content, contentTypeHeader);

      return request;

   }