李勇

第三方消息通道消息测试通过

此 diff 太大无法显示。
... ... @@ -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;
... ...
... ... @@ -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-----------------------------------------
... ...
... ... @@ -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);
}
}
... ...