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
6b4ab88336bda3428a98e10881f9b38539e69c8d
6b4ab883
1 parent
b74ac23f
修改媒体共享和伴音模块 默认的音量设置
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
8 行增加
和
10 行删除
src/EngineEntrance.js
src/apes/MediaSharedApe.js
src/apes/MusicSharedApe.js
src/EngineEntrance.js
查看文件 @
6b4ab88
...
...
@@ -35,7 +35,7 @@ import QuestionApe from 'apes/QuestionApe';
import
UTF8
from
'utf-8'
;
let
loger
=
Loger
.
getLoger
(
'McuClient'
);
let
_sdkInfo
=
{
"version"
:
"v1.5
1.0.20170724
"
,
"author"
:
"www.3mang.com"
};
let
_sdkInfo
=
{
"version"
:
"v1.5
2.1.20170726
"
,
"author"
:
"www.3mang.com"
};
//APE
let
_sass
;
...
...
src/apes/MediaSharedApe.js
查看文件 @
6b4ab88
...
...
@@ -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
;
}
...
...
src/apes/MusicSharedApe.js
查看文件 @
6b4ab88
...
...
@@ -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
;
}
...
...
请
注册
或
登录
后发表评论