From 7d457098b909a5a083319267c133ca4b1e3b1c0c Mon Sep 17 00:00:00 2001
From: liyong <liyong@3mang.com>
Date: Wed, 11 Oct 2017 10:45:02 +0800
Subject: [PATCH] 1.修复录制回放时视频地址的https和http的问题；2.老师的视频区域显示问题，后推的视频排在最前面
---
src/EngineEntrance.js | 2 +-
src/apes/MediaModule.js | 3 +++
src/apes/WebRtcApe.js | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/EngineEntrance.js b/src/EngineEntrance.js
index d54b9da..b92448b 100644
--- a/src/EngineEntrance.js
+++ b/src/EngineEntrance.js
@@ -62,7 +62,7 @@ export default class MessageEntrance extends Emiter {
constructor() {
super();
//sdk 信息
- GlobalConfig.sdkVersion = "v2.15.3.20170929";
+ GlobalConfig.sdkVersion = "v2.15.5.20171001";
loger.warn("sdkVersion:" + GlobalConfig.sdkVersion);
//设置
diff --git a/src/apes/MediaModule.js b/src/apes/MediaModule.js
index 5557f78..32da3a0 100644
--- a/src/apes/MediaModule.js
+++ b/src/apes/MediaModule.js
@@ -106,6 +106,9 @@ class MediaModule {
let streamPlayUrl=MediaModule.streams[_param.streamId]
if(streamPlayUrl){
loger.log("使用外部的流地址->",streamPlayUrl);
+ streamPlayUrl=streamPlayUrl.replace("http://","");
+ streamPlayUrl=streamPlayUrl.replace("https://","");
+ streamPlayUrl=GlobalConfig.locationProtocol+streamPlayUrl;
return {"code": ApeConsts.RETURN_SUCCESS, "data": "", "playUrl":streamPlayUrl};
}
diff --git a/src/apes/WebRtcApe.js b/src/apes/WebRtcApe.js
index c114089..73e889e 100644
--- a/src/apes/WebRtcApe.js
+++ b/src/apes/WebRtcApe.js
@@ -198,7 +198,7 @@ class WebRtcApe extends Emiter {
//把远程视图添加到老师列表
loger.log("获取远程视频流成功->userRole:"+userRole+":" + userName + "->" + uid, new Date().getTime());
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>`;
- $(this.hostRemoteViewId).append(viewDiv);
+ $(this.hostRemoteViewId).prepend(viewDiv);
} else {
//把视图添加到学生列表
loger.log("获取远程视频流成功->学生:" + userName + "->" + uid, new Date().getTime());
--
libgit2 0.24.0