李勇 / McuClient

转到一个项目
Toggle navigation Toggle navigation pinning
李勇
2af2f03f 1 parent 41b6c7e0

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

内嵌 并排对比
正在显示 4 个修改的文件 包含 13 行增加 和 13 行删除
此 diff 太大无法显示。
@@ -32,7 +32,7 @@ import QuestionApe from 'apes/QuestionApe'; @@ -32,7 +32,7 @@ import QuestionApe from 'apes/QuestionApe';
32 import UTF8 from 'utf-8'; 32 import UTF8 from 'utf-8';
33 33
34 let loger = Loger.getLoger('McuClient'); 34 let loger = Loger.getLoger('McuClient');
35 -let _sdkInfo = {"version": "v1.33.2.20170615", "author": "www.3mang.com"}; 35 +let _sdkInfo = {"version": "v1.34.2.20170615", "author": "www.3mang.com"};
36 36
37 //APE 37 //APE
38 let _sass; 38 let _sass;
@@ -94,10 +94,10 @@ class MediaModule { @@ -94,10 +94,10 @@ class MediaModule {
94 94
95 //默认方式推流 95 //默认方式推流
96 let pubType="live"; 96 let pubType="live";
97 - //flash推流  
98 - if(_param&&_param.type=="flash"){  
99 - pubType ="flash";  
100 - } 97 + ////flash推流
  98 + //if(_param&&_param.type=="flash"){
  99 + // pubType ="flash";
  100 + //}
101 101
102 //端口，有端口就显示 ":xxx",没有端口就是"" 102 //端口，有端口就显示 ":xxx",没有端口就是""
103 let port = (GlobalConfig.MS_PUBLISH_PORT == "" || GlobalConfig.MS_PUBLISH_PORT == null) ? "":":" + GlobalConfig.MS_PUBLISH_PORT; 103 let port = (GlobalConfig.MS_PUBLISH_PORT == "" || GlobalConfig.MS_PUBLISH_PORT == null) ? "":":" + GlobalConfig.MS_PUBLISH_PORT;
@@ -133,10 +133,10 @@ class MediaModule { @@ -133,10 +133,10 @@ class MediaModule {
133 loger.log('监课获取推流地址->'+freeChannel+" mediaLen:"+mediaLen); 133 loger.log('监课获取推流地址->'+freeChannel+" mediaLen:"+mediaLen);
134 //默认方式推流 134 //默认方式推流
135 let pubType="live"; 135 let pubType="live";
136 - //flash推流  
137 - if(_param&&_param.type=="flash"){  
138 - pubType ="flash";  
139 - } 136 + ////flash推流
  137 + //if(_param&&_param.type=="flash"){
  138 + // pubType ="flash";
  139 + //}
140 140
141 //端口，有端口就显示 ":xxx",没有端口就是"" 141 //端口，有端口就显示 ":xxx",没有端口就是""
142 let port = (GlobalConfig.MS_PUBLISH_PORT == "" || GlobalConfig.MS_PUBLISH_PORT == null) ? "":":" + GlobalConfig.MS_PUBLISH_PORT; 142 let port = (GlobalConfig.MS_PUBLISH_PORT == "" || GlobalConfig.MS_PUBLISH_PORT == null) ? "":":" + GlobalConfig.MS_PUBLISH_PORT;
@@ -172,11 +172,11 @@ class MediaModule { @@ -172,11 +172,11 @@ class MediaModule {
172 let shareChannel=_shareChannel||this.SCREENSHARING_OBJ_TABLE_ID; 172 let shareChannel=_shareChannel||this.SCREENSHARING_OBJ_TABLE_ID;
173 loger.log('桌面共享获取推流地址->'+shareChannel); 173 loger.log('桌面共享获取推流地址->'+shareChannel);
174 //默认方式推流 174 //默认方式推流
175 - let pubType="flash";  
176 - //flash推流 175 + let pubType="live";//统一使用live 20170615
  176 + /*//flash推流
177 if(_publishType=="live"){ 177 if(_publishType=="live"){
178 pubType ="live"; 178 pubType ="live";
179 - } 179 + }*/
180 180
181 //端口，有端口就显示 ":xxx",没有端口就是"" 181 //端口，有端口就显示 ":xxx",没有端口就是""
182 let port = (GlobalConfig.MS_PUBLISH_PORT == "" || GlobalConfig.MS_PUBLISH_PORT == null) ? "":":" + GlobalConfig.MS_PUBLISH_PORT; 182 let port = (GlobalConfig.MS_PUBLISH_PORT == "" || GlobalConfig.MS_PUBLISH_PORT == null) ? "":":" + GlobalConfig.MS_PUBLISH_PORT;
@@ -233,7 +233,7 @@ class MediaSharedApe extends Ape { @@ -233,7 +233,7 @@ class MediaSharedApe extends Ape {
233 233
234 //更新当前选择的媒体文件数据的字段 234 //更新当前选择的媒体文件数据的字段
235 pduDataModel.status = paramInfo.status || 0;//默认是0 235 pduDataModel.status = paramInfo.status || 0;//默认是0
236 - pduDataModel.seek= paramInfo.status || 1; 236 + pduDataModel.seek= paramInfo.seek || 1;
237 //loger.log('切换媒体文件，当前媒体文件和上一个显示的媒体文件都需要更新状态'); 237 //loger.log('切换媒体文件，当前媒体文件和上一个显示的媒体文件都需要更新状态');
238 loger.log({"oldDoc": oldPduDataModel, "nowDoc": pduDataModel}); 238 loger.log({"oldDoc": oldPduDataModel, "nowDoc": pduDataModel});
239 //更新当前选择的媒体文件 239 //更新当前选择的媒体文件