李勇

1.修复老师的视频显示到学生区域的问题,原因是收到视频的时候用户列表中查找不到用户信息,所以按学生的处理

@@ -62,7 +62,7 @@ export default class MessageEntrance extends Emiter { @@ -62,7 +62,7 @@ export default class MessageEntrance extends Emiter {
62 constructor() { 62 constructor() {
63 super(); 63 super();
64 //sdk 信息 64 //sdk 信息
65 - GlobalConfig.sdkVersion = "v2.10.4.20170920"; 65 + GlobalConfig.sdkVersion = "v2.10.5.20170920";
66 loger.warn("sdkVersion:" + GlobalConfig.sdkVersion); 66 loger.warn("sdkVersion:" + GlobalConfig.sdkVersion);
67 67
68 //设置 68 //设置
@@ -1291,8 +1291,11 @@ export default class MessageEntrance extends Emiter { @@ -1291,8 +1291,11 @@ export default class MessageEntrance extends Emiter {
1291 1291
1292 //加入课堂成功,广播消息 1292 //加入课堂成功,广播消息
1293 this._emit(MessageTypes.CLASS_JOIN_SUCCESS, joinClassSuccessCallBackData); 1293 this._emit(MessageTypes.CLASS_JOIN_SUCCESS, joinClassSuccessCallBackData);
1294 - //加入音视频通话模块 1294 +
  1295 + setTimeout(()=>{
  1296 + //加入音视频通话模块,延迟一秒处理,因为视频需要根据用户列表信息来判断放的位置,太早的话用户列表没有数据
1295 this._joinChannel({channelId:GlobalConfig.channelId,channelKey:GlobalConfig.channelKey ,uid:GlobalConfig.userUid,info:""+GlobalConfig.userRole}); 1297 this._joinChannel({channelId:GlobalConfig.channelId,channelKey:GlobalConfig.channelKey ,uid:GlobalConfig.userUid,info:""+GlobalConfig.userRole});
  1298 + },1000);
1296 } 1299 }
1297 1300
1298 //切换MCU ->_param->{reConnect:false} //reConnect(是否立即替换当前的ip并且重新连接) 1301 //切换MCU ->_param->{reConnect:false} //reConnect(是否立即替换当前的ip并且重新连接)
@@ -624,11 +624,6 @@ class ConferApe extends Ape { @@ -624,11 +624,6 @@ class ConferApe extends Ape {
624 return; 624 return;
625 } 625 }
626 loger.log('课堂模块初始完成->当前课堂状态:'+ GlobalConfig.classStatus,"recordStatus:"+GlobalConfig.recordStatus); 626 loger.log('课堂模块初始完成->当前课堂状态:'+ GlobalConfig.classStatus,"recordStatus:"+GlobalConfig.recordStatus);
627 - this.rosters={};  
628 - this.rosterLen=0;  
629 - GlobalConfig.rosterNumber=this.rosterLen;  
630 - GlobalConfig.rosters=this.rosters;  
631 -  
632 this.timerCounter.addTimerCallBack(this.timerCounterUptate.bind(this), 1); 627 this.timerCounter.addTimerCallBack(this.timerCounterUptate.bind(this), 1);
633 this.startTimerCounter(); 628 this.startTimerCounter();
634 this.startClass(); 629 this.startClass();
@@ -1239,6 +1234,12 @@ class ConferApe extends Ape { @@ -1239,6 +1234,12 @@ class ConferApe extends Ape {
1239 } 1234 }
1240 return null; 1235 return null;
1241 } 1236 }
  1237 + stopApe(){
  1238 + this.rosters={};
  1239 + this.rosterLen=0;
  1240 + GlobalConfig.rosterNumber=this.rosterLen;
  1241 + GlobalConfig.rosters=this.rosters;
  1242 + }
1242 1243
1243 } 1244 }
1244 1245
@@ -218,7 +218,7 @@ class WebRtcApe extends Emiter { @@ -218,7 +218,7 @@ class WebRtcApe extends Emiter {
218 let userName=""; 218 let userName="";
219 let userRole="" 219 let userRole=""
220 if(user){ 220 if(user){
221 - userName=user.name||""; 221 + userName=user.name||"unknow";
222 userRole=user.userRole; 222 userRole=user.userRole;
223 } 223 }
224 let nameDiv=`<div style="width:98%;height:20px; position: absolute; z-index: 1;left: 4px;overflow:hidden;font-size: 14px; color: #cccccc;display:${this.nameDisplay}">${userName}</div>`; 224 let nameDiv=`<div style="width:98%;height:20px; position: absolute; z-index: 1;left: 4px;overflow:hidden;font-size: 14px; color: #cccccc;display:${this.nameDisplay}">${userName}</div>`;
@@ -245,7 +245,7 @@ class WebRtcApe extends Emiter { @@ -245,7 +245,7 @@ class WebRtcApe extends Emiter {
245 stream.play(this.xdyRemote + stream.getId()); 245 stream.play(this.xdyRemote + stream.getId());
246 }catch (err){ 246 }catch (err){
247 } 247 }
248 - if(user.deviceType==1||user.deviceType==2){ 248 + if(user&&(user.deviceType==1||user.deviceType==2)){
249 this.remoteVideoList[user.nodeId]=stream; 249 this.remoteVideoList[user.nodeId]=stream;
250 } 250 }
251 console.log("移动端远程视频流集合->",this.remoteVideoList); 251 console.log("移动端远程视频流集合->",this.remoteVideoList);