李勇

修改对外接口的参数,简化应用层调用的步骤;

获取MCUClient ->init ->joinClass
此 diff 太大无法显示。
... ... @@ -13,7 +13,6 @@ import GlobalConfig from 'GlobalConfig';
let loger = Loger.getLoger('MessageEntrance');
let _sdkInfo={"version":"v1.0.0","author":"www.3mang.com"};
let _confInfo={};//存储入会数据
let _sass;
let _mcu ;
... ... @@ -23,6 +22,12 @@ let _video_ape;
let _doc_ape;
let _wb_ape;
let _initSuccessCallBackFun;
let _initFailureCallBackFun;
let _joinClassSuccessCallBackFun;
let _joinClassFailureCallBackFun;
export default class MessageEntrance extends Emiter {
constructor() {
super();
... ... @@ -32,15 +37,17 @@ export default class MessageEntrance extends Emiter {
// Sass平台层
_sass = Sass;
_sass.on('*', (type, data) => this._emit(type, data));
_sass.on(_sass.SUCCESS, this._h5SassSuccessHandler.bind(this));
_sass.on(_sass.CLASS_INIT_SUCCESS, this._h5SassInitSuccessHandler.bind(this));
_sass.on(_sass.CLASS_INIT_FAILED, this._h5SassInitFailedHandler.bind(this));
_sass.on(_sass.SUCCESS, this._sassVerifySuccessHandler.bind(this));
_sass.on(_sass.CLASS_INIT_SUCCESS, this._sassInitSuccessHandler.bind(this));
_sass.on(_sass.CLASS_INIT_FAILED, this._sassInitFailedHandler.bind(this));
_sass.on(_sass.CLASS_GET_MEETING_PARAM,this._h5SassGetMeetingParaSuccessHandler);
// 底层MCU消息层
_mcu = Mcu;
_mcu.on('*', (type, data) => this._emit(type, data));
_mcu.on(MessageTypes.CLASS_JOIN_SUCCESS, this._conferenceJoinSuccessHandler.bind(this));
_mcu.on(MessageTypes.CLASS_JOIN_SUCCESS, this._joinClassSuccessHandler.bind(this));
this.on(MessageTypes.CLASS_JOIN_FAILED,this._joinClassFailureHandler.bind(this));
// 注册所有应用Ape
_confer_ape = new ConferApe();
... ... @@ -70,9 +77,10 @@ export default class MessageEntrance extends Emiter {
this.sendChatMsg=this._sendChatMsg;
this.setDebugData=this._setDebugData;
}
_init(_param,_onSuccess,_onFailure){
_initSuccessCallBackFun=_onSuccess;
_initFailureCallBackFun=_onFailure;
//初始化,根据课堂号和角色类型获取登录验证时需要的基本信息
_init(_param) {
//{"meetingNumber":"1653304953","portal":"112.126.80.182:80","userRole":"normal","userId":0}
//判断传入的参数是否存在
if(_param===null||EngineUtils.isEmptyObject(_param)){
... ... @@ -94,13 +102,13 @@ export default class MessageEntrance extends Emiter {
//获取课堂校验信息
if(_sass){
//_sass.sassGetJoinParams(_param);
_sass.sassGetJoinParams(GlobalConfig.getConfInfo());
}
}
}
// 进入会议
_joinClass(_param) {
_joinClass(_param,_onSuccess,_onFailure){
_joinClassSuccessCallBackFun=_onSuccess;
_joinClassFailureCallBackFun=_onFailure;
//{"userName":"名字","password":""}
if(_param===null||EngineUtils.isEmptyObject(_param)){
this._emit(MessageTypes.CLASS_JOIN_FAILED,MessageTypes.ERROR_PARAM);
... ... @@ -119,11 +127,9 @@ export default class MessageEntrance extends Emiter {
//开始校验
if(_sass){
// _sass.sassChecking(_confInfo);
_sass.sassChecking(GlobalConfig.getConfInfo());
}
}
// 离开会议
leaveClass() {
if(_mcu){
... ... @@ -131,7 +137,7 @@ export default class MessageEntrance extends Emiter {
}
}
// 用meetingNumber向SASS平台获取入会验证信息成功
_h5SassInitSuccessHandler(_data) {
_sassInitSuccessHandler(_data) {
//{"siteId":"h5test","passwordRequired":true,"md5":"de399d5540b3da2fbc1eb0a770d4fd66","code":0,"msType":1}
if(_data){
GlobalConfig.md5=_data.md5||"";//这个暂时用假数据,后台接口写完就有数据了
... ... @@ -141,12 +147,19 @@ export default class MessageEntrance extends Emiter {
}
loger.log('向SASS平台获取入会验证信息成功.');
this._emit(MessageTypes.CLASS_INIT_SUCCESS,_data);
if(_initSuccessCallBackFun){
_initSuccessCallBackFun(_data);
}
}
// 用meetingNumber向SASS平台获取入会验证信息失败
_h5SassInitFailedHandler() {
_sassInitFailedHandler() {
loger.log('向SASS平台获取入会验证信息失败.');
this._emit(MessageTypes.CLASS_INIT_FAILED);
if(_initFailureCallBackFun){
_initFailureCallBackFun();
}
}
//使用固定的假数据
... ... @@ -156,10 +169,9 @@ export default class MessageEntrance extends Emiter {
}
// 通过SASS平台验证
_h5SassSuccessHandler(_data) {
_sassVerifySuccessHandler(_data) {
loger.log('加入底层MCU会议.');
if(_mcu){
//_mcu.joinMCU(_confInfo);
_mcu.joinMCU(GlobalConfig.getConfInfo());
}
}
... ... @@ -171,13 +183,24 @@ export default class MessageEntrance extends Emiter {
}
// MCU 会议成功
_conferenceJoinSuccessHandler() {
_joinClassSuccessHandler() {
loger.log('MCU 会议成功.');
if(_sass){
_sass.getClassDetail();//会议信息
_sass.getMeetingParam();//会议参数大全
}
if(_joinClassSuccessCallBackFun){
_joinClassSuccessCallBackFun();
}
}
// MCU 会议失败
_joinClassFailureHandler(_data){
loger.log("_joinClassFailureHandler",_data);
if(_joinClassFailureCallBackFun){
_joinClassFailureCallBackFun(_data);
}
}
// 参会处理
conferenceHandler(msg_type) {
var msg = {
... ...
... ... @@ -110,12 +110,13 @@ class Sass extends Emiter {
.then(ret => {
if (ret === 'false') {
loger.error(`会议密码校验-失败.`);
return this._emit(MessageTypes.CLASS_JOIN_FAILED,MessageTypes.ERROR_CLASS_PASSWORD_WRONG);
this._emit(MessageTypes.CLASS_JOIN_FAILED,MessageTypes.ERROR_CLASS_PASSWORD_WRONG);
return ;
}
if (ret === 'true') {
loger.log(`会议密码校验-成功.`);
this.sendMD5Checking();
return
return;
}
loger.error(`会议密码校验-协议异常.`);
this._emit(MessageTypes.CLASS_JOIN_FAILED,MessageTypes.ERROR_CLASS_PROTOCOL_WRONG);
... ...