Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
libai
/
footseen-large-website
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
a700269d
authored
a year ago
by
libai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试
parent
16806c37
master
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
8 deletions
mobile/room/liveRoom.html
mobile/videoPage.html
room/liveRoom.html
mobile/room/liveRoom.html
View file @
a700269d
...
...
@@ -2577,8 +2577,8 @@ $(function(){
function
WebSocketGo
()
{
if
(
"WebSocket"
in
window
)
{
// 打开一个 web socket
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"
;
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
+
"
"
;
ws
=
new
WebSocket
(
url
);
ws
.
onopen
=
function
()
{
typeof
tHeart
!=
'undefined'
&&
typeof
tHeart
!=
'null'
?
clearInterval
(
tHeart
):
tHeart
=
null
;
...
...
This diff is collapsed.
Click to expand it.
mobile/videoPage.html
View file @
a700269d
...
...
@@ -469,7 +469,6 @@ $(function(){
var
html
=
[];
for
(
var
i
=
0
;
i
<
data
.
roomList
.
length
;
i
++
){
var
list
=
data
.
roomList
[
i
]
console
.
log
(
list
.
roomId
)
html
+=
'
<
a
href
=
"room/liveRoom.html?roomId='+list.roomId+'"
><
div
class
=
"live-box"
>
';
html+='
<
div
class
=
"live-face-box"
><
img
src
=
"https://zhibocdn.yabolive.net/comm'+list.face.split('?')[0]+'?x-oss-process=image/resize,w_180"
alt
=
""
><
/div>'
;
html
+=
'
<
div
class
=
"live-box-name"
>
'+list.nickname+'
<
/div>'
;
...
...
This diff is collapsed.
Click to expand it.
room/liveRoom.html
View file @
a700269d
...
...
@@ -1590,12 +1590,9 @@ $(function () {
reuseRedirectedURL
:
true
,
//重用301/302重定向url,用于随后的请求,如查找、重新连接等。
autoCleanupSourceBuffer
:
true
//自动清除缓存
});
flvPlayer2
.
attachMediaElement
(
videoElement2
);
flvPlayer2
.
load
();
//加载
flvPlayer2
.
play
()
}
}
...
...
@@ -2583,8 +2580,8 @@ $(function () {
function
WebSocketGo
()
{
if
(
"WebSocket"
in
window
)
{
// 打开一个 web socket
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"
;
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
+
"
"
;
ws
=
new
WebSocket
(
url
);
ws
.
onopen
=
function
()
{
typeof
tHeart
!=
'undefined'
&&
typeof
tHeart
!=
'null'
?
clearInterval
(
tHeart
):
tHeart
=
null
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment