合并主线

648540858

2023-07-04 9889f908c80cfc69bb3d240ce1705fcddfb5e9fb

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

@@ -66,7 +66,7 @@
   private IDeviceService deviceService;

   @Autowired
   private ZLMServerFactory ZLMServerFactory;
   private ZLMServerFactory zlmServerFactory;

   @Autowired
   private ZlmHttpHookSubscribe hookSubscribe;
@@ -168,19 +168,19 @@
      JSONObject startSendRtpStreamResult = null;
      if (sendRtpItem.getLocalPort() != 0) {
         if (sendRtpItem.isTcpActive()) {
            startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, param);
            startSendRtpStreamResult = zlmServerFactory.startSendRtpPassive(mediaInfo, param);
         }else {
            param.put("dst_url", sendRtpItem.getIp());
            param.put("dst_port", sendRtpItem.getPort());
            startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
            startSendRtpStreamResult = zlmServerFactory.startSendRtpStream(mediaInfo, param);
         }
      }else {
         if (sendRtpItem.isTcpActive()) {
            startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, param);
            startSendRtpStreamResult = zlmServerFactory.startSendRtpPassive(mediaInfo, param);
         }else {
            param.put("dst_url", sendRtpItem.getIp());
            param.put("dst_port", sendRtpItem.getPort());
            startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
            startSendRtpStreamResult = zlmServerFactory.startSendRtpStream(mediaInfo, param);
         }
      }
      return startSendRtpStreamResult;