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
1b7531cd64fceb6b5ecf0d2b219d87f1d7c4d70d
1b7531cd
1 parent
0c6e02f3
第三方消息通道消息测试通过
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
14 行增加
和
7 行删除
dist/McuClient.js
src/EngineEntrance.js
src/apes/ConferApe.js
src/apes/ThirdMessage.js
dist/McuClient.js
查看文件 @
1b7531c
此 diff 太大无法显示。
src/EngineEntrance.js
查看文件 @
1b7531c
...
...
@@ -29,7 +29,7 @@ import MediaModule from 'apes/MediaModule';
import
UTF8
from
'utf-8'
;
let
loger
=
Loger
.
getLoger
(
'McuClient'
);
let
_sdkInfo
=
{
"version"
:
"v1.29.
2
.20170601"
,
"author"
:
"www.3mang.com"
};
let
_sdkInfo
=
{
"version"
:
"v1.29.
7
.20170601"
,
"author"
:
"www.3mang.com"
};
//APE
let
_sass
;
...
...
src/apes/ConferApe.js
查看文件 @
1b7531c
...
...
@@ -608,9 +608,9 @@ class ConferApe extends Ape {
//const recordInfo = pdu['RCWhiteboardDataRequestPdu'].decode(pdu);
//loger.log("conferMsgComingHandler",recordInfo);
var
chatReceivePdu
=
pdu
[
'RCConferenceSendDataRequestPdu'
].
decode
(
_data
);
let
chatReceivePdu
=
pdu
[
'RCConferenceSendDataRequestPdu'
].
decode
(
_data
);
var
chatMsg
=
{};
let
chatMsg
=
{};
chatMsg
.
fromNodeID
=
chatReceivePdu
.
initiator
;
chatMsg
.
toNodeID
=
chatReceivePdu
.
peer
;
chatMsg
.
message
=
this
.
_rCArrayBufferUtil
.
uint8ArrayToStr
(
chatReceivePdu
.
userData
,
2
);
...
...
@@ -643,6 +643,7 @@ class ConferApe extends Ape {
//收到父级页面的消息,需要广播发送出去
onThirdReciveParentMessage
(
_msg
){
loger
.
log
(
'收到页面的消息->广播给其他模块->'
,
_msg
);
this
.
sendThirdBroadcastData
({
to
:
0
,
message
:
_msg
});
}
//发送第三方广播消息
sendThirdBroadcastData
(
_param
){
...
...
@@ -659,7 +660,7 @@ class ConferApe extends Ape {
let
thirdBroadcastSendPdu
=
new
pdu
[
'RCThirdSendBroadcastDataRequestPdu'
];
thirdBroadcastSendPdu
.
type
=
pdu
.
RCPDU_THIRD_BROADCAST_DATA_REQUEST
;
thirdBroadcastSendPdu
.
initiator
=
this
.
_classInfo
.
nodeId
;
//发起人
thirdBroadcastSendPdu
.
peer
=
parseInt
(
_param
.
to
);
//发送给谁,公聊的时候是0,私聊的时候是指定的用户id
thirdBroadcastSendPdu
.
peer
=
parseInt
(
_param
.
to
)
||
0
;
//发送给谁,公聊的时候是0,私聊的时候是指定的用户id
thirdBroadcastSendPdu
.
isPublic
=
true
;
thirdBroadcastSendPdu
.
message
=
this
.
_rCArrayBufferUtil
.
strToUint8Array
(
"h5"
+
_param
.
message
);
...
...
@@ -676,12 +677,16 @@ class ConferApe extends Ape {
//监听第三方消息通道消息
onThirdBroadcastDataHandler
(
_data
){
//loger.log("监听第三方消息通道消息->",_data);
var
thirdBroadcastReceivePdu
=
pdu
[
'RCThirdSendBroadcastDataRequestPdu'
].
decode
(
_data
);
var
thirdMessage
=
{};
let
thirdBroadcastReceivePdu
=
pdu
[
'RCThirdSendBroadcastDataRequestPdu'
].
decode
(
_data
);
let
thirdMessage
=
{};
thirdMessage
.
fromNodeID
=
thirdBroadcastReceivePdu
.
initiator
;
thirdMessage
.
toNodeID
=
thirdBroadcastReceivePdu
.
peer
;
thirdMessage
.
message
=
this
.
_rCArrayBufferUtil
.
uint8ArrayToStr
(
thirdBroadcastReceivePdu
.
userData
,
2
);
//loger.log("监听第三方消息通道消息->1", thirdMessage);
thirdMessage
.
message
=
this
.
_rCArrayBufferUtil
.
uint8ArrayToStr
(
thirdBroadcastReceivePdu
.
message
,
2
);
loger
.
log
(
"监听第三方消息通道消息->"
,
thirdMessage
);
if
(
this
.
thirdMessage
){
this
.
thirdMessage
.
sendMessageToParent
(
thirdMessage
.
message
);
}
}
//------------------第三方消息 end-----------------------------------------
...
...
src/apes/ThirdMessage.js
查看文件 @
1b7531c
...
...
@@ -21,7 +21,9 @@ class ThirdMessage extends Emiter{
message: 'sdk->hello world',
}
this.messenger.send(JSON.stringify(jsonObj));*/
if
(
this
.
messenger
){
loger
.
log
(
'发送消息给父级页面->'
,
_msg
);
this
.
messenger
.
send
(
_msg
);
}
}
...
...
请
注册
或
登录
后发表评论