Commit 1bf312b3 by libai

测试

parent 42f037bf
...@@ -819,3 +819,18 @@ ...@@ -819,3 +819,18 @@
right: 0.3rem; right: 0.3rem;
top: 0.25rem; top: 0.25rem;
} }
.layer-ios {
display: none;
width: 7.3rem;
height: 12.24rem;
background: url(../room/images/layer-ios.png) no-repeat;
background-size: 100% 100%;
position: relative;
}
.layer-ios .layer-ios-close {
width: 0.8rem;
height: 0.8rem;
position: absolute;
right: 0;
top: 0;
}
...@@ -839,3 +839,18 @@ ...@@ -839,3 +839,18 @@
right: 0.3rem; right: 0.3rem;
top: 0.25rem; top: 0.25rem;
} }
.layer-ios{
display: none;
width: 7.3rem;
height: 12.24rem;
background: url(../room/images/layer-ios.png)no-repeat;
background-size: 100% 100%;
position: relative;
.layer-ios-close{
width: 0.8rem;
height: 0.8rem;
position: absolute;
right: 0;
top: 0;
}
}
\ No newline at end of file
...@@ -175,15 +175,15 @@ ...@@ -175,15 +175,15 @@
</div> </div>
<div class="zone-car-box"> <div class="zone-car-box">
<span>座駕</span> <span>座駕</span>
<span class="zone-car-content"><img src="https://zhibocdn.yabolive.net/comm/motroing/e01599cbf6964f51b62555540e0d202f.png?x-oss-process=image/resize,w_45" alt=""> <span>&gt;</span></span> <span class="zone-car-content"> <span>&gt;</span></span>
</div> </div>
<div class="zone-medal-box"> <div class="zone-medal-box">
<span>勛章</span> <span>勛章</span>
<span> <span>
<ul class="zone-medal-ul"> <ul class="zone-medal-ul">
<!-- <li><img src="https://zhibocdn.yabolive.net/comm/img/medal/wzzm1.png?x-oss-process=image/resize,w_45" alt=""></li>
<li><img src="https://zhibocdn.yabolive.net/comm/img/medal/wzzm1.png?x-oss-process=image/resize,w_45" alt=""></li> <li><img src="https://zhibocdn.yabolive.net/comm/img/medal/wzzm1.png?x-oss-process=image/resize,w_45" alt=""></li>
<li><img src="https://zhibocdn.yabolive.net/comm/img/medal/wzzm1.png?x-oss-process=image/resize,w_45" alt=""></li> <li><img src="https://zhibocdn.yabolive.net/comm/img/medal/wzzm1.png?x-oss-process=image/resize,w_45" alt=""></li> -->
<li><img src="https://zhibocdn.yabolive.net/comm/img/medal/wzzm1.png?x-oss-process=image/resize,w_45" alt=""></li>
</ul> </ul>
<span class="zone-arrow">&gt;</span> <span class="zone-arrow">&gt;</span>
</span> </span>
...@@ -407,13 +407,27 @@ ...@@ -407,13 +407,27 @@
<script> <script>
$(function(){ $(function(){
//判斷渠道 //判斷渠道
newLiveList(1) liveList(1)
if(sessionStorage.type=="pwa"){
$.ajax({
url:$ip+'activeLog/webActive',
data:{
activeType:8,
pageID:localStorage.canvasCode,
},
success:function(data){
}
})
$(".bottom-nav").css("height","1.8rem")
}
if(sessionStorage.pmt!=undefined&&sessionStorage.pmt!='undefined'){ if(sessionStorage.pmt!=undefined&&sessionStorage.pmt!='undefined'){
if(sessionStorage.pmt=="other"){ if(sessionStorage.pmt=="other"){
$.ajax({ $.ajax({
url:$ip+'activeLog/h5Active', url:$ip+'activeLog/h5Active',
data:{ data:{
pmt:'other', pmt:'ftsH5',
pageID:localStorage.canvasCode pageID:localStorage.canvasCode
}, },
success:function(data){ success:function(data){
...@@ -723,7 +737,8 @@ $(function(){ ...@@ -723,7 +737,8 @@ $(function(){
success:function(data){ success:function(data){
} }
}) })
window.open("https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&os=h5&appversion=7") window.open("https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&os=h5&appversion=7&osStr=h5")
}) })
$(".search-back").on("click",function(){ $(".search-back").on("click",function(){
...@@ -793,7 +808,8 @@ $(function(){ ...@@ -793,7 +808,8 @@ $(function(){
success:function(data){ success:function(data){
} }
}) })
window.open("https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+"&token="+localStorage.token+"&os=h5&appversion=7") window.open("https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+"&token="+localStorage.token+"&os=h5&appversion=7&osStr=h5")
}) })
$(".right-list-box-face").unbind("click").on("click",function(){ $(".right-list-box-face").unbind("click").on("click",function(){
$("body").css("background","rgb(217, 217, 217)") $("body").css("background","rgb(217, 217, 217)")
...@@ -859,8 +875,7 @@ $(function(){ ...@@ -859,8 +875,7 @@ $(function(){
}) })
} }
function liveList(e){
function newLiveList(e){
$.ajax({ $.ajax({
url:$ip+'frontPage/queryLiveUsers/v2', url:$ip+'frontPage/queryLiveUsers/v2',
data:{ data:{
...@@ -913,7 +928,6 @@ $(function(){ ...@@ -913,7 +928,6 @@ $(function(){
} }
}) })
} }
function layzGo(){ function layzGo(){
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
if ('serviceWorker' in navigator) { if ('serviceWorker' in navigator) {
navigator.serviceWorker navigator.serviceWorker
.register('/mobile/sw.js?V=2022120701') .register('/mobile/sw.js?V=2022122201')
.then(() => { console.log('Service Worker Registered'); }); .then(() => { console.log('Service Worker Registered'); });
} }
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
} }
else{ else{
$ip='http://cpapitest.yabolive.net:81/' $ip='http://cpapitest.yabolive.net:81/'
// $ip = "https://cpapi.footseen.xyz/";
$ip2="http://ceshi.yabolive.tv/web" $ip2="http://ceshi.yabolive.tv/web"
$ws = "ws://47.242.178.187:12308/" $ws = "ws://47.242.178.187:12308/"
......
...@@ -190,7 +190,7 @@ $(function(){ ...@@ -190,7 +190,7 @@ $(function(){
var list=data.topic; var list=data.topic;
var details=JSON.parse(list.content) var details=JSON.parse(list.content)
$("title").text(details.title) $("title").text(details.title)
$(".Thumbnail").attr("content",'https://zhibocdn.yabolive.net/comm'+details.videos[0].cover.split('?')[0]+'?x-oss-process=video/snapshot,t_100000,f_jpg,w_1280,h_0,m_fast,f_jpg') $(".Thumbnail").attr("content",'https://zhibocdn.yabolive.net/comm'+details.videos[0].cover.split('?')[0]+'?x-oss-process=video/snapshot,t_94000,f_jpg,w_1280,h_0,m_fast,f_jpg')
var ua = window.navigator.userAgent.toLowerCase(); var ua = window.navigator.userAgent.toLowerCase();
if (/iphone|ipad|ipod/.test(ua)) { if (/iphone|ipad|ipod/.test(ua)) {
var iosUrl=details.videos[0].url.replace("flv","mp4") var iosUrl=details.videos[0].url.replace("flv","mp4")
...@@ -342,7 +342,7 @@ $(function(){ ...@@ -342,7 +342,7 @@ $(function(){
// html+='</div>'; // html+='</div>';
html+='<div class="add-video-img">'; html+='<div class="add-video-img">';
html+='<img class="play-icon" src="images/play-icon.png" alt="">'; html+='<img class="play-icon" src="images/play-icon.png" alt="">';
html+='<img title="'+keyEArr[Math.floor(Math.random()*200)]+'" class="bg-img" src="https://zhibocdn.yabolive.net/comm'+videoList.videos[0].cover.split('?')[0]+'?x-oss-process=video/snapshot,t_100000,f_jpg,w_400,h_0,m_fast,f_jpg">' html+='<img title="'+keyEArr[Math.floor(Math.random()*200)]+'" class="bg-img" src="https://zhibocdn.yabolive.net/comm'+videoList.videos[0].cover.split('?')[0]+'?x-oss-process=video/snapshot,t_94000,f_jpg,w_400,h_0,m_fast,f_jpg">'
html+='</div>'; html+='</div>';
html+='<div class="add-video-text-box">'; html+='<div class="add-video-text-box">';
html+='<p>'+videoList.title+'</p>'; html+='<p>'+videoList.title+'</p>';
...@@ -390,7 +390,7 @@ $(function(){ ...@@ -390,7 +390,7 @@ $(function(){
html+='<img src="https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_80" alt="">'; html+='<img src="https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_80" alt="">';
html+='<p>'+list.nickname+'</p>'; html+='<p>'+list.nickname+'</p>';
html+='</div>'; html+='</div>';
html+='<div style="background: url(https://zhibocdn.yabolive.net/comm'+videoList.videos[0].cover.split('?')[0]+'?x-oss-process=video/snapshot,t_100000,f_jpg,w_400,h_0,m_fast,f_jpg)no-repeat;background-size: cover; background-position-y: center;" class="add-video-img">'; html+='<div style="background: url(https://zhibocdn.yabolive.net/comm'+videoList.videos[0].cover.split('?')[0]+'?x-oss-process=video/snapshot,t_94000,f_jpg,w_400,h_0,m_fast,f_jpg)no-repeat;background-size: cover; background-position-y: center;" class="add-video-img">';
html+='<img class="play-icon" src="images/play-icon.png" alt="">'; html+='<img class="play-icon" src="images/play-icon.png" alt="">';
html+='</div>'; html+='</div>';
html+='<div class="add-video-text-box">'; html+='<div class="add-video-text-box">';
......
...@@ -1797,3 +1797,15 @@ ...@@ -1797,3 +1797,15 @@
margin-top: -1rem; margin-top: -1rem;
z-index: 500; z-index: 500;
} }
.sound-tips {
width: 3.26rem;
height: 2.02rem;
background: url(../images/sound-tips.png) no-repeat;
background-size: 100% 100%;
position: absolute;
z-index: 1000;
bottom: 1rem;
left: 5.5rem;
pointer-events: none;
display: none;
}
...@@ -1852,3 +1852,15 @@ ...@@ -1852,3 +1852,15 @@
margin-top: -1rem; margin-top: -1rem;
z-index: 500; z-index: 500;
} }
.sound-tips{
width: 3.26rem;
height: 2.02rem;
background: url(../images/sound-tips.png) no-repeat;
background-size: 100% 100%;
position: absolute;
z-index: 1000;
bottom: 1rem;
left: 5.5rem;
pointer-events: none;
display: none;
}
\ No newline at end of file
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<script src="../lib/fsize.js"></script> <script src="../lib/fsize.js"></script>
<link rel="stylesheet" href="../css/base.css?v=2022112804"> <link rel="stylesheet" href="../css/base.css?v=2022112804">
<link rel="stylesheet" href="../css/layer.css"> <link rel="stylesheet" href="../css/layer.css">
<link rel="stylesheet" href="css/liveRoom.css?v=2022120604"> <link rel="stylesheet" href="css/liveRoom.css?v=2022122201">
<link rel="stylesheet" href="../css/login.css?v=2022112804"> <link rel="stylesheet" href="../css/login.css?v=2022112804">
<link rel="manifest" href="../manifest.webmanifest?v=2022112308" /> <link rel="manifest" href="../manifest.webmanifest?v=2022112308" />
<script src="../lib/hello.js" async defer></script> <script src="../lib/hello.js" async defer></script>
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
</style> </style>
</head> </head>
<body style="background: rgb(153, 156, 166);overflow: hidden;font-size: 12px;"> <body style="background: rgb(153, 156, 166);overflow: hidden;font-size: 12px;">
<div class="sound-tips"></div>
<div class="layer-ios"> <div class="layer-ios">
<div class="layer-ios-close"></div> <div class="layer-ios-close"></div>
</div> </div>
...@@ -80,10 +81,10 @@ ...@@ -80,10 +81,10 @@
<div class="add-button-close"></div> <div class="add-button-close"></div>
</button> </button>
<div class="guard-show-box"> <div class="guard-show-box">
<img class="guard-show-webp" src="" alt=""> <!-- <img class="guard-show-webp" src="" alt="">
<img class="guard-show-face" src="https://zhibocdn.yabolive.net/comm/user/img/11136355/8e908aec05c04ea89542943b350958b8.jpg?oversea=1?mainland=1?x-oss-process=image/resize,w_45" alt=""> <img class="guard-show-face" src="https://zhibocdn.yabolive.net/comm/user/img/11136355/8e908aec05c04ea89542943b350958b8.jpg?oversea=1?mainland=1?x-oss-process=image/resize,w_45" alt="">
<p class="guard-name">用户昵称预留</p> <p class="guard-name">用户昵称预留</p>
<img class="guard-tips" src="images/guard-tips.png" alt=""> <img class="guard-tips" src="images/guard-tips.png" alt=""> -->
</div> </div>
<div class="layer-space-box"> <div class="layer-space-box">
<!-- <img class="layer-space-face" src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_150" alt=""> <!-- <img class="layer-space-face" src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_150" alt="">
...@@ -265,12 +266,12 @@ ...@@ -265,12 +266,12 @@
</li> --> </li> -->
</ul> </ul>
<div class="bottom-mc-hot-box"> <div class="bottom-mc-hot-box">
<div class="bottom-mc-hot-nav1">19</div> <!-- <div class="bottom-mc-hot-nav1">19</div>
<div class="bottom-mc-hot-nav2"> <div class="bottom-mc-hot-nav2">
<img class="bottom-mc-face" src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_100" alt=""> <img class="bottom-mc-face" src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_100" alt="">
<p class="bottom-mc-p1">主播暱稱預留</p> <p class="bottom-mc-p1">主播暱稱預留</p>
<p class="bottom-mc-p2"><img src="images/hot-icon.png" alt="">123456</p> <p class="bottom-mc-p2"><img src="images/hot-icon.png" alt="">123456</p>
</div> </div> -->
</div> </div>
</div> </div>
<div class="rich-list-layer"> <div class="rich-list-layer">
...@@ -347,61 +348,21 @@ ...@@ -347,61 +348,21 @@
<div class="task-layer"> <div class="task-layer">
<div class="task-layer-top">每日任務</div> <div class="task-layer-top">每日任務</div>
<ul class="task-layer-ul"> <ul class="task-layer-ul">
<li> <!-- <li>
<p class="task-p1">每日登陸<span>+ <img src="images/dew.png" alt="">1</span></p>
<p class="task-p2">每日登陸可領取私信露水瓶</p>
<div class="task-get-btn">領取</div>
</li>
<li>
<p class="task-p1">每日登陸<span>+ <img src="images/dew.png" alt="">1</span></p>
<p class="task-p2">每日登陸可領取私信露水瓶</p>
<div class="task-get-btn">領取</div>
</li>
<li>
<p class="task-p1">每日登陸<span>+ <img src="images/dew.png" alt="">1</span></p>
<p class="task-p2">每日登陸可領取私信露水瓶</p>
<div class="task-get-btn">領取</div>
</li>
<li>
<p class="task-p1">每日登陸<span>+ <img src="images/dew.png" alt="">1</span></p>
<p class="task-p2">每日登陸可領取私信露水瓶</p>
<div class="task-get-btn">領取</div>
</li>
<li>
<p class="task-p1">每日登陸<span>+ <img src="images/dew.png" alt="">1</span></p> <p class="task-p1">每日登陸<span>+ <img src="images/dew.png" alt="">1</span></p>
<p class="task-p2">每日登陸可領取私信露水瓶</p> <p class="task-p2">每日登陸可領取私信露水瓶</p>
<div class="task-get-btn">領取</div> <div class="task-get-btn">領取</div>
</li> </li> -->
</ul> </ul>
</div> </div>
<div class="exc-layer"> <div class="exc-layer">
<div class="exc-diamond-top">兌換露水</div> <div class="exc-diamond-top">兌換露水</div>
<span class="exc-btn">確認</span> <span class="exc-btn">確認</span>
<ul class="exc-ul clearfix"> <ul class="exc-ul clearfix">
<li class="exc-li-click"> <!-- <li class="exc-li-click">
<p class="exc-li-p1">全部兌換</p> <p class="exc-li-p1">全部兌換</p>
<p class="exc-li-p2">兌換25844露水</p> <p class="exc-li-p2">兌換25844露水</p>
</li> </li> -->
<li>
<p class="exc-li-p1"><img src="images/diamond.png">10</p>
<p class="exc-li-p2">兌換1000露水</p>
</li>
<li>
<p class="exc-li-p1"><img src="images/diamond.png">30</p>
<p class="exc-li-p2">兌換3000露水</p>
</li>
<li>
<p class="exc-li-p1"><img src="images/diamond.png">100</p>
<p class="exc-li-p2">兌換10000露水</p>
</li>
<li>
<p class="exc-li-p1"><img src="images/diamond.png">500</p>
<p class="exc-li-p2">兌換50000露水</p>
</li>
<li>
<p class="exc-li-p1"><img src="images/diamond.png">1000</p>
<p class="exc-li-p2">兌換100000露水</p>
</li>
</ul> </ul>
<div class="exc-tips">1<img src="images/diamond.png">⇋100<img class="dew-icon" src="images/dew.png"></div> <div class="exc-tips">1<img src="images/diamond.png">⇋100<img class="dew-icon" src="images/dew.png"></div>
</div> </div>
...@@ -409,30 +370,10 @@ ...@@ -409,30 +370,10 @@
<div class="exc-diamond-top">兌換寶石</div> <div class="exc-diamond-top">兌換寶石</div>
<span class="exc-btn">確認</span> <span class="exc-btn">確認</span>
<ul class="exc-ul clearfix"> <ul class="exc-ul clearfix">
<li class="exc-li-click"> <!-- <li class="exc-li-click">
<p class="exc-li-p1">全部兌換</p> <p class="exc-li-p1">全部兌換</p>
<p class="exc-li-p2">兌換25844露水</p> <p class="exc-li-p2">兌換25844露水</p>
</li> </li> -->
<li>
<p class="exc-li-p1"><img src="images/diamond.png">10</p>
<p class="exc-li-p2">兌換1000露水</p>
</li>
<li>
<p class="exc-li-p1"><img src="images/diamond.png">30</p>
<p class="exc-li-p2">兌換3000露水</p>
</li>
<li>
<p class="exc-li-p1"><img src="images/diamond.png">100</p>
<p class="exc-li-p2">兌換10000露水</p>
</li>
<li>
<p class="exc-li-p1"><img src="images/diamond.png">500</p>
<p class="exc-li-p2">兌換50000露水</p>
</li>
<li>
<p class="exc-li-p1"><img src="images/diamond.png">1000</p>
<p class="exc-li-p2">兌換100000露水</p>
</li>
</ul> </ul>
<div class="exc-tips">1<img src="images/diamond.png">⇋100<img class="dew-icon" src="images/dew.png"></div> <div class="exc-tips">1<img src="images/diamond.png">⇋100<img class="dew-icon" src="images/dew.png"></div>
</div> </div>
...@@ -739,26 +680,39 @@ $(function(){ ...@@ -739,26 +680,39 @@ $(function(){
$(".sound-btn").attr("src","images/sound-yes.png") $(".sound-btn").attr("src","images/sound-yes.png")
$(".gift-btn").attr("src","images/gift-btn.png") $(".gift-btn").attr("src","images/gift-btn.png")
$(".video-box video").prop("muted",false) $(".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="object-fit:cover;z-index: 10" poster="" src="'+data.pullFlowUrlHLS+'"></video>' // 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="object-fit:cover;z-index: 10" poster="" src="'+data.pullFlowUrlHLS+'"></video>'
// 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="object-fit:cover;z-index: 10" poster="" src=""></video>' 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="object-fit:cover;z-index: 10" poster="" src=""></video>'
}else{ }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="object-fit:cover;z-index: 10" poster="" src="'+data.pullFlowUrlHLS+'"></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="object-fit:cover;z-index: 10" poster="" src="'+data.pullFlowUrlHLS+'"></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="object-fit:cover;z-index: 10" poster="" src=""></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="object-fit:cover;z-index: 10" poster="" src=""></video>'
} }
}else{ }else{
html+='<video muted id="myVideo" webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-player-type="h5" x5-video-player-fullscreen="true" style="object-fit:cover;z-index: 10" poster="" src="'+data.pullFlowUrlHLS+'"></video>' html+='<video muted id="myVideo" webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-player-type="h5" x5-video-player-fullscreen="true" style="object-fit:cover;z-index: 10" poster="" src="'+data.pullFlowUrlHLS+'"></video>'
} }
var iosT=null; var iosT=null;
$(".video-box").html(html) $(".video-box").html(html)
if(/android/.test(ua)){ if(/android/.test(ua)){
// flvPlay(data.pullFlowUrl) flvPlay(data.pullFlowUrl)
}else{ }else{
var player = document.getElementById('myVideo'); var player = document.getElementById('myVideo');
player.play() player.play()
// iosT=setTimeout(function(){ startTime=new Date().getTime()
// window.location.reload() matchNum=Math.floor(Math.random()*100000000)
// },5000) $.ajax({
url:$ip+'activeLog/doVideoLoadingCheck',
data:{
matchid:matchNum,
type:1,
systemOs:'ios',
roomid:sessionStorage.roomId,
pageID: localStorage.canvasCode
},
success:function(data){
console.log('视频加载检测',data)
}
})
} }
...@@ -781,21 +735,37 @@ $(function(){ ...@@ -781,21 +735,37 @@ $(function(){
}) })
$("#myVideo").on("canplay",function(){ $("#myVideo").on("canplay",function(){
if(sessionStorage.type!='pwa'){ if(sessionStorage.type!='pwa'){
if(sessionStorage.lookNum==undefined)sessionStorage.lookNum=1; if(sessionStorage.lookNum==undefined)sessionStorage.lookNum=1;
else sessionStorage.lookNum=Number(sessionStorage.lookNum)+1; else sessionStorage.lookNum=Number(sessionStorage.lookNum)+1;
} }
var ua = window.navigator.userAgent.toLowerCase(); var ua = window.navigator.userAgent.toLowerCase();
if (/iphone|ipad|ipod/.test(ua)) { if (/iphone|ipad|ipod/.test(ua)) {
if(sessionStorage.lookNum>=3){ //视频加载检测
setTimeout(function() { var overTime=new Date().getTime()
if(localStorage.uid!=undefined)return; $.ajax({
sessionStorage.lookNum=0 url:$ip+'activeLog/doVideoLoadingCheck',
$(".layer-shadow").show() data:{
loginPage() matchid:matchNum,
type:2,
}, 3000); systemOs:'ios',
} roomid:sessionStorage.roomId,
gap:(overTime-startTime),
pageID: localStorage.canvasCode
},
success:function(data){
console.log('视频加载检测',data)
}
})
if(backGo==1)$(".sound-tips").show()
if(sessionStorage.lookNum>=3){
setTimeout(function() {
if(localStorage.uid!=undefined)return;
sessionStorage.lookNum=0
$(".layer-shadow").show()
loginPage()
}, 3000);
}
} }
clearInterval(iosT) clearInterval(iosT)
$(".play-icon").hide() $(".play-icon").hide()
...@@ -806,6 +776,7 @@ $(function(){ ...@@ -806,6 +776,7 @@ $(function(){
}, loadOutNum); }, loadOutNum);
$(".sound-btn").unbind("click").on("click",function(){ $(".sound-btn").unbind("click").on("click",function(){
$(".sound-tips").hide()
var _self=$(this) var _self=$(this)
if(_self.attr("data-type")==1){ if(_self.attr("data-type")==1){
_self.attr("data-type","0") _self.attr("data-type","0")
...@@ -820,7 +791,8 @@ $(function(){ ...@@ -820,7 +791,8 @@ $(function(){
} }
}) })
$("body").on("click",function(){ $("body").on("click",function(){
$(".sound-tips").hide()
if(soundOk==true)return; if(soundOk==true)return;
soundOk=true soundOk=true
$(".sound-btn").attr("data-type","1") $(".sound-btn").attr("data-type","1")
...@@ -929,7 +901,8 @@ $(function(){ ...@@ -929,7 +901,8 @@ $(function(){
} }
}) })
window.open("https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+"&token="+localStorage.token+"&os=h5&appversion=7") window.open("https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+"&token="+localStorage.token+"&os=h5&appversion=7&osStr=h5")
}) })
$(".layer-ios-close").on("click",function(){ $(".layer-ios-close").on("click",function(){
layer.closeAll() layer.closeAll()
...@@ -1210,8 +1183,6 @@ $(function(){ ...@@ -1210,8 +1183,6 @@ $(function(){
var j=0 var j=0
for(var i=0;i<data.normalRoomList.length;i++){ for(var i=0;i<data.normalRoomList.length;i++){
var list=data.normalRoomList[i] var list=data.normalRoomList[i]
if(i!=data.normalRoomList.length-1)newList+=(JSON.stringify(list)+',')
else newList+=(JSON.stringify(list))
if(i%2==0&&i!=0){ if(i%2==0&&i!=0){
if(data.vipRoomList[j]!=undefined){ if(data.vipRoomList[j]!=undefined){
list2=data.vipRoomList[j] list2=data.vipRoomList[j]
...@@ -1220,6 +1191,9 @@ $(function(){ ...@@ -1220,6 +1191,9 @@ $(function(){
j++; j++;
} }
} }
if(i!=data.normalRoomList.length-1)newList+=(JSON.stringify(list)+',')
else newList+=(JSON.stringify(list))
} }
newList+="]" newList+="]"
newList=JSON.parse(newList) newList=JSON.parse(newList)
...@@ -1259,6 +1233,7 @@ $(function(){ ...@@ -1259,6 +1233,7 @@ $(function(){
} }
}) })
} }
function hotList() { function hotList() {
$.ajax({ $.ajax({
url: $ip + 'room/hot', url: $ip + 'room/hot',
...@@ -1332,7 +1307,7 @@ $(function(){ ...@@ -1332,7 +1307,7 @@ $(function(){
pageID: localStorage.canvasCode pageID: localStorage.canvasCode
}, },
success:function(data){ success:function(data){
console.log("互动榜单",data) // console.log("互动榜单",data)
var html=[]; var html=[];
for(var i=0;i<data.rankList.length;i++){ for(var i=0;i<data.rankList.length;i++){
var list=data.rankList[i] var list=data.rankList[i]
...@@ -1410,7 +1385,7 @@ $(function(){ ...@@ -1410,7 +1385,7 @@ $(function(){
} }
if(data.code!=1){ if(data.code!=1){
$(".rich-list-top-text1 span").html('<span><img src="images/fire.png">--</span>') $(".rich-list-top-text1 span").html('<span><img src="images/fire.png">--</span>')
$(".rich-list-top-text2 span").span('--') $(".rich-list-top-text2 span").html('--')
return; return;
} }
$(".rich-list-top-text1 span").html('<span><img src="images/fire.png">'+data.myscore+'</span>') $(".rich-list-top-text1 span").html('<span><img src="images/fire.png">'+data.myscore+'</span>')
...@@ -1424,7 +1399,7 @@ $(function(){ ...@@ -1424,7 +1399,7 @@ $(function(){
html+='<div class="rich-list-li2">'; html+='<div class="rich-list-li2">';
html+='<img data-type="'+list.uid+'" class="rich-li-face" src="https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_80" alt="">'; html+='<img data-type="'+list.uid+'" class="rich-li-face" src="https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_80" alt="">';
html+='<div class="rich-li-p1">'+list.nickname+'</div>'; html+='<div class="rich-li-p1">'+list.nickname+'</div>';
html+='<div class="rich-li-p2"><img src="images/hot-icon.png">'+list.score+'</div>'; html+='<div class="rich-li-p2"><img style="width: 0.3rem;" src="images/fire.png">'+list.score+'</div>';
html+='</div>'; html+='</div>';
html+='</li>'; html+='</li>';
} }
...@@ -1655,7 +1630,7 @@ $(function(){ ...@@ -1655,7 +1630,7 @@ $(function(){
if(list.currency!=5)continue; if(list.currency!=5)continue;
html+='<li data-type="'+list.gid+'">'; html+='<li data-type="'+list.gid+'">';
if(list.subimg!=undefined)html+='<img style="width:0.6rem" class="subimg" src="https://zhibocdn.yabolive.net/comm'+list.subimg+'?x-oss-process=image/resize,h_30">' if(list.subimg!=undefined)html+='<img style="width:0.45rem" class="subimg" src="https://zhibocdn.yabolive.net/comm'+list.subimg+'?x-oss-process=image/resize,h_30">'
html+='<img src="https://zhibocdn.yabolive.net/comm' + list.resource + '?x-oss-process=image/resize,w_100" alt="">'; html+='<img src="https://zhibocdn.yabolive.net/comm' + list.resource + '?x-oss-process=image/resize,w_100" alt="">';
html+='<p class="gift-p1">'+list.name+'</p>'; html+='<p class="gift-p1">'+list.name+'</p>';
html+='<p class="gift-p2"><img src="images/dew.png" alt="">'+list.price+'</p>'; html+='<p class="gift-p2"><img src="images/dew.png" alt="">'+list.price+'</p>';
...@@ -1781,7 +1756,8 @@ $(function(){ ...@@ -1781,7 +1756,8 @@ $(function(){
} }
}) })
window.open("https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+"&token="+localStorage.token+"&os=h5&appversion=7") window.open("https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+"&token="+localStorage.token+"&os=h5&appversion=7&osStr=h5")
}, 1000); }, 1000);
return return
} }
...@@ -1999,8 +1975,10 @@ $(function(){ ...@@ -1999,8 +1975,10 @@ $(function(){
//主播數據變更 //主播數據變更
if (obj.cid == 4200){ if (obj.cid == 4200){
var list=JSON.parse(obj.content) var list=JSON.parse(obj.content)
$(".room-hot-box >span").text(list.content.bonds) // $(".room-hot-box >span").text(list.content.bonds)
$(".hot-list-box >i").text(list.content.hotnum) // $(".hot-list-box >i").text(list.content.hotnum)
$(".hot-list-box >i").text(list.content.popularNum)
$(".interac-list-box >i").text(list.content.interacNum)
// $(".hot-box >span").text(list.content.hotnum) // $(".hot-box >span").text(list.content.hotnum)
// $(".rich-box >span").text(list.content.bonds) // $(".rich-box >span").text(list.content.bonds)
// $(".rich-box").append('<div class="rich-add-box richAddShow-go">+'+list.content.changebonds+'</div>') // $(".rich-box").append('<div class="rich-add-box richAddShow-go">+'+list.content.changebonds+'</div>')
......
...@@ -57,6 +57,9 @@ ...@@ -57,6 +57,9 @@
</head> </head>
<body style="background: #F3F3F3"> <body style="background: #F3F3F3">
<div class="layer-shadow"></div> <div class="layer-shadow"></div>
<div class="layer-ios">
<div class="layer-ios-close"></div>
</div>
<div class="layer-tag-box"> <div class="layer-tag-box">
<div class="layer-tag-title">選擇分類</div> <div class="layer-tag-title">選擇分類</div>
<ul class="layer-tag-ul"> <ul class="layer-tag-ul">
...@@ -378,9 +381,36 @@ $(function(){ ...@@ -378,9 +381,36 @@ $(function(){
$(".layer-tag-box").css("top","-12rem") $(".layer-tag-box").css("top","-12rem")
$(".layer-shadow").hide() $(".layer-shadow").hide()
}) })
var ua = window.navigator.userAgent.toLowerCase();
if (/iphone|ipad|ipod/.test(ua)) {
if(sessionStorage.type=='pwa'){
$(".bottom-nav").hide()
}
}
$(".bottom-nav-btn").on("click",function(){ $(".bottom-nav-btn").on("click",function(){
var downNum=Math.ceil(Math.random()*3) var ua = window.navigator.userAgent.toLowerCase();
window.location.href='download/download.html?qd=ftsBH5SY' try {
if (/iphone|ipad|ipod/.test(ua)) {
layer.open({
type: 1,
title: false,
shadeClose: true,
skin: "yourclass5",
area: ["7.3rem", "12.24rem"],
content: $(".layer-ios"),
end: function () {
$(".layui-layer-shade").hide()
layer.closeAll()
}
})
} else{
var downNum=Math.ceil(Math.random()*3)
window.location.href='download/download.html?qd=ftsBH5SY'
}
} catch (e) {
}
}) })
$(".bottom-close-btn").on("click",function(){ $(".bottom-close-btn").on("click",function(){
$(".bottom-nav").fadeOut(350) $(".bottom-nav").fadeOut(350)
...@@ -444,7 +474,7 @@ $(function(){ ...@@ -444,7 +474,7 @@ $(function(){
tag:tagNum, tag:tagNum,
}, },
success:function(data){ success:function(data){
// //// console.log('獲取貼文列表',data) // console.log('獲取貼文列表',data)
var html=[]; var html=[];
var topList=JSON.parse(data.dataList[0].content) var topList=JSON.parse(data.dataList[0].content)
//// console.log(topList) //// console.log(topList)
......
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