Commit 4274d24e by libai

测试

parent ba0cd23b
...@@ -127,24 +127,24 @@ ...@@ -127,24 +127,24 @@
</div> </div>
<div class="zone-content"> <div class="zone-content">
<div class="zone-content-box1"> <div class="zone-content-box1">
<div class="zone-content-box1-id">ID: 185202 <div>♀20</div></div> <div class="zone-content-box1-id"> <div></div></div>
<div class="zone-content-box1-poster"><img src="images/poster.png">深圳,中國</div> <div class="zone-content-box1-poster"><img src="images/poster.png"></div>
<div class="zone-content-box1-card"> <div class="zone-content-box1-card">
<div>巨蟹座</div> <div></div>
<div>55kg</div> <div></div>
<div>170cm</div> <div></div>
<div>本科</div> <div></div>
<div>自由职业</div> <div></div>
</div> </div>
<div class="zone-content-box1-tips">嗨,我刚加入footseen,希望和你成為朋友</div> <div class="zone-content-box1-tips"></div>
</div> </div>
<div class="zone-rich-box"> <div class="zone-rich-box">
<span>收穫羽毛</span> <span>收穫羽毛</span>
<span><img src="images/fire.png" alt=""> <span class="zone-rich-box-num">509000</span></span> <span><img src="images/fire.png" alt=""> <span class="zone-rich-box-num">--</span></span>
</div> </div>
<div class="zone-diamond-box"> <div class="zone-diamond-box">
<span>收穫寶石</span> <span>收穫寶石</span>
<span><img src="images/diamond.png" alt=""> <span class="zone-diamond-box-num">509000</span></span> <span><img src="images/diamond.png" alt=""> <span class="zone-diamond-box-num">--</span></span>
</div> </div>
<div class="zone-car-box"> <div class="zone-car-box">
<span>座駕</span> <span>座駕</span>
...@@ -162,47 +162,7 @@ ...@@ -162,47 +162,7 @@
</span> </span>
</div> </div>
<ul class="zone-photo-ul clearfix"> <ul class="zone-photo-ul clearfix">
<li> <!-- <li>
<p class="zone-photo-title">一見你的眼睛,我便清醒起來我更歡</p>
<div class="zone-photo-bottom-box">
<span class="zone-photo-bottom-p1"><img src="images/message.png" alt=""> 27</span>
<span class="zone-photo-bottom-p2"><img src="images/good.png" alt=""> 52</span>
<span class="zone-photo-bottom-p3">00:15</span>
</div>
<div class="zone-photo-shadow"></div>
<img class="zone-photo-img" src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_255" alt="">
</li>
<li>
<p class="zone-photo-title">一見你的眼睛,我便清醒起來我更歡</p>
<div class="zone-photo-bottom-box">
<span class="zone-photo-bottom-p1"><img src="images/message.png" alt=""> 27</span>
<span class="zone-photo-bottom-p2"><img src="images/good.png" alt=""> 52</span>
<span class="zone-photo-bottom-p3">00:15</span>
</div>
<div class="zone-photo-shadow"></div>
<img class="zone-photo-img" src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_255" alt="">
</li>
<li>
<p class="zone-photo-title">一見你的眼睛,我便清醒起來我更歡</p>
<div class="zone-photo-bottom-box">
<span class="zone-photo-bottom-p1"><img src="images/message.png" alt=""> 27</span>
<span class="zone-photo-bottom-p2"><img src="images/good.png" alt=""> 52</span>
<span class="zone-photo-bottom-p3">00:15</span>
</div>
<div class="zone-photo-shadow"></div>
<img class="zone-photo-img" src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_255" alt="">
</li>
<li>
<p class="zone-photo-title">一見你的眼睛,我便清醒起來我更歡</p>
<div class="zone-photo-bottom-box">
<span class="zone-photo-bottom-p1"><img src="images/message.png" alt=""> 27</span>
<span class="zone-photo-bottom-p2"><img src="images/good.png" alt=""> 52</span>
<span class="zone-photo-bottom-p3">00:15</span>
</div>
<div class="zone-photo-shadow"></div>
<img class="zone-photo-img" src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_255" alt="">
</li>
<li>
<p class="zone-photo-title">一見你的眼睛,我便清醒起來我更歡</p> <p class="zone-photo-title">一見你的眼睛,我便清醒起來我更歡</p>
<div class="zone-photo-bottom-box"> <div class="zone-photo-bottom-box">
<span class="zone-photo-bottom-p1"><img src="images/message.png" alt=""> 27</span> <span class="zone-photo-bottom-p1"><img src="images/message.png" alt=""> 27</span>
...@@ -211,8 +171,7 @@ ...@@ -211,8 +171,7 @@
</div> </div>
<div class="zone-photo-shadow"></div> <div class="zone-photo-shadow"></div>
<img class="zone-photo-img" src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_255" alt=""> <img class="zone-photo-img" src="https://zhibocdn.yabolive.net/comm/stscli/prod/4106446166423916818508c02555a3a647828c50948d55f57692.jpg?x-oss-process=image/resize,w_255" alt="">
</li> </li> -->
</ul> </ul>
<div style="height: 1.4rem;"></div> <div style="height: 1.4rem;"></div>
</div> </div>
...@@ -844,7 +803,7 @@ $(function(){ ...@@ -844,7 +803,7 @@ $(function(){
if(data.dataList[i].type==3){ if(data.dataList[i].type==3){
var list=data.dataList[i]; var list=data.dataList[i];
var content=JSON.parse(list.content) var content=JSON.parse(list.content)
html+='<a href="video.html?topicId='+list.topicId+'"><li data-type='+list.topicId+'>'; html+='<a href="video.html?topicId='+list.topicId+'"><li class="video-go" data-type='+list.topicId+'>';
html+='<p class="zone-photo-title">'+content.title+'</p>'; html+='<p class="zone-photo-title">'+content.title+'</p>';
html+='<div class="zone-photo-bottom-box">'; html+='<div class="zone-photo-bottom-box">';
html+='<span class="zone-photo-bottom-p1"><img src="images/message.png" alt=""> '+list.comment+'</span>'; html+='<span class="zone-photo-bottom-p1"><img src="images/message.png" alt=""> '+list.comment+'</span>';
...@@ -857,7 +816,7 @@ $(function(){ ...@@ -857,7 +816,7 @@ $(function(){
}else if(data.dataList[i].type==2){ }else if(data.dataList[i].type==2){
var list=data.dataList[i]; var list=data.dataList[i];
var content=JSON.parse(list.content) var content=JSON.parse(list.content)
html+='<a href="Graphics.html?topicId='+list.topicId+'"><li data-type='+list.topicId+'>'; html+='<a href="Graphics.html?topicId='+list.topicId+'"><li class="Graphics-go" data-type='+list.topicId+'>';
html+='<p class="zone-photo-title">'+content.title+'</p>'; html+='<p class="zone-photo-title">'+content.title+'</p>';
html+='<div class="zone-photo-bottom-box">'; html+='<div class="zone-photo-bottom-box">';
html+='<span class="zone-photo-bottom-p1"><img src="images/message.png" alt=""> '+list.comment+'</span>'; html+='<span class="zone-photo-bottom-p1"><img src="images/message.png" alt=""> '+list.comment+'</span>';
...@@ -869,6 +828,35 @@ $(function(){ ...@@ -869,6 +828,35 @@ $(function(){
} }
} }
$(".zone-photo-ul").html(html) $(".zone-photo-ul").html(html)
$(".video-go").unbind("click").on("click",function(){
layer.open({
type: 2,
title: false,
shadeClose: true,
skin: "yourclass9",
area: ["10rem", dHeight+'px'],
content: '../userRoom.html?tid='+data.room.uid+'',
end: function () {
$(".layui-layer-shade").hide()
layer.closeAll()
}
})
})
$(".Graphics-go").unbind("click").on("click",function(){
layer.open({
type: 2,
title: false,
shadeClose: true,
skin: "yourclass9",
area: ["10rem", dHeight+'px'],
content: '../userRoom.html?tid='+data.room.uid+'',
end: function () {
$(".layui-layer-shade").hide()
layer.closeAll()
}
})
})
} }
}) })
} }
......
...@@ -53,11 +53,11 @@ sessionStorage.qd=data.qd ...@@ -53,11 +53,11 @@ sessionStorage.qd=data.qd
sessionStorage.kkk = 'debug' sessionStorage.kkk = 'debug'
sessionStorage.roomId=23864554 sessionStorage.roomId=23864554
} }
// if (bbb.indexOf("file:///") > -1) { if (bbb.indexOf("file:///") > -1) {
// localStorage.uid= 155100; localStorage.uid= 155100;
// localStorage.token = 'debug' localStorage.token = 'debug'
// // sessionStorage.roomId=210101 // sessionStorage.roomId=210101
// } }
$.ajaxSetup({ $.ajaxSetup({
global: false, global: false,
type: 'get', type: 'get',
......
...@@ -574,6 +574,172 @@ $(function(){ ...@@ -574,6 +574,172 @@ $(function(){
$(".room-bg").css("height",$(document).height()) $(".room-bg").css("height",$(document).height())
// hotList() // hotList()
liveList(1) liveList(1)
//进入直播间
$.ajax({
url:$ip+'room/enterRoom',
data:{
uid: localStorage.uid,
token: localStorage.token,
roomId: sessionStorage.roomId,
pageID: localStorage.canvasCode,
// pass: true,
},
success:function(data){
console.log('进入直播间', data)
var html=[]
if(data.code==-20060){
alert("您已被移出直播,暫時不能進入")
window.location.href="../index.html"
return;
}
if(data.room.liveScope==3&&data.room.selfLock==0&&localStorage.uid!=sessionStorage.roomId){
$(".room-content").hide()
$(".room-secret").show()
html+='<img src="https://zhibocdn.yabolive.net/comm'+data.room.face.split('?')[0]+'?x-oss-process=image/resize,w_100" alt="">';
html+='<p>'+data.room.roomName+'</p>';
$(".room-secret-mc").html(html)
$(".secret-diamond-box").html('<img src="images/diamond.png" alt="">'+data.room.tollPrice)
$(".room-secret-bg img").attr("src",'https://zhibocdn.yabolive.net/comm'+data.room.face.split('?')[0]+'?x-oss-process=image/resize,w_375')
$(".secret-btn").unbind("click").on("click",function(){
if(localStorage.token==undefined||localStorage.token=='undefined'){
loginPage()
$(".layer-shadow").show()
return;
}
$.ajax({
url:$ip+'room/to/join/buy',
data:{
uid: localStorage.uid,
token: localStorage.token,
roomId: sessionStorage.roomId,
channelId:data.room.channelId,
pageID: localStorage.canvasCode,
},
success:function(data){
console.log('进入付费房购买资格',data)
if(data.code==1){
layer.msg("已付費,即將進入直播間")
setTimeout(function(){
window.location.reload()
},1000)
}else{
layer.msg(data.msg)
}
}
})
})
return;
}
if(data.room.liveState!=1){
$(".room-content").hide()
$(".mc-out-box").show()
var html=''
html+='<img class="room-mc-face" src="https://zhibocdn.yabolive.net/comm'+data.room.face.split('?')[0]+'?x-oss-process=image/resize,w_80" alt="">';
html+='<p class="room-mc-name">'+data.room.nickName+'</p>';
html+='<div class="room-rich-num"><img src="images/man.png" alt="">'+data.room.lookSum+'</div>';
if(data.room.isLike==0)html+='<img class="like-icon" data-type="'+data.room.uid+'" src="images/like-icon.png" alt="">';
$(".mc-out-mcBox").html(html);
$(".room-out-mc-shadow").attr("src","https://zhibocdn.yabolive.net/comm"+data.room.face.split('?')[0]+"?x-oss-process=image/resize,w_300")
$(".like-icon").unbind("click").on("click",function(){
var _self=$(this)
$.ajax({
url:$ip+'room/likeOpt',
data:{
roomId:_self.attr("data-type"),
optType:1,
pass: true,
uid:localStorage.uid,
token:localStorage.token,
pageID: localStorage.canvasCode,
},
success:function(data){
//console.log('關注',data)
if(data.code==1){
_self.hide()
layer.msg('關注成功')
}else{
layer.msg(data.msg)
}
}
})
})
moreMc()
return;
}
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>'
$(".video-box").html(html)
$(".sound-btn").unbind("click").on("click",function(){
var _self=$(this)
if(_self.attr("data-type")==1){
_self.attr("data-type","0")
$(".sound-btn").attr("src","images/sound-no.png")
$(".video-box video").prop("muted",true)
}else {
_self.attr("data-type","1")
$(".sound-btn").attr("src","images/sound-yes.png")
$(".video-box video").prop("muted",false)
}
})
giftList(1)
if(localStorage.uid!=undefined){
myDiamond()
}
online()
WebSocketGo()
// object-fit:fill
// console.log($("#myVideo").css("height"))
var html=[];
html+='<img class="room-mc-face" src="https://zhibocdn.yabolive.net/comm'+data.room.face.split('?')[0]+'?x-oss-process=image/resize,w_80" alt="">';
html+='<p class="room-mc-name">'+data.room.nickName+'</p>';
html+='<div class="room-rich-num"><img src="images/man.png" alt="">'+data.room.lookSum+'</div>';
if(data.room.isLike==0)html+='<img class="like-icon" data-type="'+data.room.uid+'" src="images/like-icon.png" alt="">';
$(".room-mc-box").html(html);
$(".hot-list-box").html('<img src="images/hot-icon.png" alt=""><i>'+data.room.hotResult.score+'</i> <span>&gt;</span>')
$(".room-hot-box span").text(data.roomOtherInfo.charm)
$(".room-mc-face").unbind("click").on("click",function(){
layer.open({
type: 2,
title: false,
shadeClose: true,
skin: "yourclass9",
area: ["10rem", dHeight+'px'],
content: '../userRoom.html?tid='+data.room.uid+'',
end: function () {
$(".layui-layer-shade").hide()
layer.closeAll()
}
})
})
$(".like-icon").unbind("click").on("click",function(){
var _self=$(this)
$.ajax({
url:$ip+'room/likeOpt',
data:{
roomId:_self.attr("data-type"),
optType:1,
pass: true,
uid:localStorage.uid,
token:localStorage.token,
pageID: localStorage.canvasCode,
},
success:function(data){
//console.log('關注',data)
if(data.code==1){
_self.hide()
layer.msg('關注成功')
}else{
layer.msg(data.msg)
}
}
})
})
}
})
$(".msg-btn").on("click",function(){ $(".msg-btn").on("click",function(){
if(localStorage.uid==undefined){ if(localStorage.uid==undefined){
loginPage() loginPage()
...@@ -708,7 +874,6 @@ $(function(){ ...@@ -708,7 +874,6 @@ $(function(){
$(".room-close").on("click",function(){ $(".room-close").on("click",function(){
window.location.href="../index.html" window.location.href="../index.html"
}) })
$(".exc-layer .exc-btn").on("click",function(){ $(".exc-layer .exc-btn").on("click",function(){
$.ajax({ $.ajax({
url:$ip+'user/chip/buy', url:$ip+'user/chip/buy',
...@@ -761,168 +926,6 @@ $(function(){ ...@@ -761,168 +926,6 @@ $(function(){
} }
}) })
}) })
$.ajax({
url:$ip+'room/enterRoom',
data:{
uid: localStorage.uid,
token: localStorage.token,
roomId: sessionStorage.roomId,
pageID: localStorage.canvasCode,
// pass: true,
},
success:function(data){
console.log('进入直播间', data)
var html=[]
if(data.code==-20060){
alert("您已被移出直播,暫時不能進入")
window.location.href="../index.html"
return;
}
if(data.room.liveScope==3&&data.room.selfLock==0&&localStorage.uid!=sessionStorage.roomId){
$(".room-content").hide()
$(".room-secret").show()
html+='<img src="https://zhibocdn.yabolive.net/comm'+data.room.face.split('?')[0]+'?x-oss-process=image/resize,w_100" alt="">';
html+='<p>'+data.room.roomName+'</p>';
$(".room-secret-mc").html(html)
$(".secret-diamond-box").html('<img src="images/diamond.png" alt="">'+data.room.tollPrice)
$(".room-secret-bg img").attr("src",'https://zhibocdn.yabolive.net/comm'+data.room.face.split('?')[0]+'?x-oss-process=image/resize,w_375')
$(".secret-btn").unbind("click").on("click",function(){
if(localStorage.token==undefined||localStorage.token=='undefined'){
loginPage()
$(".layer-shadow").show()
return;
}
$.ajax({
url:$ip+'room/to/join/buy',
data:{
uid: localStorage.uid,
token: localStorage.token,
roomId: sessionStorage.roomId,
channelId:data.room.channelId,
pageID: localStorage.canvasCode,
},
success:function(data){
console.log('进入付费房购买资格',data)
if(data.code==1){
layer.msg("已付費,即將進入直播間")
setTimeout(function(){
window.location.reload()
},1000)
}else{
layer.msg(data.msg)
}
}
})
})
return;
}
if(data.room.liveState!=1){
$(".room-content").hide()
$(".mc-out-box").show()
var html=''
html+='<img class="room-mc-face" src="https://zhibocdn.yabolive.net/comm'+data.room.face.split('?')[0]+'?x-oss-process=image/resize,w_80" alt="">';
html+='<p class="room-mc-name">'+data.room.nickName+'</p>';
html+='<div class="room-rich-num"><img src="images/man.png" alt="">'+data.room.lookSum+'</div>';
if(data.room.isLike==0)html+='<img class="like-icon" data-type="'+data.room.uid+'" src="images/like-icon.png" alt="">';
$(".mc-out-mcBox").html(html);
$(".room-out-mc-shadow").attr("src","https://zhibocdn.yabolive.net/comm"+data.room.face.split('?')[0]+"?x-oss-process=image/resize,w_300")
$(".like-icon").unbind("click").on("click",function(){
var _self=$(this)
$.ajax({
url:$ip+'room/likeOpt',
data:{
roomId:_self.attr("data-type"),
optType:1,
pass: true,
uid:localStorage.uid,
token:localStorage.token,
pageID: localStorage.canvasCode,
},
success:function(data){
//console.log('關注',data)
if(data.code==1){
_self.hide()
layer.msg('關注成功')
}else{
layer.msg(data.msg)
}
}
})
})
moreMc()
return;
}
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>'
$(".video-box").html(html)
$(".sound-btn").unbind("click").on("click",function(){
var _self=$(this)
if(_self.attr("data-type")==1){
_self.attr("data-type","0")
$(".sound-btn").attr("src","images/sound-no.png")
$(".video-box video").prop("muted",true)
}else {
_self.attr("data-type","1")
$(".sound-btn").attr("src","images/sound-yes.png")
$(".video-box video").prop("muted",false)
}
})
giftList(1)
online()
WebSocketGo()
// object-fit:fill
// console.log($("#myVideo").css("height"))
var html=[];
html+='<img class="room-mc-face" src="https://zhibocdn.yabolive.net/comm'+data.room.face.split('?')[0]+'?x-oss-process=image/resize,w_80" alt="">';
html+='<p class="room-mc-name">'+data.room.nickName+'</p>';
html+='<div class="room-rich-num"><img src="images/man.png" alt="">'+data.room.lookSum+'</div>';
if(data.room.isLike==0)html+='<img class="like-icon" data-type="'+data.room.uid+'" src="images/like-icon.png" alt="">';
$(".room-mc-box").html(html);
$(".hot-list-box").html('<img src="images/hot-icon.png" alt=""><i>'+data.room.hotResult.score+'</i> <span>&gt;</span>')
$(".room-hot-box span").text(data.roomOtherInfo.charm)
$(".room-mc-face").unbind("click").on("click",function(){
layer.open({
type: 2,
title: false,
shadeClose: true,
skin: "yourclass9",
area: ["10rem", dHeight+'px'],
content: '../userRoom.html?tid='+data.room.uid+'',
end: function () {
$(".layui-layer-shade").hide()
layer.closeAll()
}
})
})
$(".like-icon").unbind("click").on("click",function(){
var _self=$(this)
$.ajax({
url:$ip+'room/likeOpt',
data:{
roomId:_self.attr("data-type"),
optType:1,
pass: true,
uid:localStorage.uid,
token:localStorage.token,
pageID: localStorage.canvasCode,
},
success:function(data){
//console.log('關注',data)
if(data.code==1){
_self.hide()
layer.msg('關注成功')
}else{
layer.msg(data.msg)
}
}
})
})
}
})
function moreMc(){ function moreMc(){
$.ajax({ $.ajax({
url:$ip+'frontPage/queryLiveUsers', url:$ip+'frontPage/queryLiveUsers',
......
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