正在显示
2 个修改的文件
包含
12 行增加
和
8 行删除
此 diff 太大无法显示。
| @@ -34,6 +34,11 @@ export default class MessageEntrance extends Emiter { | @@ -34,6 +34,11 @@ export default class MessageEntrance extends Emiter { | ||
| 34 | //sdk 信息 | 34 | //sdk 信息 |
| 35 | this.sdkInfo=_sdkInfo; | 35 | this.sdkInfo=_sdkInfo; |
| 36 | loger.log(this.sdkInfo); | 36 | loger.log(this.sdkInfo); |
| 37 | + | ||
| 38 | + this.on(MessageTypes.CLASS_INIT_FAILED,this._sassInitFailedHandler.bind(this)); | ||
| 39 | + this.on(MessageTypes.CLASS_JOIN_FAILED,this._joinClassFailureHandler.bind(this)); | ||
| 40 | + this.on(MessageTypes.DOC_SHOW, this.docShowHandler.bind(this)); | ||
| 41 | + | ||
| 37 | // Sass平台层 | 42 | // Sass平台层 |
| 38 | _sass = Sass; | 43 | _sass = Sass; |
| 39 | _sass.on('*', (type, data) => this._emit(type, data)); | 44 | _sass.on('*', (type, data) => this._emit(type, data)); |
| @@ -47,7 +52,6 @@ export default class MessageEntrance extends Emiter { | @@ -47,7 +52,6 @@ export default class MessageEntrance extends Emiter { | ||
| 47 | _mcu.on('*', (type, data) => this._emit(type, data)); | 52 | _mcu.on('*', (type, data) => this._emit(type, data)); |
| 48 | _mcu.on(MessageTypes.CLASS_JOIN_SUCCESS, this._joinClassSuccessHandler.bind(this)); | 53 | _mcu.on(MessageTypes.CLASS_JOIN_SUCCESS, this._joinClassSuccessHandler.bind(this)); |
| 49 | 54 | ||
| 50 | - this.on(MessageTypes.CLASS_JOIN_FAILED,this._joinClassFailureHandler.bind(this)); | ||
| 51 | 55 | ||
| 52 | // 注册所有应用Ape | 56 | // 注册所有应用Ape |
| 53 | _confer_ape = new ConferApe(); | 57 | _confer_ape = new ConferApe(); |
| @@ -69,7 +73,6 @@ export default class MessageEntrance extends Emiter { | @@ -69,7 +73,6 @@ export default class MessageEntrance extends Emiter { | ||
| 69 | _wb_ape = new WhiteBoardApe(); | 73 | _wb_ape = new WhiteBoardApe(); |
| 70 | _wb_ape.on('*', (type, data) => this._emit(type, data)); | 74 | _wb_ape.on('*', (type, data) => this._emit(type, data)); |
| 71 | _wb_ape.on(MessageTypes.ANNO_UPDATE, this.annoUpdateHandler.bind(this)); | 75 | _wb_ape.on(MessageTypes.ANNO_UPDATE, this.annoUpdateHandler.bind(this)); |
| 72 | - this.on(MessageTypes.DOC_SHOW, this.docShowHandler.bind(this)); | ||
| 73 | 76 | ||
| 74 | //公开外部调用的方法 | 77 | //公开外部调用的方法 |
| 75 | this.init=this._init; | 78 | this.init=this._init; |
| @@ -83,17 +86,18 @@ export default class MessageEntrance extends Emiter { | @@ -83,17 +86,18 @@ export default class MessageEntrance extends Emiter { | ||
| 83 | 86 | ||
| 84 | //{"meetingNumber":"1653304953","portal":"112.126.80.182:80","userRole":"normal","userId":0} | 87 | //{"meetingNumber":"1653304953","portal":"112.126.80.182:80","userRole":"normal","userId":0} |
| 85 | //判断传入的参数是否存在 | 88 | //判断传入的参数是否存在 |
| 86 | - if(_param===null||EngineUtils.isEmptyObject(_param)){ | 89 | + if(_param==null||EngineUtils.isEmptyObject(_param)){ |
| 87 | loger.log('init初始化失败',MessageTypes.ERROR_PARAM); | 90 | loger.log('init初始化失败',MessageTypes.ERROR_PARAM); |
| 88 | this._emit(MessageTypes.CLASS_INIT_FAILED,MessageTypes.ERROR_PARAM); | 91 | this._emit(MessageTypes.CLASS_INIT_FAILED,MessageTypes.ERROR_PARAM); |
| 89 | return ; | 92 | return ; |
| 90 | } | 93 | } |
| 91 | //判断必要的参数字段值 | 94 | //判断必要的参数字段值 |
| 92 | - if(_param.meetingNumber===null||isNaN(_param.meetingNumber)||_param.portal===null){ | 95 | + if(_param.meetingNumber==null||isNaN(_param.meetingNumber)||_param.portal==null){ |
| 96 | + loger.log('init初始化失败',_param); | ||
| 93 | this._emit(MessageTypes.CLASS_INIT_FAILED,MessageTypes.ERROR_PARAM); | 97 | this._emit(MessageTypes.CLASS_INIT_FAILED,MessageTypes.ERROR_PARAM); |
| 94 | return ; | 98 | return ; |
| 95 | } | 99 | } |
| 96 | - loger.log('_init',_param); | 100 | + loger.log('init',_param); |
| 97 | //保存参数 | 101 | //保存参数 |
| 98 | GlobalConfig.confId=_param.meetingNumber; | 102 | GlobalConfig.confId=_param.meetingNumber; |
| 99 | GlobalConfig.portal=_param.portal; | 103 | GlobalConfig.portal=_param.portal; |
| @@ -110,13 +114,13 @@ export default class MessageEntrance extends Emiter { | @@ -110,13 +114,13 @@ export default class MessageEntrance extends Emiter { | ||
| 110 | _joinClassSuccessCallBackFun=_onSuccess; | 114 | _joinClassSuccessCallBackFun=_onSuccess; |
| 111 | _joinClassFailureCallBackFun=_onFailure; | 115 | _joinClassFailureCallBackFun=_onFailure; |
| 112 | //{"userName":"名字","password":""} | 116 | //{"userName":"名字","password":""} |
| 113 | - if(_param===null||EngineUtils.isEmptyObject(_param)){ | 117 | + if(_param==null||EngineUtils.isEmptyObject(_param)){ |
| 114 | this._emit(MessageTypes.CLASS_JOIN_FAILED,MessageTypes.ERROR_PARAM); | 118 | this._emit(MessageTypes.CLASS_JOIN_FAILED,MessageTypes.ERROR_PARAM); |
| 115 | loger.log('不能进入会议,传递的参数不对.',_param); | 119 | loger.log('不能进入会议,传递的参数不对.',_param); |
| 116 | return ; | 120 | return ; |
| 117 | } | 121 | } |
| 118 | //判断userName | 122 | //判断userName |
| 119 | - if(_param.userName===null){ | 123 | + if(_param.userName==null){ |
| 120 | loger.log('不能进入会议,传递的参数不对.名字不能为空'); | 124 | loger.log('不能进入会议,传递的参数不对.名字不能为空'); |
| 121 | this._emit(MessageTypes.CLASS_JOIN_FAILED,MessageTypes.ERROR_PARAM); | 125 | this._emit(MessageTypes.CLASS_JOIN_FAILED,MessageTypes.ERROR_PARAM); |
| 122 | return ; | 126 | return ; |
| @@ -156,7 +160,7 @@ export default class MessageEntrance extends Emiter { | @@ -156,7 +160,7 @@ export default class MessageEntrance extends Emiter { | ||
| 156 | // 用meetingNumber向SASS平台获取入会验证信息失败 | 160 | // 用meetingNumber向SASS平台获取入会验证信息失败 |
| 157 | _sassInitFailedHandler() { | 161 | _sassInitFailedHandler() { |
| 158 | loger.log('向SASS平台获取入会验证信息失败.'); | 162 | loger.log('向SASS平台获取入会验证信息失败.'); |
| 159 | - this._emit(MessageTypes.CLASS_INIT_FAILED); | 163 | + //this._emit(MessageTypes.CLASS_INIT_FAILED); |
| 160 | if(_initFailureCallBackFun){ | 164 | if(_initFailureCallBackFun){ |
| 161 | _initFailureCallBackFun(); | 165 | _initFailureCallBackFun(); |
| 162 | } | 166 | } |
-
请 注册 或 登录 后发表评论