From a16b7656516e23c38ae0f6bb7920900306f31323 Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Sat, 27 Aug 2022 11:42:09 +0800
Subject: [PATCH] 测试
---
index.html | 1 -
room/liveRoom.html | 3 ++-
room/videoRoom.html | 57 +++++++++++++++++++++++++++++++--------------------------
3 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/index.html b/index.html
index d0ded96..960b65b 100644
--- a/index.html
+++ b/index.html
@@ -314,7 +314,6 @@ $(function(){
}else{
$(".side-nav").hide()
}
-
})
$(".more-live").on("click",function(){
// $(".neck-nav-ul li").removeClass("neck-nav-li-click")
diff --git a/room/liveRoom.html b/room/liveRoom.html
index d8eab68..774511f 100644
--- a/room/liveRoom.html
+++ b/room/liveRoom.html
@@ -2439,7 +2439,8 @@ $(function () {
function WebSocketGo() {
if ("WebSocket" in window) {
// 打开一个 web socket
- var url = ""+$ws+"ws?uid=" + localStorage.uid + "&token="+localStorage.token+"&roomid=" + sessionStorage.roomId + "&connType=1";
+ if(localStorage.token==undefined||localStorage.token=='undefined')var url = ""+$ws+"ws?uid=" + localStorage.uid + "&token="+localStorage.canvasCode+"&roomid=" + sessionStorage.roomId + "&connType=2";
+ else var url = ""+$ws+"ws?uid=" + localStorage.uid + "&token="+localStorage.token+"&roomid=" + sessionStorage.roomId + "&connType=1";
ws = new WebSocket(url);
ws.onopen = function () {
typeof tHeart!='undefined'&&typeof tHeart!='null'?clearInterval(tHeart):tHeart=null;
diff --git a/room/videoRoom.html b/room/videoRoom.html
index 790a3ea..b717a2c 100644
--- a/room/videoRoom.html
+++ b/room/videoRoom.html
@@ -710,32 +710,37 @@ $(function(){
})
</script>
<script>
- // $.ajax({
- // url:$ip+'frontPage/queryTopics',
- // data:{
- // pageID:localStorage.canvasCode,
- // pageNum:13,
- // type:1,
- // pageSize:500,
- // language:2,
- // tag:'',
- // duration:-1,
- // sort:-1,
- // period:-1,
- // // topicId:localStorage.out
- // },
- // type: 'post',
- // success:function(data){
- // console.log('获取帖子',data)
- // var html=[];
- // for(var i=0;i<data.dataList.length;i++){
- // var list=data.dataList[i];
- // // var videoList=JSON.parse(list.content)
- // html+='https://www.footseen.xyz/room/videoRoom.html?topicId='+list.topicId+'&mark=1<br>'
- // }
- // $(".more-url").html(html);
- // }
- // })
+
+ //17
+ // function addUrl(e){
+ // $.ajax({
+ // url:$ip+'frontPage/queryTopics',
+ // data:{
+ // pageID:localStorage.canvasCode,
+ // pageNum:e,
+ // type:1,
+ // pageSize:500,
+ // language:2,
+ // tag:'',
+ // duration:-1,
+ // sort:-1,
+ // period:-1,
+ // // topicId:localStorage.out
+ // },
+ // type: 'post',
+ // success:function(data){
+ // console.log('获取帖子',data)
+ // var html=[];
+ // for(var i=0;i<data.dataList.length;i++){
+ // var list=data.dataList[i];
+ // // var videoList=JSON.parse(list.content)
+ // html+='https://www.footseen.xyz/room/videoRoom.html?topicId='+list.topicId+'&mark=1<br>'
+ // }
+ // $(".more-url").append(html);
+ // }
+ // })
+ // }
+
</script>
</html>
\ No newline at end of file
--
libgit2 0.25.0