Skip to content

Commit 5321409

Browse files
liuwenlongliuwenlong
committed
1.修改bottomMenu为透明
2.修改Settings中USB Setting的位置
1 parent 92aa44b commit 5321409

14 files changed

+22
-23
lines changed

‎apps/player/ChosenView.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ namespace mango
161161
{
162162
log_i("MediaView::onPaint");
163163
Environment::drawWallpaper(canvas);
164-
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,false);
165-
canvas.drawImageResource(IDP_BACKGROUND_BOTTOM, 0, 211, false);
164+
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,true);
165+
canvas.drawImageResource(IDP_BACKGROUND_BOTTOM, 0, 211, true);
166166
return 0;
167167
}
168168

‎apps/player/DisplaySettingView.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ namespace mango
105105
{
106106
log_i("MediaView::onPaint");
107107
Environment::drawWallpaper(canvas);
108-
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,false);
108+
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,true);
109109
return 0;
110110
}
111111

‎apps/player/EqSettingView.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ namespace mango
198198
{
199199
log_i("MediaView::onPaint");
200200
Environment::drawWallpaper(canvas);
201-
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,false);
202-
canvas.drawImageResource(IDP_BACKGROUND_BOTTOM, 0, 211, false);
201+
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,true);
202+
canvas.drawImageResource(IDP_BACKGROUND_BOTTOM, 0, 211, true);
203203
return 0;
204204
}
205205

‎apps/player/GroupOperateView.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ namespace mango
121121
{
122122
log_i("MediaView::onPaint");
123123
Environment::drawWallpaper(canvas);
124-
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,false);
124+
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,true);
125125
return 0;
126126
}
127127

‎apps/player/MusicInfoView.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ namespace mango
296296
{
297297
log_i("MediaView::onPaint");
298298
Environment::drawWallpaper(canvas);
299-
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,false);
299+
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,true);
300300
log_i("MediaView::onPaint complete");
301301
return 0;
302302
}

‎apps/player/MusicOperateView.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ namespace mango
135135
{
136136
log_i("MediaView::onPaint");
137137
Environment::drawWallpaper(canvas);
138-
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,false);
138+
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,true);
139139
return 0;
140140
}
141141

‎apps/player/PlaylistOperateView.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ namespace mango
121121
{
122122
log_i("MediaView::onPaint");
123123
Environment::drawWallpaper(canvas);
124-
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,false);
124+
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,true);
125125
return 0;
126126
}
127127

‎apps/player/PowerManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ namespace mango
104104
log_i("atuoPoweroffCount=%d,mForcePowerOffTimeCount=%d,isUsmCon=%d,isMediaScanning=%d,isPlaying=%d\
105105
,poweroffTime=%d,mForcePowerOffTime=%d",atuoPoweroffCount,mForcePowerOffTimeCount,gPlayer.mPlayingView->isUsmCon,
106106
gPlayer.mPlayingView->isMediaScanning,mPlayinglist->isPlaying(),poweroffTime,mForcePowerOffTime);
107-
#endif
107+
#endif
108108
}
109109

110110
void PowerManager::resetCount(){

‎apps/player/SettingsView.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ namespace mango
124124
{
125125
log_i("MediaView::onPaint");
126126
Environment::drawWallpaper(canvas);
127-
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,false);
127+
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,true);
128128
return 0;
129129
}
130130

@@ -158,9 +158,9 @@ namespace mango
158158
setMainState(0x1400);
159159
}
160160
void SettingsView::initMainList(){
161-
int img[]={IDP_SETTING_EQ,IDP_SETTING_PLAYORDER,IDP_SETTING_GAPLESS,IDP_SETTING_MUSICINFO,IDP_SETTING_ADVANCED,IDB_DUSBOTG_ICON};
162-
int imgsec[]={IDP_SETTING_EQ_S,IDP_SETTING_PLAYORDER_S,IDP_SETTING_GAPLESS_S,IDP_SETTING_MUSICINFO_S,IDP_SETTING_ADVANCED_S,IDB_DUSBOTG_ICON};
163-
int text[]={STR_SETTING_EQ,STR_SETTING_PLAYOODER,STR_SETTING_GAPLESS,STR_SETTING_MUSICINFO,STR_SETTING_ADVANCED,STR_USB_CONECT_SETTING};
161+
int img[]={IDP_SETTING_EQ,IDP_SETTING_PLAYORDER,IDP_SETTING_GAPLESS,IDP_SETTING_MUSICINFO,IDB_DUSBOTG_ICON,IDP_SETTING_ADVANCED};
162+
int imgsec[]={IDP_SETTING_EQ_S,IDP_SETTING_PLAYORDER_S,IDP_SETTING_GAPLESS_S,IDP_SETTING_MUSICINFO_S,IDB_DUSBOTG_ICON,IDP_SETTING_ADVANCED_S};
163+
int text[]={STR_SETTING_EQ,STR_SETTING_PLAYOODER,STR_SETTING_GAPLESS,STR_SETTING_MUSICINFO,STR_USB_CONECT_SETTING,STR_SETTING_ADVANCED};
164164
int i,count = sizeof(img)/sizeof(int);
165165

166166
mListView->deleteAllItems();
@@ -375,9 +375,9 @@ namespace mango
375375
initGaplessList(); break;
376376
case 3:
377377
gPlayer.showMusicInfoView(mPlayinglist->getPlayingItem()); break;
378-
case 4:
379-
initAdvanceList(); break;
380378
case 5:
379+
initAdvanceList(); break;
380+
case 4:
381381
initUSBSettingList(); break;
382382
}
383383
break;

‎apps/player/SystemInfoView.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ namespace mango
173173
{
174174
log_i("MediaView::onPaint");
175175
Environment::drawWallpaper(canvas);
176-
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,false);
176+
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,true);
177177

178178
return 0;
179179
}

‎apps/player/mediaView.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ namespace mango
277277

278278

279279
Environment::drawWallpaper(canvas);
280-
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,false);
280+
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,true);
281281
return 0;
282282
}
283283

‎apps/player/player.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#define ARRAY_LIST_NUM 100
4949
#define CONVERT_UTF8
5050
#define ES9018_VOLUME "/sys/class/codec/es9018_volume"
51-
#define CODEC_VOLUME 0
51+
#define CODEC_VOLUME 1
5252

5353
namespace mango
5454
{

‎apps/player/playingView.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,8 @@ namespace mango
444444
Brush brush(ARGB(100,25, 25, 25));
445445
//log_i("PlayingView::onPaint");
446446
Environment::drawWallpaper(canvas);
447-
rect.setEx(0, 0, 320, 21);
448-
canvas.fillRect(rect, brush);
449-
canvas.drawImageResource(IDP_BACKGROUND_BOTTOM, 0, 211, false);
447+
canvas.drawImageResource(IDP_MUSIC_TITLEBAR,0,0,true);
448+
canvas.drawImageResource(IDP_BACKGROUND_BOTTOM, 0, 211, true);
450449

451450
//log_i("PlayingView::onPaint complete");
452451

‎apps/player/resource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Module Name:
2121
2222
Revision History:
2323
24-
2014-3-18 15:13:48 Created by Fibo Lu
24+
2014-3-25 19:16:34 Created by Fibo Lu
2525
2626
--*/
2727

0 commit comments

Comments
 (0)