异步通道刷新，优化ui效果

648540858

2022-04-12 3955e6ed53d450f8faf488d4b74ba0c0c83c5aaa

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

@@ -4,7 +4,7 @@
import com.genersoft.iot.vmp.common.StreamInfo;

import com.genersoft.iot.vmp.conf.DynamicTask;

import com.genersoft.iot.vmp.conf.SipConfig;

import com.genersoft.iot.vmp.conf.UserSetup;

import com.genersoft.iot.vmp.conf.UserSetting;

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

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

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

@@ -20,7 +20,7 @@
import com.genersoft.iot.vmp.service.IMediaServerService;

import com.genersoft.iot.vmp.service.bean.SSRCInfo;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import com.genersoft.iot.vmp.storager.IVideoManagerStorager;

import com.genersoft.iot.vmp.storager.IVideoManagerStorage;

import gov.nist.javax.sip.SipProviderImpl;

import gov.nist.javax.sip.SipStackImpl;

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

@@ -36,6 +36,8 @@
import javax.sip.*;

import javax.sip.address.SipURI;

import javax.sip.header.CallIdHeader;

import javax.sip.header.ContentTypeHeader;

import javax.sip.header.ExpiresHeader;

import javax.sip.header.ViaHeader;

import javax.sip.message.Request;

import java.lang.reflect.Field;

@@ -57,6 +59,9 @@
   private SipConfig sipConfig;



   @Autowired

   private SipFactory sipFactory;



   @Autowired

   @Qualifier(value="tcpSipProvider")

   private SipProviderImpl tcpSipProvider;



@@ -71,13 +76,13 @@
   private VideoStreamSessionManager streamSession;



   @Autowired

   private IVideoManagerStorager storager;

   private IVideoManagerStorage storager;



   @Autowired

   private IRedisCatchStorage redisCatchStorage;



   @Autowired

   private UserSetup userSetup;

   private UserSetting userSetting;



   @Autowired

   private ZLMHttpHookSubscribe subscribe;

@@ -229,13 +234,15 @@
      try {

         String cmdStr= cmdString(leftRight, upDown, inOut, moveSpeed, zoomSpeed);

         StringBuffer ptzXml = new StringBuffer(200);

         ptzXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         ptzXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         ptzXml.append("<Control>\r\n");

         ptzXml.append("<CmdType>DeviceControl</CmdType>\r\n");

         ptzXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         ptzXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

         ptzXml.append("<PTZCmd>" + cmdStr + "</PTZCmd>\r\n");

         ptzXml.append("<Info>\r\n");

         ptzXml.append("<ControlPriority>5</ControlPriority>\r\n");

         ptzXml.append("</Info>\r\n");

         ptzXml.append("</Control>\r\n");

         

@@ -270,13 +277,15 @@
         String cmdStr= frontEndCmdString(cmdCode, parameter1, parameter2, combineCode2);

         logger.debug("控制字符串：" + cmdStr);

         StringBuffer ptzXml = new StringBuffer(200);

         ptzXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         ptzXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         ptzXml.append("<Control>\r\n");

         ptzXml.append("<CmdType>DeviceControl</CmdType>\r\n");

         ptzXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         ptzXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

         ptzXml.append("<PTZCmd>" + cmdStr + "</PTZCmd>\r\n");

         ptzXml.append("<Info>\r\n");

         ptzXml.append("<ControlPriority>5</ControlPriority>\r\n");

         ptzXml.append("</Info>\r\n");

         ptzXml.append("</Control>\r\n");

         

@@ -301,16 +310,18 @@
    * @param cmdString      前端控制指令串

    */

   @Override

   public boolean fronEndCmd(Device device, String channelId, String cmdString) {

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

      try {

         StringBuffer ptzXml = new StringBuffer(200);

         ptzXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         ptzXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         ptzXml.append("<Control>\r\n");

         ptzXml.append("<CmdType>DeviceControl</CmdType>\r\n");

         ptzXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         ptzXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

         ptzXml.append("<PTZCmd>" + cmdString + "</PTZCmd>\r\n");

         ptzXml.append("<Info>\r\n");

         ptzXml.append("<ControlPriority>5</ControlPriority>\r\n");

         ptzXml.append("</Info>\r\n");

         ptzXml.append("</Control>\r\n");

         

@@ -320,7 +331,7 @@
               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);

         transmitRequest(device, request);

         transmitRequest(device, request, errorEvent, okEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

@@ -365,7 +376,7 @@
         content.append("c=IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");

         content.append("t=0 0\r\n");



         if (userSetup.isSeniorSdp()) {

         if (userSetting.isSeniorSdp()) {

            if("TCP-PASSIVE".equals(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)) {

@@ -428,7 +439,7 @@
            errorEvent.response(e);

         }), e ->{

            // 这里为例避免一个通道的点播只有一个callID这个参数使用一个固定值

            streamSession.put(device.getDeviceId(), channelId ,"play", streamId, ssrcInfo.getSsrc(), mediaServerItem.getId(), ((ResponseEvent)e.event).getClientTransaction());

            streamSession.put(device.getDeviceId(), channelId ,"play", streamId, ssrcInfo.getSsrc(), mediaServerItem.getId(), ((ResponseEvent)e.event).getClientTransaction(), VideoStreamSessionManager.SessionType.play);

            streamSession.put(device.getDeviceId(), channelId ,"play", e.dialog);

         });



@@ -465,7 +476,7 @@


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



         if (userSetup.isSeniorSdp()) {

         if (userSetting.isSeniorSdp()) {

            if("TCP-PASSIVE".equals(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)) {

@@ -537,7 +548,7 @@


           transmitRequest(device, request, errorEvent, okEvent -> {

            ResponseEvent responseEvent = (ResponseEvent) okEvent.event;

              streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), responseEvent.getClientTransaction());

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

         });

         if (inviteStreamCallback != null) {

@@ -558,8 +569,9 @@
    * @param downloadSpeed 下载倍速参数

    */ 

   @Override

   public void downloadStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId, String startTime, String endTime, String downloadSpeed, InviteStreamCallback event

         , SipSubscribe.Event errorEvent) {

   public void downloadStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,

                          String startTime, String endTime, int downloadSpeed, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,

                          SipSubscribe.Event errorEvent) {

      try {

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



@@ -572,11 +584,9 @@
           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();



         if (userSetup.isSeniorSdp()) {

         if (userSetting.isSeniorSdp()) {

            if("TCP-PASSIVE".equals(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)) {

@@ -639,15 +649,20 @@
         logger.debug("录像回放添加订阅，订阅内容：" + subscribeKey.toString());

         subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,

               (MediaServerItem mediaServerItemInUse, JSONObject json)->{

                  event.call(new InviteStreamInfo(mediaServerItem, json, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));

                  hookEvent.call(new InviteStreamInfo(mediaServerItem, json, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));

                  subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey);

               });



           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "fromplybck" + tm, null, callIdHeader, ssrcInfo.getSsrc());

         if (inviteStreamCallback != null) {

            inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));

         }

           transmitRequest(device, request, errorEvent, okEvent->{

            ResponseEvent responseEvent = (ResponseEvent) okEvent.event;

            streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), responseEvent.getClientTransaction(), VideoStreamSessionManager.SessionType.download);

            streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), okEvent.dialog);

         });



           ClientTransaction transaction = transmitRequest(device, request, errorEvent);

           streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), transaction);

           streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), transaction);



      } catch ( SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

@@ -670,6 +685,7 @@
      try {

         SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(deviceId, channelId, null, stream);

         ClientTransaction transaction = streamSession.getTransactionByStream(deviceId, channelId, stream);



         if (transaction == null) {

            logger.warn("[ {} -> {}]停止视频流的时候发现事务已丢失", deviceId, channelId);

            SipSubscribe.EventResult<Object> eventResult = new SipSubscribe.EventResult<>();

@@ -685,7 +701,12 @@
            if (stream == null) return;

            dialog = streamSession.getDialogByStream(deviceId, channelId, stream);

         }



         if (ssrcTransaction != null) {

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

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

            mediaServerService.closeRTPServer(deviceId, channelId, ssrcTransaction.getStream());

            streamSession.remove(deviceId, channelId, ssrcTransaction.getStream());

         }



         if (dialog == null) {

            logger.warn("[ {} -> {}]停止视频流的时候发现对话已丢失", deviceId, channelId);

@@ -712,7 +733,7 @@
         Request byeRequest = dialog.createRequest(Request.BYE);

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

         SIPRequest request = (SIPRequest)transaction.getRequest();

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

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

         byeURI.setPort(request.getRemotePort());

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

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

@@ -730,12 +751,6 @@


         dialog.sendRequest(clientTransaction);



         if (ssrcTransaction != null) {

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

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

            mediaServerService.closeRTPServer(deviceId, channelId, ssrcTransaction.getStream());

            streamSession.remove(deviceId, channelId, ssrcTransaction.getStream());

         }

      } catch (SipException | ParseException e) {

         e.printStackTrace();

      }

@@ -762,7 +777,8 @@
   public boolean audioBroadcastCmd(Device device) {

      try {

         StringBuffer broadcastXml = new StringBuffer(200);

         broadcastXml.append("<?xml version=\"1.0\" ?>\r\n");

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

@@ -787,7 +803,8 @@
   public void audioBroadcastCmd(Device device, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer broadcastXml = new StringBuffer(200);

         broadcastXml.append("<?xml version=\"1.0\" ?>\r\n");

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

@@ -819,7 +836,8 @@
   public boolean recordCmd(Device device, String channelId, String recordCmdStr, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Control>\r\n");

         cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -854,7 +872,8 @@
   public boolean teleBootCmd(Device device) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Control>\r\n");

         cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -886,7 +905,8 @@
   public boolean guardCmd(Device device, String guardCmdStr, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Control>\r\n");

         cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -917,7 +937,8 @@
   public boolean alarmCmd(Device device, String alarmMethod, String alarmType, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Control>\r\n");

         cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -961,7 +982,8 @@
   public boolean iFrameCmd(Device device, String channelId) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Control>\r\n");

         cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -999,7 +1021,8 @@
   public boolean homePositionCmd(Device device, String channelId, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Control>\r\n");

         cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1067,7 +1090,8 @@
                              String heartBeatInterval, String heartBeatCount, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Control>\r\n");

         cmdXml.append("<CmdType>DeviceConfig</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1120,8 +1144,9 @@
   @Override

   public boolean deviceStatusQuery(Device device, SipSubscribe.Event errorEvent) {

      try {

         String charset = device.getCharset();

         StringBuffer catalogXml = new StringBuffer(200);

         catalogXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         catalogXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         catalogXml.append("<Query>\r\n");

         catalogXml.append("<CmdType>DeviceStatus</CmdType>\r\n");

         catalogXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1153,7 +1178,8 @@
   public boolean deviceInfoQuery(Device device) {

      try {

         StringBuffer catalogXml = new StringBuffer(200);

         catalogXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         String charset = device.getCharset();

         catalogXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         catalogXml.append("<Query>\r\n");

         catalogXml.append("<CmdType>DeviceInfo</CmdType>\r\n");

         catalogXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1185,7 +1211,8 @@
   public boolean catalogQuery(Device device, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer catalogXml = new StringBuffer(200);

         catalogXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         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>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1224,7 +1251,8 @@
      }

      try {

         StringBuffer recordInfoXml = new StringBuffer(200);

         recordInfoXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         String charset = device.getCharset();

         recordInfoXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         recordInfoXml.append("<Query>\r\n");

         recordInfoXml.append("<CmdType>RecordInfo</CmdType>\r\n");

         recordInfoXml.append("<SN>" + sn + "</SN>\r\n");

@@ -1277,7 +1305,8 @@
                         String startTime, String endTime, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Query>\r\n");

         cmdXml.append("<CmdType>Alarm</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1327,7 +1356,8 @@
   public boolean deviceConfigQuery(Device device, String channelId, String configType,  SipSubscribe.Event errorEvent) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Query>\r\n");

         cmdXml.append("<CmdType>ConfigDownload</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1362,7 +1392,8 @@
   public boolean presetQuery(Device device, String channelId, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Query>\r\n");

         cmdXml.append("<CmdType>PresetQuery</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1396,7 +1427,8 @@
   public boolean mobilePostitionQuery(Device device, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer mobilePostitionXml = new StringBuffer(200);

         mobilePostitionXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         String charset = device.getCharset();

         mobilePostitionXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         mobilePostitionXml.append("<Query>\r\n");

         mobilePostitionXml.append("<CmdType>MobilePosition</CmdType>\r\n");

         mobilePostitionXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1424,30 +1456,37 @@
    * 订阅、取消订阅移动位置

    * 

    * @param device   视频设备

    * @param expires   订阅超时时间

    * @param interval   上报时间间隔

    * @return         true = 命令发送成功

    */

   public boolean mobilePositionSubscribe(Device device, int expires, int interval) {

   public boolean mobilePositionSubscribe(Device device, Dialog dialog, SipSubscribe.Event okEvent ,SipSubscribe.Event errorEvent) {

      try {

         StringBuffer subscribePostitionXml = new StringBuffer(200);

         subscribePostitionXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         String charset = device.getCharset();

         subscribePostitionXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         subscribePostitionXml.append("<Query>\r\n");

         subscribePostitionXml.append("<CmdType>MobilePosition</CmdType>\r\n");

         subscribePostitionXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         subscribePostitionXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         if (expires > 0) {

            subscribePostitionXml.append("<Interval>" + String.valueOf(interval) + "</Interval>\r\n");

         if (device.getSubscribeCycleForMobilePosition() > 0) {

            subscribePostitionXml.append("<Interval>" + String.valueOf(device.getMobilePositionSubmissionInterval()) + "</Interval>\r\n");

         }

         subscribePostitionXml.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, subscribePostitionXml.toString(), "z9hG4bK-viaPos-" + tm, "fromTagPos" + tm, null, expires, "presence" ,callIdHeader); //Position;id=" + tm.substring(tm.length() - 4));

         transmitRequest(device, request);

         Request request;

         if (dialog != null) {

            logger.info("发送移动位置订阅消息时 dialog的状态为： {}", dialog.getState());

            request = dialog.createRequest(Request.SUBSCRIBE);

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

            request.setContent(subscribePostitionXml.toString(), contentTypeHeader);

            ExpiresHeader expireHeader = sipFactory.createHeaderFactory().createExpiresHeader(device.getSubscribeCycleForMobilePosition());

            request.addHeader(expireHeader);

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

         }

         transmitRequest(device, request, errorEvent, okEvent);



         return true;



@@ -1473,7 +1512,8 @@
   public boolean alarmSubscribe(Device device, int expires, String startPriority, String endPriority, String alarmMethod, String alarmType, String startTime, String endTime) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Query>\r\n");

         cmdXml.append("<CmdType>Alarm</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1515,10 +1555,11 @@
   }



   @Override

   public boolean catalogSubscribe(Device device, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {

   public boolean catalogSubscribe(Device device, Dialog dialog, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         String charset = device.getCharset();

         cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         cmdXml.append("<Query>\r\n");

         cmdXml.append("<CmdType>Catalog</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

@@ -1548,7 +1589,8 @@
   public boolean dragZoomCmd(Device device, String channelId, String cmdString) {

      try {

         StringBuffer dragXml = new StringBuffer(200);

         dragXml.append("<?xml version=\"1.0\" ?>\r\n");

         String charset = device.getCharset();

         dragXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         dragXml.append("<Control>\r\n");

         dragXml.append("<CmdType>DeviceControl</CmdType>\r\n");

         dragXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");

@@ -1620,7 +1662,7 @@
         content.append("PAUSE RTSP/1.0\r\n");

         content.append("CSeq: " + cseq + "\r\n");

         content.append("PauseTime: now\r\n");

         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);

         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());

         if (request == null) {

            return;

         }

@@ -1651,7 +1693,7 @@
         content.append("PLAY RTSP/1.0\r\n");

         content.append("CSeq: " + cseq + "\r\n");

         content.append("Range: npt=now-\r\n");

         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);

         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());

         if (request == null) return;

         logger.info(request.toString());

         ClientTransaction clientTransaction = null;

@@ -1680,7 +1722,7 @@
         content.append("CSeq: " + cseq + "\r\n");

         content.append("Range: npt=" + Math.abs(seekTime) + "-\r\n");



         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);

         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());

         if (request == null) return;

         logger.info(request.toString());

         ClientTransaction clientTransaction = null;

@@ -1708,7 +1750,7 @@
         content.append("PLAY RTSP/1.0\r\n");

         content.append("CSeq: " + cseq + "\r\n");

         content.append("Scale: " + String.format("%.1f",speed) + "\r\n");

         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);

         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());

         if (request == null) return;

         logger.info(request.toString());

         ClientTransaction clientTransaction = null;