修改超时时间

liujun001
1 parent b7aaa70a
Showing 2 changed files with 19 additions and 21 deletions
src/main/resources/application-test.properties
src/main/resources/static/pages/video/video.js
@@ -78,7 +78,7 @@ wvp.login.url=http://61.169.120.202:28080/api/user/login
 wvp.channel.list.url=http://61.169.120.202:28080/api/device/query/query/channel/carNo/{carNo}
 wvp.channel.list.img.url=http://61.169.120.202:28080/api/device/query/snap/
 wvp.channel.play.url =http://61.169.120.202:1091/rtp/
-wvp.channel.live.broadcast.url=http://61.169.120.202:28080/#/play/wasm/ws%3A%2F%2F192.168.169.100%3A1091%2Frtp%2F{device}_{channel}.live.flv
+wvp.channel.live.broadcast.url=http://61.169.120.202:28080/#/play/wasm/ws%3A%2F%2F61.169.120.202%3A1091%2Frtp%2F{device}_{channel}.live.flv
 wvp.channel.history.list.url=http://61.169.120.202:28080/api/gb_record/query/{device}/{channel}?startTime={startTimeStr}&endTime={endTimeStr}
@@ -204,15 +204,11 @@ function playWvpVideo(playURL, deviceId, channelId) {
 }
-function playVideo(url, ID) {
+function playVideo(url, ID,time) {
     return new WebMediaPlayer(url, ID, function () {
     }, {
-        cbUserPtr: this,
-        decodeType: 'auto',
-        openAudio: true,
-        autoplay: true,
-        bigPlay: false,
-        showMode: false
+        autoplay: 1,
+        currentTime:time
     }).play();
 }
@@ -314,7 +310,7 @@ function playDeviceVidemoQueryHistory(idDiv, url, device, channel, startTime, en
     console.log(url);
     var idDiv1 = "device_video_play_" + (Date.now());
     $("#videoPlay", $("#" + idDiv)).html("<div id='" + idDiv1 + "' style='height:550px;width:99%'></div>")
-    player = playVideo(url, idDiv1);
+    player = playVideo(url, idDiv1,0);
 }
@@ -356,7 +352,7 @@ function skeywebPlayerChannel($skeyewebplayer, carNo) {
             if (rep.data) {
                 let html = "<table cellspacing=\"0\" cellpadding=\"0\" border=\"1\" class=\"layui-table\"><tbody>";
                 $.each(rep.data, function (index, node) {
-                    html = html + "<tr><td><button class=\"layui-btn layui-btn-primary\" channelNode='" + node.name + "' deviceId='" + node.deviceId + "' channelId='" + node.channelId + "' onclick=\"skeyewebplayerChannelClick('" + rep.wvpPlayURL + "',this)\">" + node.name + "</button></td></tr>";
+                    html = html + "<tr><td><button class=\"layui-btn layui-btn-primary\" channelNode='" + node.name + "' deviceId='" + node.deviceId + "' channelId='" + node.channelId + "'  onclick=\"skeyewebplayerChannelClick('" + rep.wvpLiveBroadcast + "',this)\">" + node.name + "</button></td></tr>";
                 });
                 $("#skeyewebplayerDivChannel", $skeyewebplayer).html(html);
                 closeLoading();
@@ -365,17 +361,16 @@ function skeywebPlayerChannel($skeyewebplayer, carNo) {
     });
 }
-function skeyewebplayerChannelClick(playURL, btn) {
-    console.log(btn);
+function skeyewebplayerChannelClick(playURL, btn,deviceId,channelId) {
     let children = $("#skeyewebplayerDivContent", $("#skeyewebplayer")).children();
     let length = children.length;
     if (length === 1) {
-        displaySkeyewebplayerChannel(children[0], playURL, btn);
+        displaySkeyewebplayerChannel(children[0], playURL, btn,deviceId,channelId);
     } else if (length > 1) {
         for (let i = 0; i < length; i++) {
             let classCss = $(children[i]).attr("class");
             if (classCss.indexOf("skeyewebplayerDivContent_play_selected") > -1) {
-                displaySkeyewebplayerChannel(children[i], playURL, btn);
+                displaySkeyewebplayerChannel(children[i], playURL, btn,deviceId,channelId);
                 break;
             }
         }
@@ -384,19 +379,22 @@ function skeyewebplayerChannelClick(playURL, btn) {
 }
-function displaySkeyewebplayerChannel(htmlNode, playURL, btn) {
+function displaySkeyewebplayerChannel(htmlNode, playURL, btn,deviceId,channelId) {
     loading = loadingFunction();
     let $htmlNode = $(htmlNode);
-
     let $btn = $(btn);
-    $("div[class='skeyewebplayerDiv_title']", $htmlNode).html($btn.attr("channelNode"));
+    deviceId = $btn.attr("deviceId");
+    channelId =  $btn.attr("channelId");
-    let playURL1 = playURL + $btn.attr("deviceId") + "_" + $btn.attr("channelId") + ".live.mp4";
-    $("div[class='skeyewebplayerDiv_play_content']", $htmlNode).html("");
-    playVideo2(playURL1, $("div[class='skeyewebplayerDiv_play_content']", $htmlNode));
+    let htmlObj =  $("div[class='skeyewebplayerDiv_play_content']", $htmlNode);
+    htmlObj.html("");
+    $("div[class='skeyewebplayerDiv_title']", $htmlNode).html($btn.attr("channelNode"));
+    playURL = playURL.replace("{device}",deviceId).replace("{channel}",channelId);
+    let playURL1 = "<iframe  style='width:100%;height:100%;' src ='"+playURL+"'/>";
+    htmlObj.html(playURL1);
     closeLoading();
 }
@@ -433,7 +431,7 @@ function skeyWebPlayer(len, parentId) {
     var html = "";
     for (let i = 0; i < len; i++) {
         html += "<div class='" + classCss + "' id='skeyewebplayerDivContent_play_" + i + "' onclick=\"skeyewebplayerDivContent_play_click(this)\"><div class='skeyewebplayerDiv_title'>";
-        html += "</div><div id='skeyewebplayerDiv_play_content_" + i + "' class='skeyewebplayerDiv_play_content'></div></div>";
+        html += "</div><div id='skeyewebplayerDiv_play_content_" + i + "' class='skeyewebplayerDiv_play_content' style='height: 95%'></div></div>";
     }
     $skeyewebplayerDivContent.html(html);