From 8874c90db2c238fa4c55df491675fe7fec9d93b2 Mon Sep 17 00:00:00 2001
From: fine <54142345+criver31@users.noreply.github.com>
Date: 星期二, 09 一月 2024 11:45:30 +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/bean/PlayResult.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/bean/PlayResult.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/bean/PlayResult.java
old mode 100644
new mode 100755
index 42a6e8b..58d4ce2
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/bean/PlayResult.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/bean/PlayResult.java
@@ -1,21 +1,23 @@
package com.genersoft.iot.vmp.vmanager.gb28181.play.bean;
+import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import org.springframework.http.ResponseEntity;
import org.springframework.web.context.request.async.DeferredResult;
public class PlayResult {
- private DeferredResult<ResponseEntity<String>> result;
+ private DeferredResult<WVPResult<StreamInfo>> result;
private String uuid;
private Device device;
- public DeferredResult<ResponseEntity<String>> getResult() {
+ public DeferredResult<WVPResult<StreamInfo>> getResult() {
return result;
}
- public void setResult(DeferredResult<ResponseEntity<String>> result) {
+ public void setResult(DeferredResult<WVPResult<StreamInfo>> result) {
this.result = result;
}
--
Gitblit v1.8.0