正在显示
3 个修改的文件
包含
16 行增加
和
16 行删除
| @@ -57,7 +57,7 @@ export default class MessageEntrance extends Emiter { | @@ -57,7 +57,7 @@ export default class MessageEntrance extends Emiter { | ||
| 57 | constructor() { | 57 | constructor() { |
| 58 | super(); | 58 | super(); |
| 59 | //sdk 信息 | 59 | //sdk 信息 |
| 60 | - GlobalConfig.sdkVersion="v1.62.3.20170731"; | 60 | + GlobalConfig.sdkVersion="v1.63.1.20170731"; |
| 61 | loger.warn("sdkVersion:"+GlobalConfig.sdkVersion); | 61 | loger.warn("sdkVersion:"+GlobalConfig.sdkVersion); |
| 62 | 62 | ||
| 63 | //获取设备和系统信息 | 63 | //获取设备和系统信息 |
| @@ -374,9 +374,9 @@ class MediaSharedApe extends Ape { | @@ -374,9 +374,9 @@ class MediaSharedApe extends Ape { | ||
| 374 | GlobalConfig.activeMediaSeek = 1;//当前激活的媒体文件的当前页 | 374 | GlobalConfig.activeMediaSeek = 1;//当前激活的媒体文件的当前页 |
| 375 | loger.log('删除媒体文件数据->清除当前显示的媒体文件'); | 375 | loger.log('删除媒体文件数据->清除当前显示的媒体文件'); |
| 376 | } | 376 | } |
| 377 | - if(this.lastActiveData&&this.lastActiveData.itemIdx== itemIdxs[i]){ | 377 | + /* if(this.lastActiveData&&this.lastActiveData.itemIdx== itemIdxs[i]){ |
| 378 | this.lastActiveData=null; | 378 | this.lastActiveData=null; |
| 379 | - } | 379 | + }*/ |
| 380 | this._emit(MessageTypes.MEDIA_SHARED_DELETE, {"itemIdx": itemIdxs[i]}); | 380 | this._emit(MessageTypes.MEDIA_SHARED_DELETE, {"itemIdx": itemIdxs[i]}); |
| 381 | delete this.mediaSharedList[itemIdxs[i]]; | 381 | delete this.mediaSharedList[itemIdxs[i]]; |
| 382 | } | 382 | } |
| @@ -406,7 +406,8 @@ class MediaSharedApe extends Ape { | @@ -406,7 +406,8 @@ class MediaSharedApe extends Ape { | ||
| 406 | //如果上一次播放的文件和当前播放的文件是同一个,判断一下seek的间隔,如果间隔小于5就不需要再更新数据 | 406 | //如果上一次播放的文件和当前播放的文件是同一个,判断一下seek的间隔,如果间隔小于5就不需要再更新数据 |
| 407 | //首先判断音量值是否发生改变 | 407 | //首先判断音量值是否发生改变 |
| 408 | 408 | ||
| 409 | - if(this.lastActiveData&&this.lastActiveData.status==1){ | 409 | + //应用层自己判断seek,SDK中不再处理 |
| 410 | + /* if(this.lastActiveData&&this.lastActiveData.status==1){ | ||
| 410 | if(getMediaPackFullInfo&& | 411 | if(getMediaPackFullInfo&& |
| 411 | getMediaPackFullInfo.status==1&& | 412 | getMediaPackFullInfo.status==1&& |
| 412 | getMediaPackFullInfo.mediaVolume==this.lastActiveData.mediaVolume){ | 413 | getMediaPackFullInfo.mediaVolume==this.lastActiveData.mediaVolume){ |
| @@ -424,10 +425,12 @@ class MediaSharedApe extends Ape { | @@ -424,10 +425,12 @@ class MediaSharedApe extends Ape { | ||
| 424 | return; | 425 | return; |
| 425 | } | 426 | } |
| 426 | } | 427 | } |
| 427 | - } | 428 | + }*/ |
| 428 | 429 | ||
| 429 | this._emit(MessageTypes.MEDIA_SHARED_UPDATE, getMediaPackFullInfo); | 430 | this._emit(MessageTypes.MEDIA_SHARED_UPDATE, getMediaPackFullInfo); |
| 430 | - if(getMediaPackFullInfo.status==1){ | 431 | + |
| 432 | + //应用层自己判断seek,SDK中不再处理 | ||
| 433 | + /* if(getMediaPackFullInfo.status==1){ | ||
| 431 | this.lastActiveData=getMediaPackFullInfo; | 434 | this.lastActiveData=getMediaPackFullInfo; |
| 432 | this.lastActiveData.time=new Date().getTime(); | 435 | this.lastActiveData.time=new Date().getTime(); |
| 433 | }else{ | 436 | }else{ |
| @@ -435,7 +438,7 @@ class MediaSharedApe extends Ape { | @@ -435,7 +438,7 @@ class MediaSharedApe extends Ape { | ||
| 435 | if( this.lastActiveData&& this.lastActiveData.itemIdx==getMediaPackFullInfo.itemIdx){ | 438 | if( this.lastActiveData&& this.lastActiveData.itemIdx==getMediaPackFullInfo.itemIdx){ |
| 436 | this.lastActiveData=null; | 439 | this.lastActiveData=null; |
| 437 | } | 440 | } |
| 438 | - } | 441 | + }*/ |
| 439 | } else { | 442 | } else { |
| 440 | loger.log('更新媒体文件-> 数据无效--> itemIdx'); | 443 | loger.log('更新媒体文件-> 数据无效--> itemIdx'); |
| 441 | } | 444 | } |
| @@ -402,15 +402,11 @@ class MusicSharedApe extends Ape { | @@ -402,15 +402,11 @@ class MusicSharedApe extends Ape { | ||
| 402 | } | 402 | } |
| 403 | let getMusicPackFullInfo = this._musicSharedPackFullInfo(itemDataInfo); | 403 | let getMusicPackFullInfo = this._musicSharedPackFullInfo(itemDataInfo); |
| 404 | 404 | ||
| 405 | - if(this.lastActiveData&&this.lastActiveData.status==1){ | 405 | + /* if(this.lastActiveData&&this.lastActiveData.status==1){ |
| 406 | if(getMusicPackFullInfo&& | 406 | if(getMusicPackFullInfo&& |
| 407 | getMusicPackFullInfo.status==1&& | 407 | getMusicPackFullInfo.status==1&& |
| 408 | getMusicPackFullInfo.musicVolume==this.lastActiveData.musicVolume){ | 408 | getMusicPackFullInfo.musicVolume==this.lastActiveData.musicVolume){ |
| 409 | - | ||
| 410 | - /* let timeDistance=Math.abs(new Date().getTime()-parseInt(this.lastActiveData.time))/1000; | ||
| 411 | - let seekDistance=Math.abs(getMusicPackFullInfo.seek-this.lastActiveData.seek)-timeDistance; | ||
| 412 | - seekDistance=Math.abs(seekDistance); | ||
| 413 | - */ | 409 | + |
| 414 | let timeDistance=Math.abs(new Date().getTime()-parseInt(this.lastActiveData.time))/1000; | 410 | let timeDistance=Math.abs(new Date().getTime()-parseInt(this.lastActiveData.time))/1000; |
| 415 | let seek2seek=Math.abs(getMusicPackFullInfo.seek-this.lastActiveData.seek) | 411 | let seek2seek=Math.abs(getMusicPackFullInfo.seek-this.lastActiveData.seek) |
| 416 | let seekDistance=seek2seek-timeDistance; | 412 | let seekDistance=seek2seek-timeDistance; |
| @@ -426,10 +422,11 @@ class MusicSharedApe extends Ape { | @@ -426,10 +422,11 @@ class MusicSharedApe extends Ape { | ||
| 426 | return; | 422 | return; |
| 427 | } | 423 | } |
| 428 | } | 424 | } |
| 429 | - } | 425 | + }*/ |
| 430 | 426 | ||
| 431 | this._emit(MessageTypes.MUSIC_SHARED_UPDATE, getMusicPackFullInfo); | 427 | this._emit(MessageTypes.MUSIC_SHARED_UPDATE, getMusicPackFullInfo); |
| 432 | - if(getMusicPackFullInfo.status==1){ | 428 | + |
| 429 | + /* if(getMusicPackFullInfo.status==1){ | ||
| 433 | this.lastActiveData=getMusicPackFullInfo; | 430 | this.lastActiveData=getMusicPackFullInfo; |
| 434 | this.lastActiveData.time=new Date().getTime(); | 431 | this.lastActiveData.time=new Date().getTime(); |
| 435 | }else{ | 432 | }else{ |
| @@ -437,7 +434,7 @@ class MusicSharedApe extends Ape { | @@ -437,7 +434,7 @@ class MusicSharedApe extends Ape { | ||
| 437 | if( this.lastActiveData&& this.lastActiveData.itemIdx==getMusicPackFullInfo.itemIdx){ | 434 | if( this.lastActiveData&& this.lastActiveData.itemIdx==getMusicPackFullInfo.itemIdx){ |
| 438 | this.lastActiveData=null; | 435 | this.lastActiveData=null; |
| 439 | } | 436 | } |
| 440 | - } | 437 | + }*/ |
| 441 | } else { | 438 | } else { |
| 442 | loger.log('更新伴音文件-> 数据无效--> itemIdx', itemIdx); | 439 | loger.log('更新伴音文件-> 数据无效--> itemIdx', itemIdx); |
| 443 | } | 440 | } |
-
请 注册 或 登录 后发表评论