From 03ec48e32c9122e1ab0c69ceb6fc56461c697c80 Mon Sep 17 00:00:00 2001 From: lawrencehj <1934378145@qq.com> Date: 星期日, 14 三月 2021 21:33:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java index ebd17eb..b0d136e 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java @@ -1,6 +1,5 @@ package com.genersoft.iot.vmp.vmanager.play; -import com.alibaba.fastjson.JSON; import com.genersoft.iot.vmp.common.StreamInfo; import com.genersoft.iot.vmp.conf.MediaServerConfig; import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; @@ -22,12 +21,10 @@ import org.springframework.web.bind.annotation.RestController; import com.alibaba.fastjson.JSONObject; -import com.genersoft.iot.vmp.gb28181.bean.Device; import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; import com.genersoft.iot.vmp.storager.IVideoManagerStorager; import org.springframework.web.context.request.async.DeferredResult; -import javax.sip.message.Response; import java.util.UUID; @CrossOrigin -- Gitblit v1.8.0