实现国标录像级联播放，优化点播流程，加快点播速度

648540858

2022-02-27 e94b99d11c46246532edc93cd25cbf8c0b88f03f

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

@@ -346,8 +346,11 @@
         subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,

               (MediaServerItem mediaServerItemInUse, JSONObject json)->{

            if (userSetup.isWaitTrack() && json.getJSONArray("tracks") == null) return;

            event.response(mediaServerItemInUse, json);

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

            if (event != null) {

               event.response(mediaServerItemInUse, json);

            }



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

         });

         //

         StringBuffer content = new StringBuffer(200);

@@ -452,9 +455,11 @@
         logger.debug("录像回放添加订阅，订阅内容：" + subscribeKey.toString());

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

               (MediaServerItem mediaServerItemInUse, JSONObject json)->{

                  System.out.println(344444);

            if (userSetup.isWaitTrack() && json.getJSONArray("tracks") == null) return;

            event.response(mediaServerItemInUse, json);

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

            if (event != null) {

               event.response(mediaServerItemInUse, json);

            }

         });



         StringBuffer content = new StringBuffer(200);

@@ -465,8 +470,6 @@
           content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");

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



@@ -1195,9 +1198,13 @@
    * @param endTime 结束时间,格式要求：yyyy-MM-dd HH:mm:ss

    */  

   @Override

   public boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime, int sn, SipSubscribe.Event errorEvent) {





   public boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime, int sn, Integer secrecy, String type, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {

      if (secrecy == null) {

         secrecy = 0;

      }

      if (type == null) {

         type = "all";

      }

      try {

         StringBuffer recordInfoXml = new StringBuffer(200);

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

@@ -1205,11 +1212,19 @@
         recordInfoXml.append("<CmdType>RecordInfo</CmdType>\r\n");

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

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

         recordInfoXml.append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(startTime) + "</StartTime>\r\n");

         recordInfoXml.append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(endTime) + "</EndTime>\r\n");

         recordInfoXml.append("<Secrecy>0</Secrecy>\r\n");

         // 大华NVR要求必须增加一个值为all的文本元素节点Type

         recordInfoXml.append("<Type>all</Type>\r\n");

         if (startTime != null) {

            recordInfoXml.append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(startTime) + "</StartTime>\r\n");

         }

         if (endTime != null) {

            recordInfoXml.append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(endTime) + "</EndTime>\r\n");

         }

         if (secrecy != null) {

            recordInfoXml.append("<Secrecy> "+ secrecy + " </Secrecy>\r\n");

         }

         if (type != null) {

            // 大华NVR要求必须增加一个值为all的文本元素节点Type

            recordInfoXml.append("<Type>" + type+"</Type>\r\n");

         }

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

         

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

@@ -1220,7 +1235,7 @@
         Request request = headerProvider.createMessageRequest(device, recordInfoXml.toString(),

               "z9hG4bK-ViaRecordInfo-" + tm, "fromRec" + tm, null, callIdHeader);



         transmitRequest(device, request, errorEvent);

         transmitRequest(device, request, errorEvent, okEvent);

      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

         return false;