Commit 98d12ecd6bdc49e6bed86eda4f55ab75e940ca36
Committed by
GitHub
GitHub
Merge pull request #388 from AbnerSC/wvp-28181-2.0
修复关闭按需拉流无效的问题，和几个小问题
Showing
4 changed files
with
5 additions
and
10 deletions
pom.xml
| ... | ... | @@ -169,13 +169,6 @@ |
| 169 | 169 | <version>1.2.73</version> |
| 170 | 170 | </dependency> |
| 171 | 171 | |
| 172 | - <!--Guava是一种基于开源的Java库--> | |
| 173 | - <dependency> | |
| 174 | - <groupId>com.google.guava</groupId> | |
| 175 | - <artifactId>guava</artifactId> | |
| 176 | - <version>30.0-jre</version> | |
| 177 | - </dependency> | |
| 178 | - | |
| 179 | 172 | <!-- okhttp --> |
| 180 | 173 | <dependency> |
| 181 | 174 | <groupId>com.squareup.okhttp3</groupId> |
| ... | ... | @@ -279,6 +272,9 @@ |
| 279 | 272 | <plugin> |
| 280 | 273 | <groupId>pl.project13.maven</groupId> |
| 281 | 274 | <artifactId>git-commit-id-plugin</artifactId> |
| 275 | + <configuration> | |
| 276 | + <offline>true</offline> | |
| 277 | + </configuration> | |
| 282 | 278 | </plugin> |
| 283 | 279 | |
| 284 | 280 | <plugin> | ... | ... |
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
| ... | ... | @@ -459,7 +459,7 @@ public class ZLMHttpHookListener { |
| 459 | 459 | } |
| 460 | 460 | } |
| 461 | 461 | MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId); |
| 462 | - if (mediaServerItem != null && "-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())) { | |
| 462 | + if (mediaServerItem != null && mediaServerItem.getStreamNoneReaderDelayMS() == -1) { | |
| 463 | 463 | ret.put("close", false); |
| 464 | 464 | } |
| 465 | 465 | return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); | ... | ... |
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
| ... | ... | @@ -512,7 +512,7 @@ public class MediaServerServiceImpl implements IMediaServerService { |
| 512 | 512 | param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex)); |
| 513 | 513 | param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrex)); |
| 514 | 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 | 517 | // 置0关闭此特性(推流断开会导致立即断开播放器) |
| 518 | 518 | // 此参数不应大于播放器超时时间 | ... | ... |
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java