From 3c55b50cfdde236d0dfb86c539b7f84b7356424e Mon Sep 17 00:00:00 2001
From: xc <double72cheng@gmail.com>
Date: Thu, 22 Apr 2021 15:24:45 +0800
Subject: [PATCH] 修复在全屏浏览模式下 点击全屏监控无法最大化bug
---
src/main/resources/public/monitor/history.html | 164 ++++++++++++++++--------------------------------------
1 files changed, 49 insertions(+), 115 deletions(-)
diff --git a/src/main/resources/public/monitor/history.html b/src/main/resources/public/monitor/history.html
index 00bb617..ebf50ab 100755
--- a/src/main/resources/public/monitor/history.html
+++ b/src/main/resources/public/monitor/history.html
@@ -7,6 +7,7 @@
<meta charset="utf-8"/>
<link rel="stylesheet" href="../css/progressTime.css">
+
<style>
.player-wrapper {
width: 900px;
@@ -26,86 +27,71 @@
<body>
-<!-- jessiebuca播放器 -->
-<div class="player-wrapper" id="container" style="background-color: #0D0E1B;width:900px;height:500px">
-</div>
+<!-- 播放器 -->
+<div class="player-wrapper" id="container" style="background-color: #0D0E1B;"></div>
+<!-- 时间轴 -->
<div id="progressTime"></div>
-<script src="../js/ajax.js"></script>
<script src="../js/renderer.js"></script>
-<script type="text/javascript" src="../js/jquery.min.js"></script>
-<script type="text/javascript" src="../js/jquery.progressTime.js"></script>
+<script src="../js/jquery.min.js"></script>
+<script src="../js/jquery.progressTime.js"></script>
-<script>
+ <script>
var hourTimestamp = 3600 * 1000;
var dayTimestamp = hourTimestamp * 24;
var currentTimer;
-
- window.onkeydown = function () {
- h5lc.fullscreen = false
- }
- var isLive = true;
- var $play = document.getElementById('play');
- var $stop = document.getElementById('stop');
var container = document.getElementById("container");
+ let decoder = queryParam('decoder') || 'ff';
- var isPlaying = false;
+ var h5lc = new Jessibuca({container, decoder: "../js/timeline/ff.js", videoBuffer: 0});
- var h5lc = new Jessibuca({container, decoder: "../js/ff/ff.js", videoBuffer: 0});
- h5lc.onLoad = function () {
- //this.play("wss://pulls.1234326.cn/live/L01.flv")
- //this.play("ws://localhost:8080/live/test.flv")
- //this.play("ws://" + source + ":8080/live/" + stream)
- //this.play("ws://pull3.afb1188.com/live/" + stream + ".flv")
- //this.play("ws://pull2.afb1188.com/live/" + stream + ".flv")
- }
- h5lc.onPlay = function () {
- isPlaying = true;
- $play.style.display = 'none';
- $stop.style.display = 'inline';
- }
- $play.addEventListener('click', function () {
- if (isPlaying) {
- return;
+ $("#progressTime").ProgressTime({
+ container: "progressTime",
+ startTime: new Date(formatDate(new Date(new Date().getTime() - dayTimestamp * 3), "YYYY/MM/DD 00:00:00")),
+ endTime: new Date(formatDate(new Date(), "YYYY/MM/DD 00:00:00")),
+ currentTime: new Date(formatDate(new Date(new Date().getTime() - dayTimestamp * 2), "YYYY/MM/DD 12:00:00")),
+ interval: 300,
+ delay: 2000,
+ isNow: false, // 是否显示右侧回到当前时间
+ toPlay: false, // 渲染是否完成
+ animateFinish: false, // 动画是否完成
+ callback: function (config) {
+ console.log(config);
+ currentTimer = config.time;
+ },
+ animateCallback: function (config) {
+
+ // 假如动画完成之后请求数据需要两秒
+ var timer = setTimeout(function () {
+ progressTime.options.toPlay = false; // 两秒之后再继续走播放条
+ clearTimeout(timer);
+ }, 0);
}
- isPlaying = true;
- /* $.get("http://127.0.0.1:8088/monica/test/video", function (data) {
- h5lc.play(data)
- }
- );*/
- play();
- $play.style.display = 'none';
- $stop.style.display = 'inline';
- }, false);
-
- $stop.addEventListener('click', function () {
- if (!isPlaying) {
- return;
- }
- isPlaying = false;
- //stop();
-
- $play.style.display = 'inline';
- $stop.style.display = 'none';
- }, false);
+ });
+ $(".progressTime-left-b-start").on("click", function () {
+ h5lc.play("ws://172.16.30.113:8082/live/ff80808178af424e0178af44e677000343616d657261.flv")
+ /* if (currentTimer) {
+ $(this).addClass("stop");
+ $.ajax({
+ url: "" + "?param=",
+ async: false,//同步方式发送请求，true为异步发送
+ type: "GET",
+ data: {},
+ success: function (result) {
+ alert(result);
+ }
+ });
+ }*/
+ });
+ $(".progressTime-left-b-start stop").on("click", function () {
+ $(this).removeClass("stop");
+ });
- function play(firstResponseIp) {
- h5lc.play("ws://172.16.30.113:8082/live/video3.flv")
- }
-
- function stop() {
- $.get("http://127.0.0.1:8088/monica/video/stop?param=live/test", function () {
- alert("视频流已关闭");
- h5lc.close()
- }
- );
- h5lc.close()
- }
function queryParam(name, url) {
var search = window.location.search;
@@ -138,58 +124,6 @@
}
}
}
-
- function playerShow() {
- $(".player .control").css("display", "block")
- }
-
- function playerHidden() {
- $(".player .control").css("display", "none")
- }
-
-
- $("#progressTime").ProgressTime({
- container: "progressTime",
- startTime: new Date(formatDate(new Date(new Date().getTime() - dayTimestamp * 3), "YYYY/MM/DD 00:00:00")),
- endTime: new Date(formatDate(new Date(), "YYYY/MM/DD 00:00:00")),
- currentTime: new Date(formatDate(new Date(new Date().getTime() - dayTimestamp * 2), "YYYY/MM/DD 12:00:00")),
- interval: 300,
- delay: 2000,
- isNow: false, // 是否显示右侧回到当前时间
- toPlay: false, // 渲染是否完成
- animateFinish: false, // 动画是否完成
- callback: function (config) {
- console.log(config);
- currentTimer = config.time;
- },
- animateCallback: function (config) {
-
- // 假如动画完成之后请求数据需要两秒
- var timer = setTimeout(function () {
- progressTime.options.toPlay = true; // 两秒之后再继续走播放条
- clearTimeout(timer);
- }, 0);
- }
- });
- $(".progressTime-left-b-start").on("click", function () {
- if (currentTimer) {
- $(this).addClass("stop");
-
- $.ajax({
- url: "" + "?param=",
- async: false,//同步方式发送请求，true为异步发送
- type: "GET",
- data: {},
- success: function (result) {
- alert(result);
- }
- });
-
- }
- });
- $(".progressTime-left-b-start stop").on("click", function () {
- $(this).removeClass("stop");
- });
</script>
--
Gitblit v1.9.1