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
7d457098b909a5a083319267c133ca4b1e3b1c0c
7d457098
1 parent
283bfd10
1.修复录制回放时视频地址的https和http的问题;2.老师的视频区域显示问题,后推的视频排在最前面
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
5 行增加
和
2 行删除
src/EngineEntrance.js
src/apes/MediaModule.js
src/apes/WebRtcApe.js
src/EngineEntrance.js
查看文件 @
7d45709
...
...
@@ -62,7 +62,7 @@ export default class MessageEntrance extends Emiter {
constructor
()
{
super
();
//sdk 信息
GlobalConfig
.
sdkVersion
=
"v2.15.
3.20170929
"
;
GlobalConfig
.
sdkVersion
=
"v2.15.
5.20171001
"
;
loger
.
warn
(
"sdkVersion:"
+
GlobalConfig
.
sdkVersion
);
//设置
...
...
src/apes/MediaModule.js
查看文件 @
7d45709
...
...
@@ -106,6 +106,9 @@ class MediaModule {
let
streamPlayUrl
=
MediaModule
.
streams
[
_param
.
streamId
]
if
(
streamPlayUrl
){
loger
.
log
(
"使用外部的流地址->"
,
streamPlayUrl
);
streamPlayUrl
=
streamPlayUrl
.
replace
(
"http://"
,
""
);
streamPlayUrl
=
streamPlayUrl
.
replace
(
"https://"
,
""
);
streamPlayUrl
=
GlobalConfig
.
locationProtocol
+
streamPlayUrl
;
return
{
"code"
:
ApeConsts
.
RETURN_SUCCESS
,
"data"
:
""
,
"playUrl"
:
streamPlayUrl
};
}
...
...
src/apes/WebRtcApe.js
查看文件 @
7d45709
...
...
@@ -198,7 +198,7 @@ class WebRtcApe extends Emiter {
//把远程视图添加到老师列表
loger
.
log
(
"获取远程视频流成功->userRole:"
+
userRole
+
":"
+
userName
+
"->"
+
uid
,
new
Date
().
getTime
());
let
viewDiv
=
`
<
div
id
=
"${this.xdyRemote + uid}"
class
=
"${this.hostWebRtcVideoClass}"
style
=
"width:${this.hostRemoteVideoWidth*this.videoScale}px;height:${this.hostRemoteVideoHeight*this.videoScale}px;float: left;margin-right: 1px;pointer-events: none;"
>
$
{
nameDiv
}
<
/div>`
;
$
(
this
.
hostRemoteViewId
).
ap
pend
(
viewDiv
);
$
(
this
.
hostRemoteViewId
).
pre
pend
(
viewDiv
);
}
else
{
//把视图添加到学生列表
loger
.
log
(
"获取远程视频流成功->学生:"
+
userName
+
"->"
+
uid
,
new
Date
().
getTime
());
...
...
请
注册
或
登录
后发表评论