Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #232 from chenparty/wvp-28181-2.0 

fix bug
pull/243/head
648540858 2021-11-17 16:24:31 +08:00 committed by GitHub
parent 9561e952a3 d5739409e5
commit 2f108a46d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
View File

@ -108,10 +108,10 @@ public class DeviceControl {
msg.setData("Timeout. Device did not response to this command.");
resultHolder.invokeAllResult(msg);
});
resultHolder.put(key, uuid, result);
if (resultHolder.exist(key, null)){
return result;
}
resultHolder.put(key, uuid, result);
cmder.recordCmd(device, channelId, recordCmdStr, event -> {
RequestMessage msg = new RequestMessage();
msg.setId(uuid);

2
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
View File

@ -88,10 +88,10 @@ public class DownloadController {
msg.setData("Timeout");
resultHolder.invokeAllResult(msg);
});
resultHolder.put(key, uuid, result);
if(resultHolder.exist(key, null)) {
return result;
}
resultHolder.put(key, uuid, result);
Device device = storager.queryVideoDevice(deviceId);
StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId);
if (streamInfo != null) {