李勇

1.SDK修改音视频模块的推流类型,统一使用live;2.媒体共享模块修复seek值

此 diff 太大无法显示。
... ... @@ -32,7 +32,7 @@ import QuestionApe from 'apes/QuestionApe';
import UTF8 from 'utf-8';
let loger = Loger.getLoger('McuClient');
let _sdkInfo = {"version": "v1.33.2.20170615", "author": "www.3mang.com"};
let _sdkInfo = {"version": "v1.34.2.20170615", "author": "www.3mang.com"};
//APE
let _sass;
... ...
... ... @@ -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;
... ...
... ... @@ -233,7 +233,7 @@ class MediaSharedApe extends Ape {
//更新当前选择的媒体文件数据的字段
pduDataModel.status = paramInfo.status || 0;//默认是0
pduDataModel.seek= paramInfo.status || 1;
pduDataModel.seek= paramInfo.seek || 1;
//loger.log('切换媒体文件,当前媒体文件和上一个显示的媒体文件都需要更新状态');
loger.log({"oldDoc": oldPduDataModel, "nowDoc": pduDataModel});
//更新当前选择的媒体文件
... ...