From 691313b77861eeaeee2c67002b9cee23fbf1f942 Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期三, 16 三月 2022 08:54:31 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index 16e8eec..930bb33 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -109,7 +109,6 @@
// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
String key = DeferredResultHolder.CALLBACK_CMD_STOP + deviceId + channelId;
resultHolder.put(key, uuid, result);
- Device device = storager.queryVideoDevice(deviceId);
StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
if (streamInfo == null) {
RequestMessage msg = new RequestMessage();
@@ -120,15 +119,14 @@
storager.stopPlay(deviceId, channelId);
return result;
}
- cmder.streamByeCmd(deviceId, channelId, streamInfo.getStream(), null, (event) -> {
+ cmder.streamByeCmd(deviceId, channelId, streamInfo.getStream(), null, eventResult -> {
redisCatchStorage.stopPlay(streamInfo);
storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
- RequestMessage msg = new RequestMessage();
- msg.setId(uuid);
- msg.setKey(key);
- //Response response = event.getResponse();
- msg.setData(String.format("success"));
- resultHolder.invokeAllResult(msg);
+ RequestMessage msgForSuccess = new RequestMessage();
+ msgForSuccess.setId(uuid);
+ msgForSuccess.setKey(key);
+ msgForSuccess.setData(String.format("success"));
+ resultHolder.invokeAllResult(msgForSuccess);
});
if (deviceId != null || channelId != null) {
--
Gitblit v1.8.0