修复在全屏浏览模式下 点击全屏监控无法最大化bug

xc

2021-04-22 3c55b50cfdde236d0dfb86c539b7f84b7356424e

修复在全屏浏览模式下 点击全屏监控无法最大化bug

 src/main/java/com/hbbh/adapter/manager/impl/MonibucaManagerImpl.java

@@ -38,7 +38,6 @@
    //StreamPath 是发布流的唯一标识
    private String streamPath="live/test";


    // =========== monica监控 ===========

    /**

 src/main/resources/public/264_aac.js

File was deleted

 src/main/resources/public/264_aac_wasm.js

File was deleted

 src/main/resources/public/264_aac_wasm.wasm

Binary files differ

 src/main/resources/public/264_mp3.js

File was deleted

 src/main/resources/public/264_mp3_wasm.js

File was deleted

 src/main/resources/public/264_mp3_wasm.wasm

Binary files differ

 src/main/resources/public/avc.js

File was deleted

 src/main/resources/public/cocos.js

File was deleted

 src/main/resources/public/ff.js

File was deleted

 src/main/resources/public/ff.wasm

Binary files differ

 src/main/resources/public/ff_aac.html

File was deleted

 src/main/resources/public/ff_aac.js

File was deleted

 src/main/resources/public/ff_aac_wasm.js

File was deleted

 src/main/resources/public/ff_aac_wasm.wasm

Binary files differ

 src/main/resources/public/ff_mp3.html

File was deleted

 src/main/resources/public/ff_mp3.js

File was deleted

 src/main/resources/public/ff_mp3_wasm.js

File was deleted

 src/main/resources/public/ff_mp3_wasm.wasm

Binary files differ

 src/main/resources/public/ff_wasm.js

File was deleted

 src/main/resources/public/ff_wasm.wasm

Binary files differ

 src/main/resources/public/hevc.js

File was deleted

 src/main/resources/public/hevc_aac.js

File was deleted

 src/main/resources/public/hevc_mp3.js

File was deleted

 src/main/resources/public/index.html

File was deleted

 src/main/resources/public/index11.html

File was deleted

 src/main/resources/public/index2.html

File was deleted

 src/main/resources/public/index3.html

File was deleted

 src/main/resources/public/index4.html

File was deleted

 src/main/resources/public/index5.html

File was deleted

 src/main/resources/public/index6.html

File was deleted

 src/main/resources/public/index7.html

File was deleted

 src/main/resources/public/index8.html

File was deleted

 src/main/resources/public/index9.html

File was deleted

 src/main/resources/public/js/renderer.js

@@ -1357,6 +1357,9 @@
                this._trigger('fullscreen', value);
            }
            this._fullscreen = value;
            if(this._fullscreen==true){
                this.resize()
            }
        },
        get() {
            return this._fullscreen;

 src/main/resources/public/js/timeline/264_aac.js

 src/main/resources/public/js/timeline/264_aac_wasm.js

 src/main/resources/public/js/timeline/264_aac_wasm.wasm

Binary files differ

 src/main/resources/public/js/timeline/264_mp3.js

 src/main/resources/public/js/timeline/264_mp3_wasm.js

 src/main/resources/public/js/timeline/264_mp3_wasm.wasm

Binary files differ

 src/main/resources/public/js/timeline/avc.js

 src/main/resources/public/js/timeline/cocos.js

 src/main/resources/public/js/timeline/ff.js

 src/main/resources/public/js/timeline/ff.wasm

Binary files differ

 src/main/resources/public/js/timeline/ff_aac 16.53.27.html

copy from src/main/resources/public/js/ff/ff_aac.html
copy to src/main/resources/public/js/timeline/ff_aac 16.53.27.html

 src/main/resources/public/js/timeline/ff_aac 17.19.30.html

copy from src/main/resources/public/js/ff/ff_aac.html
copy to src/main/resources/public/js/timeline/ff_aac 17.19.30.html

 src/main/resources/public/js/timeline/ff_aac.html

 src/main/resources/public/js/timeline/ff_aac.js

 src/main/resources/public/js/timeline/ff_aac_wasm.js

 src/main/resources/public/js/timeline/ff_aac_wasm.wasm

Binary files differ

 src/main/resources/public/js/timeline/ff_mp3 16.53.27.html

copy from src/main/resources/public/js/ff/ff_mp3.html
copy to src/main/resources/public/js/timeline/ff_mp3 16.53.27.html

 src/main/resources/public/js/timeline/ff_mp3 17.19.30.html

copy from src/main/resources/public/js/ff/ff_mp3.html
copy to src/main/resources/public/js/timeline/ff_mp3 17.19.30.html

 src/main/resources/public/js/timeline/ff_mp3.html

 src/main/resources/public/js/timeline/ff_mp3.js

 src/main/resources/public/js/timeline/ff_mp3_wasm.js

 src/main/resources/public/js/timeline/ff_mp3_wasm.wasm

Binary files differ

 src/main/resources/public/js/timeline/ff_wasm.js

 src/main/resources/public/js/timeline/ff_wasm.wasm

Binary files differ

 src/main/resources/public/js/timeline/flash.html

 src/main/resources/public/js/timeline/hevc.js

 src/main/resources/public/js/timeline/hevc_aac.html

 src/main/resources/public/js/timeline/hevc_aac.js

 src/main/resources/public/js/timeline/hevc_mp3.js

 src/main/resources/public/js/timeline/libde265_aac.js

 src/main/resources/public/js/timeline/libde265_mp3.js

 src/main/resources/public/js/timeline/live_test.swf

Binary files differ

 src/main/resources/public/libde265_aac.js

File was deleted

 src/main/resources/public/libde265_mp3.js

File was deleted

 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>


 src/main/resources/public/monitor/live.html

@@ -16,10 +16,11 @@
            margin: 0 auto;
            text-align: center;
        }
/*        .player-wrapper canvas {
            width: 100%;
            height: 100%;
        }*/

        /*        .player-wrapper canvas {
                    width: 100%;
                    height: 100%;
                }*/

    </style>
</head>
@@ -29,7 +30,7 @@
<!-- jessiebuca播放器 -->
<div class="wrap">
    <div class="content">
        <div class="player" onmouseover="playerShow()"onmouseout="playerHidden()">
        <div class="player" onmouseover="playerShow()" onmouseout="playerHidden()">
            <div class="player-wrapper" id="container" style="background-color: #0D0E1B;">
            </div>
            <div class="control">
@@ -67,7 +68,7 @@
    window.onkeydown = function () {
        h5lc.fullscreen = false
    }
    var isLive=true;
    var isLive = true;
    var $play = document.getElementById('play');
    var $stop = document.getElementById('stop');
    var container = document.getElementById("container");
@@ -76,7 +77,7 @@
    var isPlaying = false;
    let source = queryParam('source') || 'localhost';

    var h5lc = new Jessibuca({container, decoder: "../js/ff/ff.js", videoBuffer: 0});
    var h5lc = new Jessibuca({container, decoder: "../js/timeline/ff.js", videoBuffer: 0});

    h5lc.onLoad = function () {
        //this.play("wss://pulls.1234326.cn/live/L01.flv")
@@ -99,7 +100,7 @@
                        h5lc.play(data)
                    }
                );*/
        play();
        h5lc.play("ws://172.16.30.113:8082/live/ff80808178af424e0178af44e677000343616d657261.flv")
        $play.style.display = 'none';
        $stop.style.display = 'inline';
    }, false);
@@ -110,46 +111,35 @@
        }
        isPlaying = false;
        //stop();

        $play.style.display = 'inline';
        $stop.style.display = 'none';
    }, false);


    function play(firstResponseIp) {
        h5lc.play("ws://172.16.30.113:8082/live/video4.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;
        var qArr = '';
        var key = {};

        if (url) {
            qArr = url.split("?")[1].split("&")

        } else {
            if (!window.location.search) {
                return
            }
            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 {
@@ -161,16 +151,16 @@
        }
    }

    function playerShow(){
    function playerShow() {
        if (isLive) {
            $(".player .control").css("display","block")
        }else {
            $(".player .control").css("display","none")
            $(".player .control").css("display", "block")
        } else {
            $(".player .control").css("display", "none")
        }
    }

    function playerHidden(){
        $(".player .control").css("display","none")
    function playerHidden() {
        $(".player .control").css("display", "none")
    }

</script>