From 0898c63ca3de75669f88354b23eeb2798d1db471 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 16 十一月 2020 17:24:20 +0800
Subject: [PATCH] 修复停止点播后,再次调用停止无法识别
---
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 3 +--
web_src/src/components/channelList.vue | 6 ++++++
README.md | 5 +++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 75261ca..460e5c8 100644
--- a/README.md
+++ b/README.md
@@ -48,10 +48,11 @@
浣跨敤mysql浣滀负鏁版嵁搴�
# 椤圭洰閮ㄧ讲
-鍙傝��:[缂栬瘧杩愯](https://github.com/648540858/wvp-GB28181/wiki/%E7%BC%96%E8%AF%91%E8%BF%90%E8%A1%8C)
+鍙傝��:[WIKI](https://github.com/648540858/wvp-GB28181-pro/wiki)
# gitee鍚屾浠撳簱
-https://gitee.com/18010473990/wvp-GB28181.git
+https://gitee.com/18010473990/wvp-GB28181.git
+
# 浣跨敤甯姪
QQ缇�: 901799015
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 c9b2d34..a01748e 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
@@ -61,7 +61,6 @@
storager.stopPlay(streamInfo);
streamInfo = cmder.playStreamCmd(device, channelId);
}
-
}
String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
// 绛夊緟鎺ㄦ祦, TODO 榛樿瓒呮椂30s
@@ -135,7 +134,7 @@
cmder.streamByeCmd(ssrc);
StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
if (streamInfo == null)
- return new ResponseEntity<String>(HttpStatus.PAYMENT_REQUIRED);
+ return new ResponseEntity<String>("ssrc not found", HttpStatus.OK);
storager.stopPlay(streamInfo);
if (logger.isDebugEnabled()) {
logger.debug(String.format("璁惧棰勮鍋滄API璋冪敤锛宻src锛�%s", ssrc));
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index b539e8c..b3872ee 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -234,6 +234,12 @@
}).then(function (res) {
console.log(JSON.stringify(res));
that.initData();
+ }).catch(function (error) {
+ if (error.response.status == 402) { // 宸茬粡鍋滄杩�
+ that.initData();
+ }else {
+ console.log(e)
+ }
});
},
--
Gitblit v1.8.0