From d9b8699e9978c6f9d74c5e87ac663e4b9476c1cf Mon Sep 17 00:00:00 2001
From: xc <double72cheng@gmail.com>
Date: Sun, 25 Apr 2021 16:56:30 +0800
Subject: [PATCH] 历史监控 插件化
---
src/main/resources/public/monitor/history.html | 68 ++++++++++++++++++++++-----------
src/main/resources/public/css/history/historyStyle.css | 19 +++++++++
src/main/resources/public/monitor/live.html | 18 +-------
3 files changed, 67 insertions(+), 38 deletions(-)
diff --git a/src/main/resources/public/css/history/historyStyle.css b/src/main/resources/public/css/history/historyStyle.css
new file mode 100644
index 0000000..19d2968
--- /dev/null
+++ b/src/main/resources/public/css/history/historyStyle.css
@@ -0,0 +1,19 @@
+/*#jessibucaContainerHistory{
+ position: absolute;
+ left:50%;
+ top:50%;
+ transform: translate(-60%, -80%);
+}*/
+
+.player-wrapper {
+ width: 900px;
+ height: 500px;
+ /*overflow-y: auto;*/
+ margin: 80px auto -100px auto ;
+ text-align: center;
+}
+
+#container{
+ background-color: #0D0E1B;
+ top:50%;
+}
diff --git a/src/main/resources/public/monitor/history.html b/src/main/resources/public/monitor/history.html
index 9f4a712..d62f76a 100755
--- a/src/main/resources/public/monitor/history.html
+++ b/src/main/resources/public/monitor/history.html
@@ -6,31 +6,19 @@
<title>Jessibuca【回放】</title>
<meta charset="utf-8"/>
<link rel="stylesheet" href="../css/progressTime.css">
+ <link rel="stylesheet" href="../css/history/historyStyle.css">
- <style>
- .player-wrapper {
- width: 900px;
- height: 500px;
- /*overflow-y: auto;*/
- margin: 0 auto;
- text-align: center;
- }
-
- /* .player-wrapper canvas {
- width: 100%;
- height: 100%;
- }*/
-
- </style>
</head>
<body>
-<!-- 播放器 -->
-<div class="player-wrapper" id="container" style="background-color: #0D0E1B;"></div>
-<!-- 时间轴 -->
-<div id="progressTime"></div>
+<div id="jessibucaContainerHistory">
+ <!-- 播放器 -->
+ <div class="player-wrapper" id="container"></div>
+ <!-- 时间轴 -->
+ <div id="progressTime"></div>
+</div>
<script src="../js/renderer.js"></script>
@@ -92,12 +80,10 @@
});
-
function queryParam(name, url) {
var search = window.location.search;
var qArr = '';
var key = {};
-
if (url) {
qArr = url.split("?")[1].split("&")
@@ -107,13 +93,11 @@
}
qArr = search.substr(1).split("&")
}
-
for (var i = 0; i < qArr.length; i++) {
var firstPos = qArr[i].indexOf('=');
key[qArr[i].slice(0, firstPos)] = qArr[i].slice(firstPos + 1)
}
-
if (name) {
return key[name]
} else {
@@ -125,6 +109,44 @@
}
}
+ function play_video(video_url) {
+ window.rtsp = video_url;
+ window.streamPath = "";
+ $.ajax({
+ type: "get",
+ url: "../../webapi/media/historical?param=" + video_url+"&startTime="+currentTimer,
+ timeout: 5000,
+ async: false,
+ success: function (result) {
+ //$("#iframeSon").attr("src", "../../data/video/public/test.html?url=" + result.jessica);
+ var container = document.getElementById("playerContainer");
+ jessibuca = new Jessibuca({
+ container, decoder: "../../data/video/public/ff.js", videoBuffer: 1,
+ isResize: false
+ });
+
+ jessibuca.onLoad = function () {
+ this.play(result.jessica);
+ }
+ $("#close_video").attr("onclick", "close_videoDiv(\"" + result.streamPath + "\")");
+ window.streamPath = result.streamPath;
+ }
+ });
+ }
+
+ function close_video(streamPath) {
+ jessibuca.destroy();
+ if (streamPath) {
+ $.ajax({
+ type: "get",
+ url: "../../webapi/media/stop?param=" + streamPath,
+ async: false,
+ success: function (result) {
+ }
+ });
+ }
+ }
+
</script>
</body>
diff --git a/src/main/resources/public/monitor/live.html b/src/main/resources/public/monitor/live.html
index 71237a4..d36f3e1 100755
--- a/src/main/resources/public/monitor/live.html
+++ b/src/main/resources/public/monitor/live.html
@@ -100,7 +100,7 @@
window.streamPath = "";
$.ajax({
type: "get",
- url: "../../webapi/equipment/getPlayUrl?url=" + video_url,
+ url: "../../webapi/media/live?param=" + video_url,
timeout: 5000,
async: false,
success: function (result) {
@@ -126,22 +126,10 @@
jessibuca.destroy();
if (streamPath) {
$.ajax({
- type: "delete",
- url: "../../webapi/equipment/deleteStream?streamPath=" + streamPath,
+ type: "get",
+ url: "../../webapi/media/stop?param=" + streamPath,
async: false,
success: function (result) {
- layer_flag = 'open';
- $('.aside-right').css('left', '81%');
- $('.aside-right').css('transition', 'left 2s');
- $('.aside-left').css('left', '1%');
- $('.aside-left').css('transition', 'left 2s');
-
- $('#switch_CloseOpen').text("隐藏图层");
- setTimeout(function () {
- $(".main .main-center .main-center-right").css('display', 'flex');
- $(".main .main-center .main-center-left").css('display', 'flex');
- $(".main .main-center .main-base-container").css("display", "none");
- }, 900);
}
});
}
--
Gitblit v1.9.1