From 54fb684d1a251cd78192f62fae7a54e5d944194c Mon Sep 17 00:00:00 2001
From: liyong <liyong@3mang.com>
Date: Mon, 18 Sep 2017 19:33:44 +0800
Subject: [PATCH] 每次加入会议模块之后，需要清除之前的用户列表数据，否则断线重连之后会存在之前的人员数据
---
src/EngineEntrance.js | 8 +++++++-
src/apes/ConferApe.js | 4 ++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/EngineEntrance.js b/src/EngineEntrance.js
index 2bed652..82085f6 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.8.17.20170918";
+ GlobalConfig.sdkVersion = "v2.9.0.20170918";
loger.warn("sdkVersion:" + GlobalConfig.sdkVersion);
//设置
@@ -1980,6 +1980,11 @@ export default class MessageEntrance extends Emiter {
userId:GlobalConfig.userId,
openCamera:GlobalConfig.openCamera,
openMicrophones:GlobalConfig.openMicrophones*/
+
+ if (!_mcu.connected) {
+ loger.warn(GlobalConfig.getCurrentStatus());
+ return {"code": ApeConsts.RETURN_FAILED, "data": ""};
+ }
if (_confer_ape) {
_confer_ape.updaterUserDeviecStatusChange(_data);
}
@@ -2821,6 +2826,7 @@ export default class MessageEntrance extends Emiter {
loger.log("判断是否能推流->",premission);
if(!premission&&GlobalConfig.userRole!=ApeConsts.invisible){
loger.warn("不能再打开更多设备");
+ console.log("当前用户列表",GlobalConfig.rosters);
this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_WEBRTC_PUBLISH_FULL);
return ;
}
diff --git a/src/apes/ConferApe.js b/src/apes/ConferApe.js
index ff2849d..f295c6e 100644
--- a/src/apes/ConferApe.js
+++ b/src/apes/ConferApe.js
@@ -624,6 +624,10 @@ class ConferApe extends Ape {
return;
}
loger.log('课堂模块初始完成->当前课堂状态:'+ GlobalConfig.classStatus,"recordStatus:"+GlobalConfig.recordStatus);
+ this.rosters={};
+ this.rosterLen=0;
+ GlobalConfig.rosters=this.rosters;
+
this.timerCounter.addTimerCallBack(this.timerCounterUptate.bind(this), 1);
this.startTimerCounter();
this.startClass();
--
libgit2 0.24.0