李勇

1.修改https和http情况下录制服务器80端口的问题;2.白板标注seek时获取最近100条数据

... ... @@ -58,7 +58,7 @@ export default class MessageEntrance extends Emiter {
constructor() {
super();
//sdk 信息
GlobalConfig.sdkVersion = "v1.73.1.20170814";
GlobalConfig.sdkVersion = "v1.73.2.20170814";
loger.warn("sdkVersion:" + GlobalConfig.sdkVersion);
//设置
... ... @@ -1559,6 +1559,11 @@ export default class MessageEntrance extends Emiter {
let index = parseInt(Math.random() * GlobalConfig.recordList.length);
GlobalConfig.RecordServerIP = GlobalConfig.recordList[index].ip || "";
GlobalConfig.RecordServerPort = GlobalConfig.recordList[index].port || "";
if(GlobalConfig.isHttps){
//https的时候替换所有80端口
GlobalConfig.RecordServerPort= GlobalConfig.replacePort(GlobalConfig.RecordServerPort,"80","");
}
}
loger.warn('默认->文档服务器地址->.', GlobalConfig.DOCServerIP, GlobalConfig.DOCServerPort);
loger.warn('默认->录制回放文件下载地址->.', GlobalConfig.RecordServerIP, GlobalConfig.RecordServerPort);
... ...
... ... @@ -252,10 +252,14 @@ class RecordPlayBackParse extends Emiter {
loger.log("读取回放数据");
//let url = `http://123.56.73.119:80/h5dev/20170306/1357644520_20170306.rec`;
//let url = `http://${ GlobalConfig.RecordServerIP}:${ GlobalConfig.RecordServerPort}/${GlobalConfig.recordFileName}`;
let url = `${GlobalConfig.locationProtocol+ GlobalConfig.RecordServerIP}:${ GlobalConfig.RecordServerPort}/${GlobalConfig.recordFileName}`;
let ipport=GlobalConfig.RecordServerIP;//GlobalConfig.RecordServerPort
if(GlobalConfig.RecordServerPort){
ipport=ipport+":"+GlobalConfig.RecordServerPort;
}
let url = `${GlobalConfig.locationProtocol+ ipport}/${GlobalConfig.recordFileName}`;
loger.log(url);
fetch(url, {
timeout: 180000 //加载文件超时时间3
timeout: 240000 //加载文件超时时间4
})
.then(ret => {
if (ret.ok) {
... ... @@ -535,7 +539,7 @@ class RecordPlayBackParse extends Emiter {
//this._everSocketMsgReceivedHandler(messageItem[i].byteData, 0);
mssageArr.push(messageItem[i].byteData);
counter++;
if(counter>30){
if(counter>40){
loger.warn("SEEK->最多处理历史消息30条");
break;
}
... ... @@ -556,7 +560,7 @@ class RecordPlayBackParse extends Emiter {
if(!_apeMessages){
return;
}
//最多30条数据
//最多100条数据
let counter=0;
let messageItem;
for (let i = this._recordPlaybackTimestamp; i > 0; i--) {
... ... @@ -566,8 +570,8 @@ class RecordPlayBackParse extends Emiter {
for (let i = 0; i < messageItem.length; i++) {
this._everSocketMsgReceivedHandler(messageItem[i].byteData, 0);
counter++;
if(counter>30){
loger.warn("SEEK->最多处理历史消息30条");
if(counter>100){
loger.warn("SEEK->最多处理历史消息100条");
return;
}
}
... ... @@ -582,7 +586,7 @@ class RecordPlayBackParse extends Emiter {
let regItems ;
let regItemSize ;
try{
console.log('RCAdapterPdu--->')
//console.log('RCAdapterPdu--->')
regPdu = pdu['RCAdapterPdu'].decode(regBuffer);
regItems = regPdu.item;
regItemSize = regItems.length;
... ... @@ -668,7 +672,7 @@ class RecordPlayBackParse extends Emiter {
if(sessionId==ApeConsts.VIDEO_SESSION_ID){
try {
let videoChannelInfo = pdu['RCVideoChannelInfoPdu'].decode(tableItem.itemData);
loger.log('RCVideoChannelInfoPdu->timestamp',timestamp,videoChannelInfo);
//loger.log('RCVideoChannelInfoPdu->timestamp',timestamp,videoChannelInfo);
//储存音视频模块的数据
if(!this.mediaChannleList[videoChannelInfo.channelId]){
this.mediaChannleList[videoChannelInfo.channelId]={};
... ...