Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
李勇
/
McuClient
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
李勇
8 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
100f8d663f054ea297a5639fad1c47911d396a7f
100f8d66
1 parent
82393cdc
1.媒体共享和伴音模块不再处理seek的间隔问题,由应用层各自处理
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
16 行增加
和
16 行删除
src/EngineEntrance.js
src/apes/MediaSharedApe.js
src/apes/MusicSharedApe.js
src/EngineEntrance.js
查看文件 @
100f8d6
...
...
@@ -57,7 +57,7 @@ export default class MessageEntrance extends Emiter {
constructor
()
{
super
();
//sdk 信息
GlobalConfig
.
sdkVersion
=
"v1.6
2.3
.20170731"
;
GlobalConfig
.
sdkVersion
=
"v1.6
3.1
.20170731"
;
loger
.
warn
(
"sdkVersion:"
+
GlobalConfig
.
sdkVersion
);
//获取设备和系统信息
...
...
src/apes/MediaSharedApe.js
查看文件 @
100f8d6
...
...
@@ -374,9 +374,9 @@ class MediaSharedApe extends Ape {
GlobalConfig
.
activeMediaSeek
=
1
;
//当前激活的媒体文件的当前页
loger
.
log
(
'删除媒体文件数据->清除当前显示的媒体文件'
);
}
if
(
this
.
lastActiveData
&&
this
.
lastActiveData
.
itemIdx
==
itemIdxs
[
i
]){
/*
if(this.lastActiveData&&this.lastActiveData.itemIdx== itemIdxs[i]){
this.lastActiveData=null;
}
}
*/
this
.
_emit
(
MessageTypes
.
MEDIA_SHARED_DELETE
,
{
"itemIdx"
:
itemIdxs
[
i
]});
delete
this
.
mediaSharedList
[
itemIdxs
[
i
]];
}
...
...
@@ -406,7 +406,8 @@ class MediaSharedApe extends Ape {
//如果上一次播放的文件和当前播放的文件是同一个,判断一下seek的间隔,如果间隔小于5就不需要再更新数据
//首先判断音量值是否发生改变
if
(
this
.
lastActiveData
&&
this
.
lastActiveData
.
status
==
1
){
//应用层自己判断seek,SDK中不再处理
/* if(this.lastActiveData&&this.lastActiveData.status==1){
if(getMediaPackFullInfo&&
getMediaPackFullInfo.status==1&&
getMediaPackFullInfo.mediaVolume==this.lastActiveData.mediaVolume){
...
...
@@ -424,10 +425,12 @@ class MediaSharedApe extends Ape {
return;
}
}
}
}
*/
this
.
_emit
(
MessageTypes
.
MEDIA_SHARED_UPDATE
,
getMediaPackFullInfo
);
if
(
getMediaPackFullInfo
.
status
==
1
){
//应用层自己判断seek,SDK中不再处理
/* if(getMediaPackFullInfo.status==1){
this.lastActiveData=getMediaPackFullInfo;
this.lastActiveData.time=new Date().getTime();
}else{
...
...
@@ -435,7 +438,7 @@ class MediaSharedApe extends Ape {
if( this.lastActiveData&& this.lastActiveData.itemIdx==getMediaPackFullInfo.itemIdx){
this.lastActiveData=null;
}
}
}
*/
}
else
{
loger
.
log
(
'更新媒体文件-> 数据无效--> itemIdx'
);
}
...
...
src/apes/MusicSharedApe.js
查看文件 @
100f8d6
...
...
@@ -402,15 +402,11 @@ class MusicSharedApe extends Ape {
}
let
getMusicPackFullInfo
=
this
.
_musicSharedPackFullInfo
(
itemDataInfo
);
if
(
this
.
lastActiveData
&&
this
.
lastActiveData
.
status
==
1
){
/*
if(this.lastActiveData&&this.lastActiveData.status==1){
if(getMusicPackFullInfo&&
getMusicPackFullInfo.status==1&&
getMusicPackFullInfo.musicVolume==this.lastActiveData.musicVolume){
/* let timeDistance=Math.abs(new Date().getTime()-parseInt(this.lastActiveData.time))/1000;
let seekDistance=Math.abs(getMusicPackFullInfo.seek-this.lastActiveData.seek)-timeDistance;
seekDistance=Math.abs(seekDistance);
*/
let timeDistance=Math.abs(new Date().getTime()-parseInt(this.lastActiveData.time))/1000;
let seek2seek=Math.abs(getMusicPackFullInfo.seek-this.lastActiveData.seek)
let seekDistance=seek2seek-timeDistance;
...
...
@@ -426,10 +422,11 @@ class MusicSharedApe extends Ape {
return;
}
}
}
}
*/
this
.
_emit
(
MessageTypes
.
MUSIC_SHARED_UPDATE
,
getMusicPackFullInfo
);
if
(
getMusicPackFullInfo
.
status
==
1
){
/* if(getMusicPackFullInfo.status==1){
this.lastActiveData=getMusicPackFullInfo;
this.lastActiveData.time=new Date().getTime();
}else{
...
...
@@ -437,7 +434,7 @@ class MusicSharedApe extends Ape {
if( this.lastActiveData&& this.lastActiveData.itemIdx==getMusicPackFullInfo.itemIdx){
this.lastActiveData=null;
}
}
}
*/
}
else
{
loger
.
log
(
'更新伴音文件-> 数据无效--> itemIdx'
,
itemIdx
);
}
...
...
请
注册
或
登录
后发表评论