From 6b4ab88336bda3428a98e10881f9b38539e69c8d Mon Sep 17 00:00:00 2001
From: liyong <liyong@3mang.com>
Date: Wed, 26 Jul 2017 16:33:18 +0800
Subject: [PATCH] 修改媒体共享和伴音模块 默认的音量设置
---
src/EngineEntrance.js | 2 +-
src/apes/MediaSharedApe.js | 8 +++-----
src/apes/MusicSharedApe.js | 8 ++++----
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/EngineEntrance.js b/src/EngineEntrance.js
index ed2cf9e..354b818 100644
--- a/src/EngineEntrance.js
+++ b/src/EngineEntrance.js
@@ -35,7 +35,7 @@ import QuestionApe from 'apes/QuestionApe';
import UTF8 from 'utf-8';
let loger = Loger.getLoger('McuClient');
-let _sdkInfo = { "version": "v1.51.0.20170724", "author": "www.3mang.com" };
+let _sdkInfo = { "version": "v1.52.1.20170726", "author": "www.3mang.com" };
//APE
let _sass;
diff --git a/src/apes/MediaSharedApe.js b/src/apes/MediaSharedApe.js
index c18a704..c07d88b 100644
--- a/src/apes/MediaSharedApe.js
+++ b/src/apes/MediaSharedApe.js
@@ -273,7 +273,7 @@ class MediaSharedApe extends Ape {
//更新当前选择的媒体文件数据的字段
pduDataModel.status = 0;//默认是0
pduDataModel.seek=0;
- pduDataModel.mediaVolume=60;
+ //pduDataModel.mediaVolume=60;
//更新当前选择的媒体文件
this.updaterMediaShared(pduDataModel, pduDataModel.itemIdx);
}
@@ -520,10 +520,8 @@ class MediaSharedApe extends Ape {
pduDataModel.fileId = _param.fileId || "";//媒体文件在服务器数据库中的唯一id,必须有
pduDataModel.fileName = _param.fileName || "media_" + _itemIdx;//媒体文件的名字
pduDataModel.seek= parseInt(_param.seek) ||1;
- pduDataModel.mediaVolume=parseInt(_param.mediaVolume);
- if(! pduDataModel.mediaVolume){
- pduDataModel.mediaVolume=60;
- }
+ pduDataModel.mediaVolume=parseInt(_param.mediaVolume)||0;
+
return pduDataModel;
}
diff --git a/src/apes/MusicSharedApe.js b/src/apes/MusicSharedApe.js
index 0757d94..177be33 100644
--- a/src/apes/MusicSharedApe.js
+++ b/src/apes/MusicSharedApe.js
@@ -275,7 +275,7 @@ class MusicSharedApe extends Ape {
//更新当前选择的伴音文件数据的字段
pduDataModel.status = 0; //默认是0
pduDataModel.seek = 0;
- pduDataModel.musicVolume = 60;
+ //pduDataModel.musicVolume = 60;
//更新当前选择的伴音文件
this.updaterMusicShared(pduDataModel, pduDataModel.itemIdx);
}
@@ -518,10 +518,10 @@ class MusicSharedApe extends Ape {
pduDataModel.fileId = _param.fileId || ""; //伴音文件在服务器数据库中的唯一id,必须有
pduDataModel.fileName = _param.fileName || "music_" + _itemIdx; //伴音文件的名字
pduDataModel.seek = parseInt(_param.seek) || 1;
- pduDataModel.musicVolume = parseInt(_param.musicVolume);
- if (!pduDataModel.musicVolume) {
+ pduDataModel.musicVolume = parseInt(_param.musicVolume)||0;
+ /* if (!pduDataModel.musicVolume) {
pduDataModel.musicVolume = 60;
- }
+ }*/
return pduDataModel;
}
--
libgit2 0.24.0