From ab5df5e13583840514d93ff392a8e40e09cd1ac1 Mon Sep 17 00:00:00 2001
From: liyong <liyong@3mang.com>
Date: Fri, 20 Oct 2017 11:19:11 +0800
Subject: [PATCH] 增加监课自动登录功能
---
src/EngineEntrance.js | 6 +++---
src/apes/WebRtcApe.js | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/EngineEntrance.js b/src/EngineEntrance.js
index 4a965a3..9536a16 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.18.14.20171020";
+ GlobalConfig.sdkVersion = "v2.18.15.20171020";
loger.warn("sdkVersion:" + GlobalConfig.sdkVersion);
//设置
@@ -643,10 +643,10 @@ export default class MessageEntrance extends Emiter {
//loger.log("autoLoginMd5", GlobalConfig.classId, GlobalConfig.userId, GlobalConfig.userRole);
let autoLoginMd5 = MD5("" + GlobalConfig.classId + GlobalConfig.userId + GlobalConfig.userRole);
//loger.log("joinClass-GlobalConfig.autoLogin", GlobalConfig.autoLogin, "autoLoginMd5-", autoLoginMd5);
- if (GlobalConfig.autoLogin && autoLoginMd5 == GlobalConfig.autoLogin) {
+ if (GlobalConfig.autoLogin && autoLoginMd5 == GlobalConfig.autoLogin||GlobalConfig.isInvisible) {
// MD5(classId+userId+userRole)==m
//自动登录，跳过验证流程
- loger.log("自动登录");
+ loger.log("自动登录->"+GlobalConfig.userRole);
this._sassJoinSuccessHandler();
} else {
//不能自动登录，开始校验
diff --git a/src/apes/WebRtcApe.js b/src/apes/WebRtcApe.js
index 5a86d01..f955883 100644
--- a/src/apes/WebRtcApe.js
+++ b/src/apes/WebRtcApe.js
@@ -360,7 +360,7 @@ class WebRtcApe extends Emiter {
}else {
this.videoResolution="360P_8";
}
- }if(GlobalConfig.isInvisible){
+ }else if(GlobalConfig.isInvisible){
this.videoResolution="120P";
}else {
this.videoResolution="240P";
--
libgit2 0.24.0