Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

648540858

2022-03-11 45e9fc880c61e12d6415755ee2a29f79fcf81fbb

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java

@@ -233,6 +233,7 @@
    */
   private void processNotifyCatalogList(RequestEvent evt) {
      try {
         System.out.println(343434);
         FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
         String deviceId = SipUtils.getUserIdFromFromHeader(fromHeader);

@@ -308,12 +309,6 @@
               eventPublisher.catalogEventPublish(null, channel, eventElement.getText().toUpperCase());

            }

            // RequestMessage msg = new RequestMessage();
            // msg.setDeviceId(deviceId);
            // msg.setType(DeferredResultHolder.CALLBACK_CMD_CATALOG);
            // msg.setData(device);
            // deferredResultHolder.invokeResult(msg);

            if (offLineDetector.isOnline(deviceId)) {
               publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);