Commit a37dc5bc by libai

测试

parent 3e61e268
Showing with 100 additions and 20 deletions
......@@ -683,6 +683,9 @@ $(function(){
var giftMd5=null;
var loadT=null;
var newGiftOk=true;
var startTimer1=null
var startTimer2=null
var startTimer3=null
$(".room-bg").css("height",dHeight+'px')
$(".video-box").css("height",dHeight+'px')
$(".room-content-loading").css("height",dHeight+'px')
......@@ -744,7 +747,10 @@ $(function(){
}
// hotList()
liveList(1)
startLive()
//进入直播间
function startLive(e){
$.ajax({
url:$ip+'room/enterRoom',
data:{
......@@ -757,8 +763,9 @@ $(function(){
success:function(data){
// console.log('进入直播间', data)
var html=[]
$(".room-bg,.video-box").fadeIn(0)
$("title").text(data.roomBaseInfo.nickname+'的直播間-footseen直播')
$
if(data.code==-20060){
alert(langRoom[sessionStorage.lang].roomJsTxt1)
window.location.href="../index.html"
......@@ -813,6 +820,7 @@ $(function(){
$(".secret-face").attr("src","https://zhibocdn.yabolive.net/comm"+data.room.face.split('?')[0]+"?x-oss-process=image/resize,w_150")
$(".loading-face").show().attr("src","https://zhibocdn.yabolive.net/comm"+data.room.face.split('?')[0]+"?x-oss-process=image/resize,w_350")
var loadNum=1
clearInterval(loadT)
loadT=setInterval(function(){
$(".loading-icon").attr("src","images/loading/loading ("+loadNum+").png")
loadNum++
......@@ -825,7 +833,7 @@ $(function(){
}
var soundOk=false
if (/android/.test(ua)) {
if(mySound==1){
if(mySound==1||e==1){
history.pushState(null,null,'liveRoom.html?roomId='+sessionStorage.roomId+'&v=2023050801');
$(".sound-btn").attr("data-type",1)
$(".sound-btn").attr("src","images/sound-yes.png")
......@@ -839,6 +847,17 @@ $(function(){
}
}else{
// if(e==1){
// history.pushState(null,null,'liveRoom.html?roomId='+sessionStorage.roomId+'&v=2023050801');
// $(".sound-btn").attr("data-type",1)
// $(".sound-btn").attr("src","images/sound-yes.png")
// $(".gift-btn").attr("src","images/gift-btn.png")
// $(".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=""></video>'
// }
// else
$(".sound-btn").attr("src","images/sound-no.png")
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>'
}
......@@ -892,7 +911,7 @@ $(function(){
}
})
}
$("#myVideo").on("pause",function(){
$("#myVideo").unbind("click").on("pause",function(){
// clearTimeout(iosT)
// $(".play-icon").fadeIn(200)
// iosT=setTimeout(function(){
......@@ -900,16 +919,16 @@ $(function(){
// player.play()
// },500)
})
$(".play-icon").on("click",function(){
$(".play-icon").unbind("click").on("click",function(){
window.location.reload()
})
$("#myVideo").on("waiting",function(){
$("#myVideo").unbind("waiting").on("waiting",function(){
})
$("#myVideo").on("playing",function(){
$("#myVideo").unbind("playing").on("playing",function(){
$(".play-icon").hide()
})
$("#myVideo").on("canplay",function(){
$("#myVideo").unbind("canplay").on("canplay",function(){
if(sessionStorage.type!='pwa'){
if(localStorage.uid==undefined){
if(sessionStorage.lookNum==undefined)sessionStorage.lookNum=1;
......@@ -940,8 +959,8 @@ $(function(){
})
if(backGo==1)$(".sound-tips").show()
if(sessionStorage.lookNum>=3){
setTimeout(function() {
console.log(111)
clearTimeout(startTimer1)
startTimer1=setTimeout(function() {
if(localStorage.uid!=undefined)return;
// sessionStorage.lookNum=0
$(".layer-shadow").show()
......@@ -974,7 +993,8 @@ $(function(){
}
clearInterval(iosT)
$(".play-icon").hide()
setTimeout(function() {
clearTimeout(startTimer2)
startTimer2=setTimeout(function() {
clearInterval(loadT)
$(".room-content-loading").fadeOut(100)
$(".loading-face").fadeOut(100)
......@@ -996,7 +1016,7 @@ $(function(){
}
})
$("body").on("click",function(){
$("body").unbind("click").on("click",function(){
$(".sound-tips").hide()
if(soundOk==true)return;
soundOk=true
......@@ -1043,7 +1063,8 @@ $(function(){
window.open("https://www.footseen.com/footseen/phonepay/applepay.html?lang="+sessionStorage.lang+"&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+"&token="+localStorage.token+"&os=h5&appversion=7&osStr=h5")
})
}else{
setTimeout(function(){
clearTimeout(startTimer3)
startTimer3=setTimeout(function(){
newGift()
$.ajax({
url:$ip+'room/doGiftGuidelineCheck',
......@@ -1173,6 +1194,9 @@ $(function(){
}
}
})
}
$(".reg-tips-yes").on("click",function(){
window.open("https://www.footseen.com/footseen/phonepay/applepay.html?lang="+sessionStorage.lang+"&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+"&token="+localStorage.token+"&os=h5&appversion=7&osStr=h5")
$.ajax({
......@@ -1221,7 +1245,7 @@ $(function(){
$(".keyboard-box").show()
$(".keyboard-input").focus()
})
$(".gift-layer-ul li").unbind("click").on("click",function(){
$(".gift-layer-ul li").on("click",function(){
var _self=$(this);
$(".gift-layer-ul li").removeClass("gift-layer-click")
if(_self.attr("data-type")==1){
......@@ -1276,6 +1300,9 @@ $(function(){
$(".layer-shadow").show()
})
$(".layer-shadow").on("click",function(){
closePop()
})
function closePop(){
$(".layer-shadow").hide()
$(".keyboard-box").hide()
fixScroll()
......@@ -1289,7 +1316,7 @@ $(function(){
$(".guard-layer").css("bottom","-11.6rem")
$(".gift-layer").css("bottom","-7.8rem")
$(".ticker-buy-box").css("bottom","-10rem")
})
}
$(".hot-close").on("click",function(){
$(".layer-shadow").hide()
$(".hot-list-layer").css("bottom","-10.9rem")
......@@ -2251,8 +2278,6 @@ $(function(){
if(vipImgNum!=0)html+='<img class="online-king" src="images/v'+vipImgNum+'.png">'
html+='<img src="'+faceImg+'" alt="">';
html+='</li>';
console.log(list.richLevel)
console.log(vipImgNum)
vipNum++
}else{
html+='<li data-type="'+list.uid+'">';
......@@ -2742,6 +2767,7 @@ $(function(){
function WebSocketGo() {
if ("WebSocket" in window) {
// ws.close()
// 打开一个 web socket
if(localStorage.token==undefined||localStorage.token=='undefined')var url = ""+$ws+"ws?uid=" + localStorage.uid + "&token="+localStorage.canvasCode+"&roomid=" + sessionStorage.roomId + "&connType=2&lang="+sessionStorage.lang+"";
else var url = ""+$ws+"ws?uid=" + localStorage.uid + "&token="+localStorage.token+"&roomid=" + sessionStorage.roomId + "&connType=1&lang="+sessionStorage.lang+"";
......@@ -3695,9 +3721,36 @@ $(function(){
if(angle<30&&zwidth>3.5){
$(".room-bg,.video-box").css("transition","0.35s all")
$(".room-bg,.video-box").css("top","100vh")
sessionStorage.roomId=topRoomId
setTimeout(function() {
window.location.href="liveRoom.html?roomId="+topRoomId+"&sound=1&v=2023050801"
}, 350);
if(sessionStorage.type!='pwa'){
if(localStorage.uid==undefined){
if(sessionStorage.lookNum==undefined)sessionStorage.lookNum=1;
else sessionStorage.lookNum=Number(sessionStorage.lookNum)+1;
}
}
$(".room-bg,.video-box").fadeOut(0)
ws.close()
closePop()
//这里要改
var html=[]
// html+='<div class="user-msg-big">';
html+='<div class="system-msg one-msg">'+langRoom[sessionStorage.lang].roomJsTxt41+'</div>';
// html+='</div>';
$(".user-msg-big").html(html)
$(".room-bg,.video-box").css("transition","0s all")
$(".room-bg,.video-box").css("top","0vh")
try{
flvPlayer.unload();
}catch(e){
}
history.pushState(null,null,'liveRoom.html?roomId='+sessionStorage.roomId+'&v=2023062601');
startLive(1)
liveList(1)
$(".room-secret,.mc-out-box,.secret-bottom-box,.secret-ing-content,.play-icon,.mc-out-box,.room-secret,.room-content-loading").hide()
// window.location.href="liveRoom.html?roomId="+topRoomId+"&sound=1&v=2023050801"
}, 300);
return
}
}
......@@ -3707,9 +3760,36 @@ $(function(){
if(angle<30&&zwidth>3.5){
$(".room-bg,.video-box").css("transition","0.35s all")
$(".room-bg,.video-box").css("top","-100vh")
// $(".room-bg,.video-box").fadeOut(350)
sessionStorage.roomId=BottomRoomId
if(sessionStorage.type!='pwa'){
if(localStorage.uid==undefined){
if(sessionStorage.lookNum==undefined)sessionStorage.lookNum=1;
else sessionStorage.lookNum=Number(sessionStorage.lookNum)+1;
}
}
setTimeout(function() {
window.location.href="liveRoom.html?roomId="+BottomRoomId+"&sound=1&v=2023050801"
}, 350);
$(".room-bg,.video-box").fadeOut(0)
ws.close()
closePop()
var html=[]
// html+='<div class="user-msg-big">';
html+='<div class="system-msg one-msg">'+langRoom[sessionStorage.lang].roomJsTxt41+'</div>';
// html+='</div>';
$(".user-msg-big").html(html)
$(".room-bg,.video-box").css("transition","0s all")
$(".room-bg,.video-box").css("top","0vh")
try{
flvPlayer.unload();
}catch(e){
}
history.pushState(null,null,'liveRoom.html?roomId='+sessionStorage.roomId+'&v=2023062601');
startLive(1)
liveList(1)
$(".room-secret,.mc-out-box,.secret-bottom-box,.secret-ing-content,.play-icon,.mc-out-box,.room-secret,.room-content-loading").hide()
// window.location.href="liveRoom.html?roomId="+BottomRoomId+"&sound=1&v=2023050801"
}, 300);
return
}
}
......
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