Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
李勇
/
McuClient
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
李勇
2017-01-13 11:58:35 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
402fece0a047e6244f1f5a9ff926f1b2d3b41e50
402fece0
1 parent
264b8401
初始化传入参数的值判断,如果传入的参数字段不合法,立即回调初始化失败
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
12 行增加
和
8 行删除
dist/main.js
src/EngineEntrance.js
dist/main.js
查看文件 @
402fece
此 diff 太大无法显示。
src/EngineEntrance.js
查看文件 @
402fece
...
...
@@ -34,6 +34,11 @@ export default class MessageEntrance extends Emiter {
//sdk 信息
this
.
sdkInfo
=
_sdkInfo
;
loger
.
log
(
this
.
sdkInfo
);
this
.
on
(
MessageTypes
.
CLASS_INIT_FAILED
,
this
.
_sassInitFailedHandler
.
bind
(
this
));
this
.
on
(
MessageTypes
.
CLASS_JOIN_FAILED
,
this
.
_joinClassFailureHandler
.
bind
(
this
));
this
.
on
(
MessageTypes
.
DOC_SHOW
,
this
.
docShowHandler
.
bind
(
this
));
// Sass平台层
_sass
=
Sass
;
_sass
.
on
(
'*'
,
(
type
,
data
)
=>
this
.
_emit
(
type
,
data
));
...
...
@@ -47,7 +52,6 @@ export default class MessageEntrance extends Emiter {
_mcu
.
on
(
'*'
,
(
type
,
data
)
=>
this
.
_emit
(
type
,
data
));
_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
();
...
...
@@ -69,7 +73,6 @@ export default class MessageEntrance extends Emiter {
_wb_ape
=
new
WhiteBoardApe
();
_wb_ape
.
on
(
'*'
,
(
type
,
data
)
=>
this
.
_emit
(
type
,
data
));
_wb_ape
.
on
(
MessageTypes
.
ANNO_UPDATE
,
this
.
annoUpdateHandler
.
bind
(
this
));
this
.
on
(
MessageTypes
.
DOC_SHOW
,
this
.
docShowHandler
.
bind
(
this
));
//公开外部调用的方法
this
.
init
=
this
.
_init
;
...
...
@@ -83,17 +86,18 @@ export default class MessageEntrance extends Emiter {
//{"meetingNumber":"1653304953","portal":"112.126.80.182:80","userRole":"normal","userId":0}
//判断传入的参数是否存在
if
(
_param
==
=
null
||
EngineUtils
.
isEmptyObject
(
_param
)){
if
(
_param
==
null
||
EngineUtils
.
isEmptyObject
(
_param
)){
loger
.
log
(
'init初始化失败'
,
MessageTypes
.
ERROR_PARAM
);
this
.
_emit
(
MessageTypes
.
CLASS_INIT_FAILED
,
MessageTypes
.
ERROR_PARAM
);
return
;
}
//判断必要的参数字段值
if
(
_param
.
meetingNumber
===
null
||
isNaN
(
_param
.
meetingNumber
)
||
_param
.
portal
===
null
){
if
(
_param
.
meetingNumber
==
null
||
isNaN
(
_param
.
meetingNumber
)
||
_param
.
portal
==
null
){
loger
.
log
(
'init初始化失败'
,
_param
);
this
.
_emit
(
MessageTypes
.
CLASS_INIT_FAILED
,
MessageTypes
.
ERROR_PARAM
);
return
;
}
loger
.
log
(
'
_
init'
,
_param
);
loger
.
log
(
'init'
,
_param
);
//保存参数
GlobalConfig
.
confId
=
_param
.
meetingNumber
;
GlobalConfig
.
portal
=
_param
.
portal
;
...
...
@@ -110,13 +114,13 @@ export default class MessageEntrance extends Emiter {
_joinClassSuccessCallBackFun
=
_onSuccess
;
_joinClassFailureCallBackFun
=
_onFailure
;
//{"userName":"名字","password":""}
if
(
_param
==
=
null
||
EngineUtils
.
isEmptyObject
(
_param
)){
if
(
_param
==
null
||
EngineUtils
.
isEmptyObject
(
_param
)){
this
.
_emit
(
MessageTypes
.
CLASS_JOIN_FAILED
,
MessageTypes
.
ERROR_PARAM
);
loger
.
log
(
'不能进入会议,传递的参数不对.'
,
_param
);
return
;
}
//判断userName
if
(
_param
.
userName
==
=
null
){
if
(
_param
.
userName
==
null
){
loger
.
log
(
'不能进入会议,传递的参数不对.名字不能为空'
);
this
.
_emit
(
MessageTypes
.
CLASS_JOIN_FAILED
,
MessageTypes
.
ERROR_PARAM
);
return
;
...
...
@@ -156,7 +160,7 @@ export default class MessageEntrance extends Emiter {
// 用meetingNumber向SASS平台获取入会验证信息失败
_sassInitFailedHandler
()
{
loger
.
log
(
'向SASS平台获取入会验证信息失败.'
);
this
.
_emit
(
MessageTypes
.
CLASS_INIT_FAILED
);
//
this._emit(MessageTypes.CLASS_INIT_FAILED);
if
(
_initFailureCallBackFun
){
_initFailureCallBackFun
();
}
...
...
请
注册
或
登录
后发表评论