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
李勇
8 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f1fa1f49f530afcee98e23777c71f8723827e700
f1fa1f49
1 parent
1d11a47c
修改ChatApe方法的参数为对象
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
56 行增加
和
9 行删除
dist/main.js
src/Emiter.js
src/EngineEntrance.js
src/Sass.js
src/apes/ChatApe.js
dist/main.js
查看文件 @
f1fa1f4
此 diff 太大无法显示。
src/Emiter.js
查看文件 @
f1fa1f4
...
...
@@ -27,7 +27,6 @@ export default class Emiter {
if
(
eid
)
{
//eid=* broadcast
let
asteriskStub
=
this
.
MAPS
[
'*'
];
console
.
log
(
"asteriskStub"
);
if
(
asteriskStub
&&
asteriskStub
.
length
)
{
asteriskStub
.
forEach
(
function
(
elistener
)
{
elistener
(
eid
,
data
);
...
...
src/EngineEntrance.js
查看文件 @
f1fa1f4
...
...
@@ -97,7 +97,8 @@ export default class MessageEntrance extends Emiter {
// MCU 会议成功
_conferenceJoinSuccessHandler
()
{
if
(
sass
){
sass
.
getClassDetail
();
sass
.
getClassDetail
();
//会议信息
sass
.
getMeetingParm
();
//会议参数大全
}
}
// 参会处理
...
...
@@ -109,11 +110,22 @@ export default class MessageEntrance extends Emiter {
this
.
_emit
(
msg
.
type
,
msg
);
}
// 发送聊天消息
_sendChatMsg
(
to
,
msg
)
{
/*
_sendChatMsg(to, msg) {
if (chat_ape) {
chat_ape.sendChatMsg(to, msg);
}
}*/
_sendChatMsg
(
_messageInfo
)
{
if
(
_messageInfo
===
null
||
EngineUtils
.
isEmptyObject
(
_messageInfo
)){
loger
.
log
(
'sendChatMsg 传递的参数不对'
,
_messageInfo
);
return
;
}
if
(
chat_ape
)
{
chat_ape
.
sendChatMsg
(
_messageInfo
);
}
}
// 白板笔记更新
annoUpdateHandler
(
annoInfo
)
{
const
activeDocId
=
confer_ape
.
activeDocId
;
...
...
src/Sass.js
查看文件 @
f1fa1f4
...
...
@@ -100,7 +100,6 @@ class Sass extends Emiter {
.
catch
(
err
=>
{
loger
.
error
(
`
H5SassMD5
校验
-
异常
.
状态码
:
$
{
err
}
`
);
this
.
_emit
(
MessageTypes
.
NET_ERROR
);
console
.
log
(
"aaaaaaaaaaaaaaaaaaa"
);
});
}
...
...
@@ -136,6 +135,41 @@ class Sass extends Emiter {
this
.
_emit
(
MessageTypes
.
NET_ERROR
);
});
}
getMeetingParm
(){
console
.
log
(
"getMeetingParm------------------------"
);
//http://112.126.80.182/3m/meeting/getMeetingParam.do?meetingNumber=1653304953
//let url = `http://${confInfo.portal}/3m/meeting/getClassH5.do?classNumber=${confInfo.confId}`;
let
url
=
`
http
:
//${confInfo.portal}/3m/meeting/getMeetingParam.do?meetingNumber=${confInfo.confId}&device=flashplayer`;
loger
.
log
(
'H5Sass获取MeetingParam.'
,
url
);
fetch
(
url
,
{
timeout
:
5000
,
mode
:
'no-cors'
})
.
then
(
ret
=>
{
if
(
ret
.
ok
)
{
return
ret
.
json
();
}
else
{
loger
.
error
(
`
H5Sass
获取
MeetingParam
-
网络异常
.
状态码
:
$
{
ret
.
status
}
`
);
this
.
_emit
(
MessageTypes
.
NET_ERROR
);
throw
''
;
}
})
.
then
(
ret
=>
{
if
(
ret
.
errorCode
===
0
)
{
loger
.
log
(
'H5Sass获取MeetingParam完成'
);
this
.
_emit
(
MessageTypes
.
CONFERENCE_SHOW_DETAIL
,
ret
);
}
else
{
loger
.
warn
(
'H5Sass获取MeetingParam失败.'
);
this
.
_emit
(
MessageTypes
.
NET_ERROR
);
}
})
.
catch
(
err
=>
{
loger
.
error
(
`
H5Sass
获取
MeetingParam
异常
.
状态码
:
$
{
err
}
`
);
this
.
_emit
(
MessageTypes
.
NET_ERROR
);
});
}
}
Sass
.
prototype
.
SUCCESS
=
Sass
.
SUCCESS
=
'h5sass.success'
;
...
...
src/apes/ChatApe.js
查看文件 @
f1fa1f4
...
...
@@ -42,19 +42,21 @@ class ChatApe extends Ape {
}
sendChatMsg
(
to
,
message
)
{
sendChatMsg
(
_messageInfo
)
{
if
(
this
.
_confInfo
===
null
||
EngineUtils
.
isEmptyObject
(
this
.
_confInfo
)){
loger
.
log
(
'
发送聊天消息.'
,
to
,
message
,
"Engine 还未初始化数据!"
);
loger
.
log
(
'
不能发送聊天消息.McuClient还未初始化数据!'
);
return
;
}
loger
.
log
(
'发送聊天消息.'
,
to
,
message
);
// to, message
loger
.
log
(
'发送聊天消息.'
,
_messageInfo
.
to
,
_messageInfo
.
message
);
let
chatSendPdu
=
new
pdu
[
'RCChatSendDataRequestPdu'
];
chatSendPdu
.
type
=
pdu
.
RCPDU_CHAT_SEND_DATA_REQUEST
;
chatSendPdu
.
initiator
=
this
.
_confInfo
.
nodeId
;
//发起人
chatSendPdu
.
peer
=
to
;
//发送给谁
chatSendPdu
.
peer
=
_messageInfo
.
to
;
//发送给谁,公聊的时候是0,私聊的时候是指定的用户id
chatSendPdu
.
isPublic
=
true
;
chatSendPdu
.
userData
=
this
.
_rCArrayBufferUtil
.
strToUint8Array
(
"h5"
+
message
);
chatSendPdu
.
userData
=
this
.
_rCArrayBufferUtil
.
strToUint8Array
(
"h5"
+
_messageInfo
.
message
);
chatSendPdu
.
fromName
=
this
.
_rCArrayBufferUtil
.
strToUint8Array
(
"h5"
+
this
.
_confInfo
.
userName
);
chatSendPdu
.
fromRole
=
this
.
_confInfo
.
classRole
;
if
(
!
(
chatSendPdu
.
isPublic
||
0
===
chatSendPdu
.
peer
))
{
...
...
请
注册
或
登录
后发表评论