tremble 4 éve
szülő
commit
f596ac7bee

+ 17 - 3
css/hardware.css

@@ -285,10 +285,22 @@
   width: 100%;
   display: flex;
   justify-content: space-between;
-  background: #262729;
   align-items: center;
 }
 
+.m-con .monitorbody .historyBtn{
+  position: absolute;
+  left: 10px;
+  top: 10px;
+  background-color: #262729;
+  padding: 4px 14px;
+  border-radius: 5px;
+  cursor: pointer;
+  z-index: 9999;
+  font-size: 12px;
+}
+
+
 .m-con .iconquxiao{
   position: absolute;
   top: 5px;
@@ -300,7 +312,8 @@
 }
 
 .m-con .monitorbody .mvideo{
-  width: 50%;
+  width: 100%;
+  flex: 2;
   height: 100%;
 }
 
@@ -311,12 +324,13 @@
 }
 
 .m-con .monitorbody .calendar{
-  width: 50%!important;
+  flex: 2;
   background: #fff;
 }
 
 .m-con .monitorbody .histcon{
   color: #fff;
+  flex: 1;
   height: 100%;
   align-self: flex-start;
   padding: 10px 0;

+ 1 - 0
index.html

@@ -139,6 +139,7 @@
         <div class="m-con">
             <i class="iconfont iconquxiao"></i>
             <div class="monitorbody">
+                <div class="historyBtn">查看历史</div>
                 <div class="mvideo">
                     <video id="monitor" controls></video>
                 </div>

BIN
js/LivePlayer.js-2.3.7-21052115/README.pdf


+ 4 - 0
js/LivePlayer.js-2.3.7-21052115/dist/component/crossdomain.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cross-domain-policy> 
+	<allow-access-from domain="*"/>  
+</cross-domain-policy> 

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
js/LivePlayer.js-2.3.7-21052115/dist/component/liveplayer-component.min.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
js/LivePlayer.js-2.3.7-21052115/dist/component/liveplayer-lib.min.js


BIN
js/LivePlayer.js-2.3.7-21052115/dist/component/liveplayer.swf


+ 4 - 0
js/LivePlayer.js-2.3.7-21052115/dist/element/crossdomain.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cross-domain-policy> 
+	<allow-access-from domain="*"/>  
+</cross-domain-policy> 

+ 84 - 0
js/LivePlayer.js-2.3.7-21052115/dist/element/index.html

@@ -0,0 +1,84 @@
+<!DOCTYPE HTML>
+<html>
+
+<head>
+    <title>liveplayer</title>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no" name="viewport">
+</head>
+
+<body style="margin:0">
+    <!--多清晰度播放示例-->
+    <!-- <live-player video-url="http://192.168.1.11:10080/fvod/GTUGsiqig/video.m3u8"  show-custom-button="true" autoplay="true" aspect="16:9"  resolution="yh,fhd,hd,sd" resolutiondefault="fhd"></live-player> -->
+    <!--HTTP-FLV直播播放示例-->
+    <!-- <live-player video-url="http://192.168.1.11:10080/flv/vlive/68i3az6mg.flv" live="true" aspect="fullscreen"></live-player> -->
+    <!--RTMP播放示例-->
+    <!-- <live-player video-url="rtmp://192.168.1.11:10085/vlive/_9VKyi3mg" live="true" aspect="fullscreen"></live-player> -->
+    <!--M3U8播放示例-->
+    <!-- <live-player video-url="http://192.168.1.11:10080/vhls/_9VKyi3mg/_9VKyi3mg_live.m3u8" live="true" aspect="16:9"></live-player> -->
+    <!--mp4播放示例-->
+    <!-- <live-player video-url="http://192.168.1.11:10080/vod/download/mwoDv_iWR" muted="true" aspect="16:9"></live-player> -->
+
+    <!-- <live-player id="player01" video-url="http://192.168.2.135:10080/vhls/0XpHAMvWR/0XpHAMvWR_live.m3u8" live="true"  aspect="16:9" stretch="true">
+            <div style="position:absolute;left:15px;top:15px;color:#FFF;">自定义叠加层</div>
+        </live-player> -->
+
+    <!-- <live-player video-url="http://192.168.2.135:10080/flv/hls/ZJ9rizvZg.flv" live="true"  aspect="16:9" stretch="true"></live-player> -->
+
+    <script>
+        window.onload = function () {
+            // 页面加载完成以后执行
+            //--------------------JavaScript 交互示例, 当前示例页面放置到web容器里通过http请求访问页面--------------------
+            // var player = document.getElementById('player01');
+            // player.addEventListener('snapOutside', function(evt) {
+            //     console.log('获取快照 base64 数据', evt.detail[0]);
+            // });
+            // player.addEventListener('fullscreenchange', function() { // use @fullscreenchange.native in vue
+            //     console.log('fullscreenchange', player.getVueInstance().isFullscreen());
+            // });
+            // setTimeout(function() {
+            //     console.log("快照, 回调 snapOutside...");
+            //     player.getVueInstance().snap();
+            //     console.log("静音...");
+            //     player.getVueInstance().setMuted(true);
+            //     console.log("静音状态: " + player.getVueInstance().getMuted());
+            //     console.log("暂停...");
+            //     player.getVueInstance().pause();
+            //     console.log("暂停状态: " + player.getVueInstance().paused());
+            //     console.log("全屏状态: " + player.getVueInstance().isFullscreen());
+            //     //触发全屏, 需要放置到交互事件回调中
+            //     //btn.onclick = () => { player.getVueInstance().requestFullscreen(); }
+            //     player.getVueInstance().setMuted(false);
+            //     console.log("音量: " + player.getVueInstance().getVolume());
+            //     player.getVueInstance().setVolume(0.5);
+            //     console.log("音量1: " + player.getVueInstance().getVolume());
+            //     player.getVueInstance().setVolume(0.3);
+            //     console.log("音量2: " + player.getVueInstance().getVolume());
+            // }, 3000);
+            // setTimeout(function() {
+            //     console.log("放音...");
+            //     player.getVueInstance().setMuted(false);
+            //     console.log("静音状态: " + player.getVueInstance().getMuted());
+            //     console.log("播放...");
+            //     player.getVueInstance().play();
+            //     console.log("暂停状态: " + player.getVueInstance().paused());
+            // }, 6000);
+            // setTimeout(function() {
+            //     console.log("切换媒体源...");
+            //     player.setAttribute("video-url", "rtmp://live.hkstv.hk.lxdns.com/live/hks2");
+            // }, 9000);
+
+            //--------------------常见问题--------------------
+            //1、提示: TypeError: The element or ID supplied is not valid. (videojs)
+            //检查 video-url 设置的播放地址 是否有效(可以用 VLC 播放尝试)
+
+            //2、提示:Access to XMLHttpRequest at ... from origin .... has been blocked by CORS policy
+            //检查 video-url 设置的播放地址 是否允许跨域访问
+
+            //3、设置为 aspect='fullscreen'时,父级元素加上 position: relative
+        }
+    </script>
+<script src="liveplayer-element.min.js"></script></body>
+
+</html>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
js/LivePlayer.js-2.3.7-21052115/dist/element/liveplayer-element.min.js


BIN
js/LivePlayer.js-2.3.7-21052115/dist/element/liveplayer.swf


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
js/liveplayer-element.min.js


+ 1 - 1
js/main_2020_show.js

@@ -86,7 +86,7 @@ var getAjax = function(url, data, success, errorString, method){
     })
 }
 
-getAjax(g_Prefix+`/api/device/getType`, null, (data)=>{
+getAjax(g_Prefix+`api/device/getType`, null, (data)=>{
     if (data.code === 0) { 
         hardwareTypes = data.data 
     } else {