正在显示
2 个修改的文件
包含
11 行增加
和
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.8.17.20170918"; | 65 | + GlobalConfig.sdkVersion = "v2.9.0.20170918"; |
| 66 | loger.warn("sdkVersion:" + GlobalConfig.sdkVersion); | 66 | loger.warn("sdkVersion:" + GlobalConfig.sdkVersion); |
| 67 | 67 | ||
| 68 | //设置 | 68 | //设置 |
| @@ -1980,6 +1980,11 @@ export default class MessageEntrance extends Emiter { | @@ -1980,6 +1980,11 @@ export default class MessageEntrance extends Emiter { | ||
| 1980 | userId:GlobalConfig.userId, | 1980 | userId:GlobalConfig.userId, |
| 1981 | openCamera:GlobalConfig.openCamera, | 1981 | openCamera:GlobalConfig.openCamera, |
| 1982 | openMicrophones:GlobalConfig.openMicrophones*/ | 1982 | openMicrophones:GlobalConfig.openMicrophones*/ |
| 1983 | + | ||
| 1984 | + if (!_mcu.connected) { | ||
| 1985 | + loger.warn(GlobalConfig.getCurrentStatus()); | ||
| 1986 | + return {"code": ApeConsts.RETURN_FAILED, "data": ""}; | ||
| 1987 | + } | ||
| 1983 | if (_confer_ape) { | 1988 | if (_confer_ape) { |
| 1984 | _confer_ape.updaterUserDeviecStatusChange(_data); | 1989 | _confer_ape.updaterUserDeviecStatusChange(_data); |
| 1985 | } | 1990 | } |
| @@ -2821,6 +2826,7 @@ export default class MessageEntrance extends Emiter { | @@ -2821,6 +2826,7 @@ export default class MessageEntrance extends Emiter { | ||
| 2821 | loger.log("判断是否能推流->",premission); | 2826 | loger.log("判断是否能推流->",premission); |
| 2822 | if(!premission&&GlobalConfig.userRole!=ApeConsts.invisible){ | 2827 | if(!premission&&GlobalConfig.userRole!=ApeConsts.invisible){ |
| 2823 | loger.warn("不能再打开更多设备"); | 2828 | loger.warn("不能再打开更多设备"); |
| 2829 | + console.log("当前用户列表",GlobalConfig.rosters); | ||
| 2824 | this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_WEBRTC_PUBLISH_FULL); | 2830 | this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_WEBRTC_PUBLISH_FULL); |
| 2825 | return ; | 2831 | return ; |
| 2826 | } | 2832 | } |
| @@ -624,6 +624,10 @@ class ConferApe extends Ape { | @@ -624,6 +624,10 @@ 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.rosters=this.rosters; | ||
| 630 | + | ||
| 627 | this.timerCounter.addTimerCallBack(this.timerCounterUptate.bind(this), 1); | 631 | this.timerCounter.addTimerCallBack(this.timerCounterUptate.bind(this), 1); |
| 628 | this.startTimerCounter(); | 632 | this.startTimerCounter(); |
| 629 | this.startClass(); | 633 | this.startClass(); |
-
请 注册 或 登录 后发表评论