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
2af2f03fd7da0ec8e360984746fd03b4e65e8f16
2af2f03f
1 parent
41b6c7e0
1.SDK修改音视频模块的推流类型,统一使用live;2.媒体共享模块修复seek值
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
13 行增加
和
13 行删除
dist/McuClient.js
src/EngineEntrance.js
src/apes/MediaModule.js
src/apes/MediaSharedApe.js
dist/McuClient.js
查看文件 @
2af2f03
此 diff 太大无法显示。
src/EngineEntrance.js
查看文件 @
2af2f03
...
...
@@ -32,7 +32,7 @@ import QuestionApe from 'apes/QuestionApe';
import
UTF8
from
'utf-8'
;
let
loger
=
Loger
.
getLoger
(
'McuClient'
);
let
_sdkInfo
=
{
"version"
:
"v1.3
3
.2.20170615"
,
"author"
:
"www.3mang.com"
};
let
_sdkInfo
=
{
"version"
:
"v1.3
4
.2.20170615"
,
"author"
:
"www.3mang.com"
};
//APE
let
_sass
;
...
...
src/apes/MediaModule.js
查看文件 @
2af2f03
...
...
@@ -94,10 +94,10 @@ class MediaModule {
//默认方式推流
let
pubType
=
"live"
;
//flash推流
if
(
_param
&&
_param
.
type
==
"flash"
){
pubType
=
"flash"
;
}
////flash推流
//if(_param&&_param.type=="flash"){
// pubType ="flash";
//}
//端口,有端口就显示 ":xxx",没有端口就是""
let
port
=
(
GlobalConfig
.
MS_PUBLISH_PORT
==
""
||
GlobalConfig
.
MS_PUBLISH_PORT
==
null
)
?
""
:
":"
+
GlobalConfig
.
MS_PUBLISH_PORT
;
...
...
@@ -133,10 +133,10 @@ class MediaModule {
loger
.
log
(
'监课获取推流地址->'
+
freeChannel
+
" mediaLen:"
+
mediaLen
);
//默认方式推流
let
pubType
=
"live"
;
//flash推流
if
(
_param
&&
_param
.
type
==
"flash"
){
pubType
=
"flash"
;
}
////flash推流
//if(_param&&_param.type=="flash"){
// pubType ="flash";
//}
//端口,有端口就显示 ":xxx",没有端口就是""
let
port
=
(
GlobalConfig
.
MS_PUBLISH_PORT
==
""
||
GlobalConfig
.
MS_PUBLISH_PORT
==
null
)
?
""
:
":"
+
GlobalConfig
.
MS_PUBLISH_PORT
;
...
...
@@ -172,11 +172,11 @@ class MediaModule {
let
shareChannel
=
_shareChannel
||
this
.
SCREENSHARING_OBJ_TABLE_ID
;
loger
.
log
(
'桌面共享获取推流地址->'
+
shareChannel
);
//默认方式推流
let
pubType
=
"flash"
;
//flash推流
let
pubType
=
"live"
;
//统一使用live 20170615
/*//flash推流
if(_publishType=="live"){
pubType ="live";
}
}
*/
//端口,有端口就显示 ":xxx",没有端口就是""
let
port
=
(
GlobalConfig
.
MS_PUBLISH_PORT
==
""
||
GlobalConfig
.
MS_PUBLISH_PORT
==
null
)
?
""
:
":"
+
GlobalConfig
.
MS_PUBLISH_PORT
;
...
...
src/apes/MediaSharedApe.js
查看文件 @
2af2f03
...
...
@@ -233,7 +233,7 @@ class MediaSharedApe extends Ape {
//更新当前选择的媒体文件数据的字段
pduDataModel
.
status
=
paramInfo
.
status
||
0
;
//默认是0
pduDataModel
.
seek
=
paramInfo
.
s
tatus
||
1
;
pduDataModel
.
seek
=
paramInfo
.
s
eek
||
1
;
//loger.log('切换媒体文件,当前媒体文件和上一个显示的媒体文件都需要更新状态');
loger
.
log
({
"oldDoc"
:
oldPduDataModel
,
"nowDoc"
:
pduDataModel
});
//更新当前选择的媒体文件
...
...
请
注册
或
登录
后发表评论