Commit 18671a03 by libai

测试

parent e5337243
......@@ -36,6 +36,7 @@
<link rel="stylesheet" href="css/layer.css">
<link rel="stylesheet" href="css/index.css?v=2022111801">
<link rel="stylesheet" href="css/login.css?v=2022111801">
<script src="https://accounts.google.com/gsi/client" async defer></script>
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script>
<script src="lib/hello.js"></script>
......@@ -367,6 +368,7 @@
<script src="layer-v3.1.0/layer/layer.js"></script>
<!-- <script src="lib/fingerprint2.js"></script> -->
<script src="lib/login.js?v=2022111801"></script>
<!-- <script src="index.js" defer></script> -->
<!-- <link rel="manifest" href="manifest.webmanifest" /> -->
......@@ -646,7 +648,7 @@ $(function(){
})
}
function layzGo(){
}
function searchGoUser(e,pageNum){
$.ajax({
......
......@@ -54,11 +54,11 @@ var mySound=data.sound;
sessionStorage.kkk = 'debug'
sessionStorage.roomId=23864554
}
if (bbb.indexOf("file:///") > -1) {
localStorage.uid= 155100;
localStorage.token = 'debug'
// sessionStorage.roomId=210101
}
// if (bbb.indexOf("file:///") > -1) {
// localStorage.uid= 155100;
// localStorage.token = 'debug'
// // sessionStorage.roomId=210101
// }
$.ajaxSetup({
global: false,
type: 'get',
......
......@@ -32,6 +32,7 @@
<link rel="stylesheet" href="../css/layer.css">
<link rel="stylesheet" href="css/liveRoom.css?v=2022111808">
<link rel="stylesheet" href="../css/login.css?v=2022111801">
<link rel="stylesheet" href="../videojs/video-js.min.css">
<script src="https://accounts.google.com/gsi/client" async defer></script>
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script>
<script src="../lib/hello.js"></script>
......@@ -566,6 +567,7 @@
<!-- <script src="../lib/inobounce.js"></script> -->
<!-- <script src="lib/fingerprint2.js"></script> -->
<script src="../lib/login.js?v=2022111801"></script>
<script src="../videojs/video.min.js"></script>
<script>
$(function(){
var dHeight=$(document).height()
......@@ -695,7 +697,11 @@ $(function(){
$(".video-box video").prop("muted",false)
html+='<video id="myVideo" autoplay webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-player-type="h5" x5-video-player-fullscreen="true" style="height:100%;object-fit:fill;position:absolute;z-index: 10" poster="" src="'+data.pullFlowUrlHLS+'"></video>'
}else{
html+='<video muted id="myVideo" autoplay webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-player-type="h5" x5-video-player-fullscreen="true" style="height:100%;object-fit:fill;position:absolute;z-index: 10" poster="" src="'+data.pullFlowUrlHLS+'"></video>'
html+='<video id="myVideo" class="video-js" controls preload="auto" poster="" data-setup="{}">';
html+='<source src="'+data.pullFlowUrlHLS+'" type="rtmp/flv">';
html+='</video>';
// html+='<video muted id="myVideo" autoplay webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-player-type="h5" x5-video-player-fullscreen="true" style="height:100%;object-fit:fill;position:absolute;z-index: 10" poster="" src="'+data.pullFlowUrlHLS+'"></video>'
}
}else{
html+='<video muted id="myVideo" autoplay webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-player-type="h5" x5-video-player-fullscreen="true" style="height:100%;object-fit:fill;position:absolute;z-index: 10" poster="" src="'+data.pullFlowUrlHLS+'"></video>'
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment