diff --git a/src/EngineEntrance.js b/src/EngineEntrance.js index 658cb77..3bd043c 100644 --- a/src/EngineEntrance.js +++ b/src/EngineEntrance.js @@ -62,7 +62,7 @@ export default class MessageEntrance extends Emiter { constructor() { super(); //sdk 信息 - GlobalConfig.sdkVersion = "v2.19.8.20171020"; + GlobalConfig.sdkVersion = "v2.20.0.20171021"; loger.warn("sdkVersion:" + GlobalConfig.sdkVersion); //设置 diff --git a/src/RecordPlayBackParse.js b/src/RecordPlayBackParse.js index 66f8fa3..db873c8 100644 --- a/src/RecordPlayBackParse.js +++ b/src/RecordPlayBackParse.js @@ -357,13 +357,11 @@ class RecordPlayBackParse extends Emiter { loger.log('AGOR-获取媒体录制地址信息-完成',ret); /* {"code": 200, "returnData":{ - "data":[ - {channel:"markettest_153452314" - createTime:"1508125785740" - fileUrl:"http://networkschool.xuedianyun.com:8899/20171016/markettest_153452314_033717/125533402_20171016034945745_av.mp4" - timestamp :"1508125785519" - uid:"125533402" } - ] + "data":{ + backFile:[], + fschannefiles:"http://networkschool.xuedianyun.com:8899/20171021/markettest_628050539_053439", + fschannefiles:[] + } } }*/ if(ret&&ret.code==200){ if(ret.returnData&&ret.returnData.data){ @@ -482,21 +480,32 @@ class RecordPlayBackParse extends Emiter { }); } //解析agor录制的视频数据,数组[] - parseAndSavaStreamInfoFromAgor(_dataArr){ - //{channel:"markettest_153452314" - // createTime:"1508125785740" - // fileUrl:"http://networkschool.xuedianyun.com:8899/20171016/markettest_153452314_033717/125533402_20171016034945745_av.mp4" - // timestamp :"1508125785519", - // userId:"T9663", - // uid:"125533402" } - if(!_dataArr){ + parseAndSavaStreamInfoFromAgor(_data){ + //backFile:[ + // { + // "channel": "markettest_628050539", + // "uid": "564077803", + // "userId": "T6342", + // "timestamp": "1508564082837", + // "createTime": "1508564083681", + // "fileUrl": "http://networkschool.xuedianyun.com:8899/20171021/markettest_628050539_053439/564077803_20171021053443568_av.m3u8" + // } + // ],//根据时间戳匹配好的播放地址 + //fschannefiles:"http://networkschool.xuedianyun.com:8899/20171021/markettest_628050539_053439",//文件目录地址 + //fschannefiles:[] //文件列表 + if(!_data){ loger.log("AGOR-外部录制的视频数据无效"); return; } + let backFile=_data.backFile; + if(!backFile){ + loger.log("AGOR-外部录制的视频数据无效->backFile"); + return; + } let item; - loger.log("AGOR-外部录制的视频数据-length="+_dataArr.length) - for(let i=0;i<_dataArr.length;i++){ - item=_dataArr[i]; + loger.log("AGOR-外部录制的视频数据-length="+backFile.length); + for(let i=0;i<backFile.length;i++){ + item=backFile[i]; if(item&&item.fileUrl){ let streamId=item.channel+"_"+item.userId+"_"+item.timestamp; //if(item.fileUrl.indexOf(".m3u8")>0){