Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
李勇
/
McuClient
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
李勇
8 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
354ad184f9903c3a88d5341c6801f16175bf6dfe
354ad184
1 parent
b19f3cb8
修改webRtc推流失败和拉流失败\设备切换的处理
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
13 行增加
和
10 行删除
src/EngineEntrance.js
src/apes/WebRtcApe.js
src/EngineEntrance.js
查看文件 @
354ad18
...
...
@@ -62,7 +62,7 @@ export default class MessageEntrance extends Emiter {
constructor
()
{
super
();
//sdk 信息
GlobalConfig
.
sdkVersion
=
"v2.8.
7.20170916
"
;
GlobalConfig
.
sdkVersion
=
"v2.8.
8.20170917
"
;
loger
.
warn
(
"sdkVersion:"
+
GlobalConfig
.
sdkVersion
);
//设置
...
...
src/apes/WebRtcApe.js
查看文件 @
354ad18
...
...
@@ -195,15 +195,20 @@ class WebRtcApe extends Emiter {
loger
.
log
(
"添加一个远程视频流: "
+
_stream
.
getId
(),
new
Date
().
getTime
());
this
.
client
.
subscribe
(
_stream
,
(
err
)
=>
{
loger
.
warn
(
"添加一个远程视频流->失败"
,
err
);
clearTimeout
(
this
.
reAddRemoteStreamDelay
);
//
clearTimeout(this.reAddRemoteStreamDelay);
if
(
err
==
"INVALID_REMOTE_STREAM"
){
//流已经无效,不需要再重连
loger
.
warn
(
"流已经无效->不需要再重连"
,
err
);
return
;
}
this
.
reAddRemoteStreamDelay
=
setTimeout
(()
=>
{
loger
.
warn
(
"连接远程的流失败->尝试重新连接"
);
this
.
reAddRemoteStream
(
_stream
);
},
1400
);
if
(
err
==
"PEERCONNECTION_FAILED"
){
//this.reAddRemoteStreamDelay=setTimeout(()=>{
setTimeout
(()
=>
{
loger
.
warn
(
"连接远程的流失败->尝试重新连接"
);
this
.
reAddRemoteStream
(
_stream
);
},
1400
);
}
});
}
...
...
@@ -234,7 +239,7 @@ class WebRtcApe extends Emiter {
this
.
rePublishDelay
=
setTimeout
(()
=>
{
this
.
publish
();
},
1200
);
this
.
publish
();
//
this.publish();
}
else
{
this
.
openLoaclStream
();
}
...
...
@@ -318,7 +323,7 @@ class WebRtcApe extends Emiter {
GlobalConfig
.
openCamera
=
0
;
GlobalConfig
.
openMicrophones
=
0
;
this
.
isPublish
=
false
;
this
.
clearLocalView
();
this
.
unpublish
();
});
this
.
client
.
on
(
'stream-published'
,
(
evt
)
=>
{
loger
.
log
(
"webRtc->推流成功->"
,
new
Date
().
getTime
());
...
...
@@ -354,8 +359,6 @@ class WebRtcApe extends Emiter {
loger
.
log
(
"webRtc->停止推流->失败"
+
err
);
});
this
.
localStream
.
close
();
//$('#localVideoBox_' + this.uid).remove();
//$("#videoOwnerName_"+this.uid).remove();
this
.
clearLocalView
();
this
.
isPublish
=
false
;
GlobalConfig
.
openCamera
=
0
;
...
...
请
注册
或
登录
后发表评论