guzijian / wvp-GB28181-pro · Commits

Commit bef7fb2440093bbf92a2d192ce1f1c4db219b07c

Authored by dengming
1 parent ec97c6a7

修复关闭按需拉流无效的问题

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
  View file @bef7fb2
@@ -459,7 +459,7 @@ public class ZLMHttpHookListener { @@ -459,7 +459,7 @@ public class ZLMHttpHookListener {
459 } 459 }
460 } 460 }
461 MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId); 461 MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
462 - if (mediaServerItem != null && "-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())) { 462 + if (mediaServerItem != null && mediaServerItem.getStreamNoneReaderDelayMS() == -1) {
463 ret.put("close", false); 463 ret.put("close", false);
464 } 464 }
465 return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); 465 return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
  View file @bef7fb2
@@ -512,7 +512,7 @@ public class MediaServerServiceImpl implements IMediaServerService { @@ -512,7 +512,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
512 param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex)); 512 param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex));
513 param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrex)); 513 param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrex));
514 param.put("hook.timeoutSec","20"); 514 param.put("hook.timeoutSec","20");
515 - param.put("general.streamNoneReaderDelayMS","-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())?"3600000":mediaServerItem.getStreamNoneReaderDelayMS() ); 515 + param.put("general.streamNoneReaderDelayMS",mediaServerItem.getStreamNoneReaderDelayMS()==-1?"3600000":mediaServerItem.getStreamNoneReaderDelayMS() );
516 516
517 JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param); 517 JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param);
518 518