正在显示
2 个修改的文件
包含
28 行增加
和
19 行删除
| @@ -62,7 +62,7 @@ export default class MessageEntrance extends Emiter { | @@ -62,7 +62,7 @@ export default class MessageEntrance extends Emiter { | ||
| 62 | constructor() { | 62 | constructor() { |
| 63 | super(); | 63 | super(); |
| 64 | //sdk 信息 | 64 | //sdk 信息 |
| 65 | - GlobalConfig.sdkVersion = "v2.19.8.20171020"; | 65 | + GlobalConfig.sdkVersion = "v2.20.0.20171021"; |
| 66 | loger.warn("sdkVersion:" + GlobalConfig.sdkVersion); | 66 | loger.warn("sdkVersion:" + GlobalConfig.sdkVersion); |
| 67 | 67 | ||
| 68 | //设置 | 68 | //设置 |
| @@ -357,13 +357,11 @@ class RecordPlayBackParse extends Emiter { | @@ -357,13 +357,11 @@ class RecordPlayBackParse extends Emiter { | ||
| 357 | loger.log('AGOR-获取媒体录制地址信息-完成',ret); | 357 | loger.log('AGOR-获取媒体录制地址信息-完成',ret); |
| 358 | /* {"code": 200, | 358 | /* {"code": 200, |
| 359 | "returnData":{ | 359 | "returnData":{ |
| 360 | - "data":[ | ||
| 361 | - {channel:"markettest_153452314" | ||
| 362 | - createTime:"1508125785740" | ||
| 363 | - fileUrl:"http://networkschool.xuedianyun.com:8899/20171016/markettest_153452314_033717/125533402_20171016034945745_av.mp4" | ||
| 364 | - timestamp :"1508125785519" | ||
| 365 | - uid:"125533402" } | ||
| 366 | - ] | 360 | + "data":{ |
| 361 | + backFile:[], | ||
| 362 | + fschannefiles:"http://networkschool.xuedianyun.com:8899/20171021/markettest_628050539_053439", | ||
| 363 | + fschannefiles:[] | ||
| 364 | + } | ||
| 367 | } }*/ | 365 | } }*/ |
| 368 | if(ret&&ret.code==200){ | 366 | if(ret&&ret.code==200){ |
| 369 | if(ret.returnData&&ret.returnData.data){ | 367 | if(ret.returnData&&ret.returnData.data){ |
| @@ -482,21 +480,32 @@ class RecordPlayBackParse extends Emiter { | @@ -482,21 +480,32 @@ class RecordPlayBackParse extends Emiter { | ||
| 482 | }); | 480 | }); |
| 483 | } | 481 | } |
| 484 | //解析agor录制的视频数据,数组[] | 482 | //解析agor录制的视频数据,数组[] |
| 485 | - parseAndSavaStreamInfoFromAgor(_dataArr){ | ||
| 486 | - //{channel:"markettest_153452314" | ||
| 487 | - // createTime:"1508125785740" | ||
| 488 | - // fileUrl:"http://networkschool.xuedianyun.com:8899/20171016/markettest_153452314_033717/125533402_20171016034945745_av.mp4" | ||
| 489 | - // timestamp :"1508125785519", | ||
| 490 | - // userId:"T9663", | ||
| 491 | - // uid:"125533402" } | ||
| 492 | - if(!_dataArr){ | 483 | + parseAndSavaStreamInfoFromAgor(_data){ |
| 484 | + //backFile:[ | ||
| 485 | + // { | ||
| 486 | + // "channel": "markettest_628050539", | ||
| 487 | + // "uid": "564077803", | ||
| 488 | + // "userId": "T6342", | ||
| 489 | + // "timestamp": "1508564082837", | ||
| 490 | + // "createTime": "1508564083681", | ||
| 491 | + // "fileUrl": "http://networkschool.xuedianyun.com:8899/20171021/markettest_628050539_053439/564077803_20171021053443568_av.m3u8" | ||
| 492 | + // } | ||
| 493 | + // ],//根据时间戳匹配好的播放地址 | ||
| 494 | + //fschannefiles:"http://networkschool.xuedianyun.com:8899/20171021/markettest_628050539_053439",//文件目录地址 | ||
| 495 | + //fschannefiles:[] //文件列表 | ||
| 496 | + if(!_data){ | ||
| 493 | loger.log("AGOR-外部录制的视频数据无效"); | 497 | loger.log("AGOR-外部录制的视频数据无效"); |
| 494 | return; | 498 | return; |
| 495 | } | 499 | } |
| 500 | + let backFile=_data.backFile; | ||
| 501 | + if(!backFile){ | ||
| 502 | + loger.log("AGOR-外部录制的视频数据无效->backFile"); | ||
| 503 | + return; | ||
| 504 | + } | ||
| 496 | let item; | 505 | let item; |
| 497 | - loger.log("AGOR-外部录制的视频数据-length="+_dataArr.length) | ||
| 498 | - for(let i=0;i<_dataArr.length;i++){ | ||
| 499 | - item=_dataArr[i]; | 506 | + loger.log("AGOR-外部录制的视频数据-length="+backFile.length); |
| 507 | + for(let i=0;i<backFile.length;i++){ | ||
| 508 | + item=backFile[i]; | ||
| 500 | if(item&&item.fileUrl){ | 509 | if(item&&item.fileUrl){ |
| 501 | let streamId=item.channel+"_"+item.userId+"_"+item.timestamp; | 510 | let streamId=item.channel+"_"+item.userId+"_"+item.timestamp; |
| 502 | //if(item.fileUrl.indexOf(".m3u8")>0){ | 511 | //if(item.fileUrl.indexOf(".m3u8")>0){ |
-
请 注册 或 登录 后发表评论