李勇 / McuClient

转到一个项目
Toggle navigation Toggle navigation pinning
李勇
7c9a0bdd 1 parent 7344db64

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 18 行增加 和 9 行删除
@@ -58,7 +58,7 @@ export default class MessageEntrance extends Emiter { @@ -58,7 +58,7 @@ export default class MessageEntrance extends Emiter {
58 constructor() { 58 constructor() {
59 super(); 59 super();
60 //sdk 信息 60 //sdk 信息
61 - GlobalConfig.sdkVersion = "v1.73.1.20170814"; 61 + GlobalConfig.sdkVersion = "v1.73.2.20170814";
62 loger.warn("sdkVersion:" + GlobalConfig.sdkVersion); 62 loger.warn("sdkVersion:" + GlobalConfig.sdkVersion);
63 63
64 //设置 64 //设置
@@ -1559,6 +1559,11 @@ export default class MessageEntrance extends Emiter { @@ -1559,6 +1559,11 @@ export default class MessageEntrance extends Emiter {
1559 let index = parseInt(Math.random() * GlobalConfig.recordList.length); 1559 let index = parseInt(Math.random() * GlobalConfig.recordList.length);
1560 GlobalConfig.RecordServerIP = GlobalConfig.recordList[index].ip || ""; 1560 GlobalConfig.RecordServerIP = GlobalConfig.recordList[index].ip || "";
1561 GlobalConfig.RecordServerPort = GlobalConfig.recordList[index].port || ""; 1561 GlobalConfig.RecordServerPort = GlobalConfig.recordList[index].port || "";
  1562 +
  1563 + if(GlobalConfig.isHttps){
  1564 + //https的时候替换所有80端口
  1565 + GlobalConfig.RecordServerPort= GlobalConfig.replacePort(GlobalConfig.RecordServerPort,"80","");
  1566 + }
1562 } 1567 }
1563 loger.warn('默认->文档服务器地址->.', GlobalConfig.DOCServerIP, GlobalConfig.DOCServerPort); 1568 loger.warn('默认->文档服务器地址->.', GlobalConfig.DOCServerIP, GlobalConfig.DOCServerPort);
1564 loger.warn('默认->录制回放文件下载地址->.', GlobalConfig.RecordServerIP, GlobalConfig.RecordServerPort); 1569 loger.warn('默认->录制回放文件下载地址->.', GlobalConfig.RecordServerIP, GlobalConfig.RecordServerPort);
@@ -252,10 +252,14 @@ class RecordPlayBackParse extends Emiter { @@ -252,10 +252,14 @@ class RecordPlayBackParse extends Emiter {
252 loger.log("读取回放数据"); 252 loger.log("读取回放数据");
253 //let url = `http://123.56.73.119:80/h5dev/20170306/1357644520_20170306.rec`; 253 //let url = `http://123.56.73.119:80/h5dev/20170306/1357644520_20170306.rec`;
254 //let url = `http://${ GlobalConfig.RecordServerIP}:${ GlobalConfig.RecordServerPort}/${GlobalConfig.recordFileName}`; 254 //let url = `http://${ GlobalConfig.RecordServerIP}:${ GlobalConfig.RecordServerPort}/${GlobalConfig.recordFileName}`;
255 - let url = `${GlobalConfig.locationProtocol+ GlobalConfig.RecordServerIP}:${ GlobalConfig.RecordServerPort}/${GlobalConfig.recordFileName}`; 255 + let ipport=GlobalConfig.RecordServerIP;//GlobalConfig.RecordServerPort
  256 + if(GlobalConfig.RecordServerPort){
  257 + ipport=ipport+":"+GlobalConfig.RecordServerPort;
  258 + }
  259 + let url = `${GlobalConfig.locationProtocol+ ipport}/${GlobalConfig.recordFileName}`;
256 loger.log(url); 260 loger.log(url);
257 fetch(url, { 261 fetch(url, {
258 - timeout: 180000 //加载文件超时时间3分 262 + timeout: 240000 //加载文件超时时间4分
259 }) 263 })
260 .then(ret => { 264 .then(ret => {
261 if (ret.ok) { 265 if (ret.ok) {
@@ -535,7 +539,7 @@ class RecordPlayBackParse extends Emiter { @@ -535,7 +539,7 @@ class RecordPlayBackParse extends Emiter {
535 //this._everSocketMsgReceivedHandler(messageItem[i].byteData, 0); 539 //this._everSocketMsgReceivedHandler(messageItem[i].byteData, 0);
536 mssageArr.push(messageItem[i].byteData); 540 mssageArr.push(messageItem[i].byteData);
537 counter++; 541 counter++;
538 - if(counter>30){ 542 + if(counter>40){
539 loger.warn("SEEK->最多处理历史消息30条"); 543 loger.warn("SEEK->最多处理历史消息30条");
540 break; 544 break;
541 } 545 }
@@ -556,7 +560,7 @@ class RecordPlayBackParse extends Emiter { @@ -556,7 +560,7 @@ class RecordPlayBackParse extends Emiter {
556 if(!_apeMessages){ 560 if(!_apeMessages){
557 return; 561 return;
558 } 562 }
559 - //最多30条数据 563 + //最多100条数据
560 let counter=0; 564 let counter=0;
561 let messageItem; 565 let messageItem;
562 for (let i = this._recordPlaybackTimestamp; i > 0; i--) { 566 for (let i = this._recordPlaybackTimestamp; i > 0; i--) {
@@ -566,8 +570,8 @@ class RecordPlayBackParse extends Emiter { @@ -566,8 +570,8 @@ class RecordPlayBackParse extends Emiter {
566 for (let i = 0; i < messageItem.length; i++) { 570 for (let i = 0; i < messageItem.length; i++) {
567 this._everSocketMsgReceivedHandler(messageItem[i].byteData, 0); 571 this._everSocketMsgReceivedHandler(messageItem[i].byteData, 0);
568 counter++; 572 counter++;
569 - if(counter>30){  
570 - loger.warn("SEEK->最多处理历史消息30条"); 573 + if(counter>100){
  574 + loger.warn("SEEK->最多处理历史消息100条");
571 return; 575 return;
572 } 576 }
573 } 577 }
@@ -582,7 +586,7 @@ class RecordPlayBackParse extends Emiter { @@ -582,7 +586,7 @@ class RecordPlayBackParse extends Emiter {
582 let regItems ; 586 let regItems ;
583 let regItemSize ; 587 let regItemSize ;
584 try{ 588 try{
585 - console.log('RCAdapterPdu--->') 589 + //console.log('RCAdapterPdu--->')
586 regPdu = pdu['RCAdapterPdu'].decode(regBuffer); 590 regPdu = pdu['RCAdapterPdu'].decode(regBuffer);
587 regItems = regPdu.item; 591 regItems = regPdu.item;
588 regItemSize = regItems.length; 592 regItemSize = regItems.length;
@@ -668,7 +672,7 @@ class RecordPlayBackParse extends Emiter { @@ -668,7 +672,7 @@ class RecordPlayBackParse extends Emiter {
668 if(sessionId==ApeConsts.VIDEO_SESSION_ID){ 672 if(sessionId==ApeConsts.VIDEO_SESSION_ID){
669 try { 673 try {
670 let videoChannelInfo = pdu['RCVideoChannelInfoPdu'].decode(tableItem.itemData); 674 let videoChannelInfo = pdu['RCVideoChannelInfoPdu'].decode(tableItem.itemData);
671 - loger.log('RCVideoChannelInfoPdu->timestamp',timestamp,videoChannelInfo); 675 + //loger.log('RCVideoChannelInfoPdu->timestamp',timestamp,videoChannelInfo);
672 //储存音视频模块的数据 676 //储存音视频模块的数据
673 if(!this.mediaChannleList[videoChannelInfo.channelId]){ 677 if(!this.mediaChannleList[videoChannelInfo.channelId]){
674 this.mediaChannleList[videoChannelInfo.channelId]={}; 678 this.mediaChannleList[videoChannelInfo.channelId]={};