李勇

1.修复录制回放时视频地址的https和http的问题;2.老师的视频区域显示问题,后推的视频排在最前面

@@ -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.15.3.20170929"; 65 + GlobalConfig.sdkVersion = "v2.15.5.20171001";
66 loger.warn("sdkVersion:" + GlobalConfig.sdkVersion); 66 loger.warn("sdkVersion:" + GlobalConfig.sdkVersion);
67 67
68 //设置 68 //设置
@@ -106,6 +106,9 @@ class MediaModule { @@ -106,6 +106,9 @@ class MediaModule {
106 let streamPlayUrl=MediaModule.streams[_param.streamId] 106 let streamPlayUrl=MediaModule.streams[_param.streamId]
107 if(streamPlayUrl){ 107 if(streamPlayUrl){
108 loger.log("使用外部的流地址->",streamPlayUrl); 108 loger.log("使用外部的流地址->",streamPlayUrl);
  109 + streamPlayUrl=streamPlayUrl.replace("http://","");
  110 + streamPlayUrl=streamPlayUrl.replace("https://","");
  111 + streamPlayUrl=GlobalConfig.locationProtocol+streamPlayUrl;
109 return {"code": ApeConsts.RETURN_SUCCESS, "data": "", "playUrl":streamPlayUrl}; 112 return {"code": ApeConsts.RETURN_SUCCESS, "data": "", "playUrl":streamPlayUrl};
110 } 113 }
111 114
@@ -198,7 +198,7 @@ class WebRtcApe extends Emiter { @@ -198,7 +198,7 @@ class WebRtcApe extends Emiter {
198 //把远程视图添加到老师列表 198 //把远程视图添加到老师列表
199 loger.log("获取远程视频流成功->userRole:"+userRole+":" + userName + "->" + uid, new Date().getTime()); 199 loger.log("获取远程视频流成功->userRole:"+userRole+":" + userName + "->" + uid, new Date().getTime());
200 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>`; 200 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>`;
201 - $(this.hostRemoteViewId).append(viewDiv); 201 + $(this.hostRemoteViewId).prepend(viewDiv);
202 } else { 202 } else {
203 //把视图添加到学生列表 203 //把视图添加到学生列表
204 loger.log("获取远程视频流成功->学生:" + userName + "->" + uid, new Date().getTime()); 204 loger.log("获取远程视频流成功->学生:" + userName + "->" + uid, new Date().getTime());