李勇

1.修复IE 无法打开网页的问题

2.修复录制回放结束后数据没有清空,导致再次重放时白板标注不显示的问题
此 diff 太大无法显示。
... ... @@ -26,7 +26,7 @@ import ArrayBufferUtil from 'libs/ArrayBufferUtil';
import UTF8 from 'utf-8';
let loger = Loger.getLoger('MessageEntrance');
let _sdkInfo = {"version": "v.1.8.0.20170314-1", "author": "www.3mang.com"};
let _sdkInfo = {"version": "v.1.8.1.20170327-5", "author": "www.3mang.com"};
//APE
let _sass;
... ...
... ... @@ -20,14 +20,27 @@ class Loger {
}
initId() {
const infoType = this.sdkInfo.constructor.name.toLowerCase();
if(!this.sdkInfo){
console.log("this.sdkInfo无效-->",this.sdkInfo);
return '';
}
const infoType = Object.prototype.toString.call(this.sdkInfo);
if (infoType === '[object String]') {
return this.sdkInfo;
}
if (infoType === '[object Object]') {
return this.sdkInfo.mid || '';
}
return '';
/* const infoType = this.sdkInfo.constructor.name.toLowerCase();
if (infoType === 'string') {
return this.sdkInfo;
}
if (infoType === 'object') {
return this.sdkInfo.mid || '';
}
return '';
return '';*/
}
log(...msg) {
... ...
... ... @@ -311,12 +311,12 @@ class RecordPlayBackParse extends Emiter {
GlobalConfig.recordPlaybackMaxTime = this._recordPlaybackMaxTime;
loger.log("录制回放数据解析完成,录制回放的总时间长为->", this._recordPlaybackMaxTime);
//console.log("_messages", this._messages);
loger.log("_conferApeMssages", this._conferApeMssages);
loger.log("_chatApeMssages", this._chatApeMssages);
loger.log("_docApeMssages", this._docApeMssages);
loger.log("_whiteApeMssages", this._whiteApeMssages);
loger.log("_videoApeMssages", this._videoApeMssages);
loger.log("_audioApeMssages", this._audioApeMssages);
//loger.log("_conferApeMssages", this._conferApeMssages);
//loger.log("_chatApeMssages", this._chatApeMssages);
//loger.log("_docApeMssages", this._docApeMssages);
//loger.log("_whiteApeMssages", this._whiteApeMssages);
//loger.log("_videoApeMssages", this._videoApeMssages);
//loger.log("_audioApeMssages", this._audioApeMssages);
this._emit(RecordPlayBackParse.CLASS_JOIN_RECORD_PLAYBACK_SUCCESS, {"recordPlaybackMaxTime": this._recordPlaybackMaxTime});
}
... ... @@ -353,6 +353,7 @@ class RecordPlayBackParse extends Emiter {
if (!this._isReady) {
return {"code": ApeConsts.RETURN_FAILED, "data": "录制回放还未准备完成"};
}
console.log("classStatusInfo",GlobalConfig.classStatusInfo);
this._startTimerCounter();
this._emit(MessageTypes.RECORD_PLAYBACK_UPDATE, {"status": PLAY});
}
... ... @@ -361,6 +362,9 @@ class RecordPlayBackParse extends Emiter {
stopRecordPlayback(_param) {
this._stopTimerCounter();
this._recordPlaybackTimestamp = 0;
//把记录的文档信息也要清除
GlobalConfig.activeDocId=0;
GlobalConfig.activeDocCurPage=1;
this._emit(MessageTypes.RECORD_PLAYBACK_UPDATE, {"status": STOP});
}
... ... @@ -379,8 +383,11 @@ class RecordPlayBackParse extends Emiter {
return {"code": ApeConsts.RETURN_FAILED, "data": "参数不正确"};
}
//先暂停,更改进行的时间
this._stopTimerCounter()
this._stopTimerCounter();
this._recordPlaybackTimestamp = _param.time || 0;
//把记录的文档信息也要清除
GlobalConfig.activeDocId=0;
GlobalConfig.activeDocCurPage=1;
//各个ape模块查找关键帧数据
this._searchKeyfram();
... ...
... ... @@ -121,7 +121,10 @@ export default class Ape extends Emiter {
loger.log('REG OBJECT EVENT ->', pdu.id2type(sub_type));
switch (sub_type) {
case pdu.RCPDU_REG_ROSTER_INSERT_PDU:
let rosterInsertData = pdu['RCRegstryRosterInsertItemPdu'].decode(user_data);
//let rosterInsertData = pdu['RCRegstryRosterInsertItemPdu'].decode(user_data);
loger.log('RCPDU_REG_ROSTER_INSERT_PDU---->');
console.log(user_data);
let rosterInsertData = pdu['RCRegistryRosterInsertItemPdu'].decode(user_data);
let rosterInsertItems = rosterInsertData.items;
let rosterInsertItemsLen = rosterInsertItems.length;
for (let i = 0; i < rosterInsertItemsLen; ++i) {
... ...
... ... @@ -493,8 +493,9 @@ class ConferApe extends Ape {
}
rosterInsertHandler(nodeId, nodeData) {
loger.log("rosterInsertHandler--->");
if (GlobalConfig.nodeId == nodeId) {
// loger.log("自己加入 rosterInsertHandler");
} else {
// loger.log("有人加入 rosterInsertHandler");
this.rosterUpdateHandler(nodeId, nodeData);
... ...
... ... @@ -119,7 +119,7 @@ class MCU extends Emiter {
let subTypeLabel = pdu.id2type(pduMsg.subType);
//loger.log('MCU-SecondLayer封装消息', 'sessionId', sessionLabel, pduMsg.sessionId, 'subtype', subTypeLabel, pduMsg.subType);
loger.warn('MCU->收到消息处理->', GlobalConfig.mcuDelay, GlobalConfig.messageDelay);
loger.warn('MCU->收到消息处理->subType->',pduMsg.subType, GlobalConfig.mcuDelay, GlobalConfig.messageDelay);
//延迟处理消息(3个条件--->ape允许延迟&&客户端设置需要延迟&&Sass设置的延迟时间大于0)
if (ape._apeDelayed && GlobalConfig.messageDelay && GlobalConfig.mcuDelay > 0) {
loger.warn('延迟处理消息->', GlobalConfig.mcuDelay);
... ...