Skip to content

Commit 0f5b855

Browse files
liuwenlongliuwenlong
committed
1.增加 mediascanner重新扫描的选项
2.修改DX90版本号为V2.0.0
1 parent b8e0246 commit 0f5b855

File tree

5 files changed

+152
-127
lines changed

5 files changed

+152
-127
lines changed

‎apps/player/SettingsView.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,16 @@ namespace mango
9191

9292

9393
void SettingsView::initAdvanceList(){
94-
int img[]={IDP_ADVANCE_LANGUGE,IDP_ADVANCE_DISPLAY,IDP_ADVANCE_BATTARY,IDP_ADVANCE_SYSTEM_INFO,IDP_SYSTEM_RESET,IDP_ADVANCE_SYSTEM_INFO};
95-
int imgsec[]={IDP_ADVANCE_LANGUGE_S,IDP_ADVANCE_DISPLAY_S,IDP_ADVANCE_BATTARY_S,IDP_ADVANCE_SYSTEM_INFO_S,IDP_SYSTEM_RESET_S,IDP_ADVANCE_SYSTEM_INFO_S};
96-
int text[]={STR_ADVANCE_LANGUAGE,STR_ADVANCE_DISPLAY,STR_ADVANCE_POWER,STR_ADVANCE_SYSINFO,STR_SYSTEM_RESTET,STR_SYSTEM_UPDATE};
94+
int img[]={IDP_ADVANCE_LANGUGE,IDP_ADVANCE_DISPLAY,IDP_ADVANCE_BATTARY,IDP_ADVANCE_LIBRARY,IDP_ADVANCE_SYSTEM_INFO,IDP_SYSTEM_RESET,IDP_ADVANCE_SYSTEM_INFO};
95+
int imgsec[]={IDP_ADVANCE_LANGUGE_S,IDP_ADVANCE_DISPLAY_S,IDP_ADVANCE_BATTARY_S,IDP_ADVANCE_LIBRARY,IDP_ADVANCE_SYSTEM_INFO_S,IDP_SYSTEM_RESET_S,IDP_ADVANCE_SYSTEM_INFO_S};
96+
int text[]={STR_ADVANCE_LANGUAGE,STR_ADVANCE_DISPLAY,STR_ADVANCE_POWER,STR_RESCAN_LIBRARY,STR_ADVANCE_SYSINFO,STR_SYSTEM_RESTET,STR_SYSTEM_UPDATE};
97+
98+
int i,count = sizeof(img)/sizeof(int);
9799

98-
int i,count = 6;
99-
100100
if(FileAttr::FileExist("/mnt/sdcard/update.img")){
101-
count = 6;
101+
count = count;
102102
}else{
103-
count = 5;
103+
count = count-1;
104104
}
105105

106106
log_i("SettingsView::initAdvanceList");
@@ -345,11 +345,14 @@ namespace mango
345345
initPowerList();
346346
break;
347347
case 3:
348-
gPlayer.showSystemInfoView(); break;
348+
gmediaprovider.externVolumeScanner("null");
349+
break;
349350
case 4:
351+
gPlayer.showSystemInfoView(); break;
352+
case 5:
350353
gPlayer.showChosenView(ChosenView::CHOSEN_RECOVERY);
351354
break;
352-
case 5:
355+
case 6:
353356
gPlayer.showChosenView(ChosenView::CHOSEN_SYSTEMUPDATE);
354357
break;
355358
}

‎apps/player/SystemInfoView.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ namespace mango
132132
mFirmwareVersion->setTextString("V1.2.9");
133133
}else if(strcmp(board,"rk3026")==0){
134134
mModelNumber->setTextString("DX90");
135-
mFirmwareVersion->setTextString("V1.0.1");
135+
mFirmwareVersion->setTextString("V2.0.0");
136136
}
137137

138138
updateTotalMem();

‎apps/player/mediaprovider.cpp

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,21 @@ namespace mango
610610
mMutex.unlock();
611611
}
612612
#endif
613+
int mediaprovider::clearCacheFile(){
614+
int ret;
615+
char sql[1024];
616+
char cmd[1024]={0};
617+
618+
sprintf(sql,"delete from music");
619+
ret = exec(sql,0,0);
620+
621+
sprintf(cmd,"busybox rm -rf /mnt/sdcard/.album_img");
622+
system(cmd);
623+
sprintf(cmd,"busybox rm -rf /mnt/external_sd/.audio_data");
624+
system(cmd);
625+
626+
return 0;
627+
}
613628
int mediaprovider::externVolumeScanner(char *path){
614629
ScanInfo *info;
615630
char *file;
@@ -629,9 +644,13 @@ namespace mango
629644

630645
media->scanCanStop = true;
631646
media->sendMsgStart();
632-
633-
media->mediascanner(path,true);
634-
647+
if(strcmp(path,"null") == 0){
648+
media->clearCacheFile();
649+
media->mediascanner("/mnt/sdcard",true);
650+
media->mediascanner("/mnt/external_sd",true);
651+
}else{
652+
media->mediascanner(path,true);
653+
}
635654
media->sendMsgEnd();
636655
media->scanCanStop = false;
637656

‎apps/player/mediaprovider.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ md5 TEXT\
226226
int mediascanner(char *path,bool recursion);
227227
int filescanner(char *path);
228228
int externVolumeScanner(char *path);
229+
int clearCacheFile();
229230
int sendMsgStart();
230231
int sendMsgEnd();
231232
int sendMsgProgress(int progress);

‎apps/player/resource.h

Lines changed: 116 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Module Name:
2121
2222
Revision History:
2323
24-
2014-2-28 11:17:44 Created by Fibo Lu
24+
2014-3-4 16:32:41 Created by Fibo Lu
2525
2626
--*/
2727

@@ -144,6 +144,7 @@ Revision History:
144144
#define STR_SLEEP_TIME_2 0x0071
145145
#define STR_SLEEP_TIME_3 0x0072
146146
#define STR_LANGUAGE_DU 0x0073
147+
#define STR_RESCAN_LIBRARY 0x0074
147148

148149
#define RESOURCE_STRING_MAX_CHARS 68
149150

@@ -153,118 +154,119 @@ Revision History:
153154
//
154155
//Png from player
155156
//
156-
#define DPI_VOLUME_ICON 0x0565
157-
#define IDB_DUSBOTG_ICON 0x0566
158-
#define IDP_ADVANCE_BATTARY 0x0567
159-
#define IDP_ADVANCE_BATTARY_S 0x0568
160-
#define IDP_ADVANCE_DISPLAY 0x0569
161-
#define IDP_ADVANCE_DISPLAY_S 0x056A
162-
#define IDP_ADVANCE_LANGUGE 0x056B
163-
#define IDP_ADVANCE_LANGUGE_S 0x056C
164-
#define IDP_ADVANCE_SYSTEM_INFO 0x056D
165-
#define IDP_ADVANCE_SYSTEM_INFO_S 0x056E
166-
#define IDP_ALBUM_LIST 0x056F
167-
#define IDP_ALL_MUSIC 0x0570
168-
#define IDP_ARTIST_LIST 0x0571
169-
#define IDP_BACKGROUND_BOTTOM 0x0572
170-
#define IDP_BATTERY_0 0x0573
171-
#define IDP_BATTERY_10 0x0574
172-
#define IDP_BATTERY_100 0x0575
173-
#define IDP_BATTERY_20 0x0576
174-
#define IDP_BATTERY_40 0x0577
175-
#define IDP_BATTERY_60 0x0578
176-
#define IDP_BATTERY_80 0x0579
177-
#define IDP_BATTERY_CHAGER 0x057A
178-
#define IDP_BATTERY_ICON 0x057B
179-
#define IDP_DEFAULT_ALBUM_ICON 0x057C
180-
#define IDP_DFLASH_ICON 0x057D
181-
#define IDP_DSDCARD_ICON 0x057E
182-
#define IDP_EQ_MODE_BGD 0x057F
183-
#define IDP_EQ_MODE_BGD_DS 0x0580
184-
#define IDP_EQ_MODE_BGD_S 0x0581
185-
#define IDP_EQ_SEEKBAR 0x0582
186-
#define IDP_EQ_SEEKBAR_THUMB 0x0583
187-
#define IDP_FILE_LIST 0x0584
188-
#define IDP_FOLDER_ICON 0x0585
189-
#define IDP_GENRE_LIST 0x0586
190-
#define IDP_KEY_LOCK 0x0587
191-
#define IDP_LISTICON_ALBUM 0x0588
192-
#define IDP_LIST_GENRE_ICON 0x0589
193-
#define IDP_LISTICON_ARTIST 0x058A
194-
#define IDP_LISTICON_MUSIC 0x058B
195-
#define IDP_LISTICON_PLAYING 0x058C
196-
#define IDP_LISTITEM_BGD 0x058D
197-
#define IDP_LISTITEM_BGD_SEC 0x058E
198-
#define IDP_LISTITEM_NO_SEC 0x058F
199-
#define IDP_LISTITEM_SEC 0x0590
200-
#define IDP_MEDIA_SCAN_STOP_D 0x0591
201-
#define IDP_MUSICINFO_ICON 0x0592
202-
#define IDP_MUSIC_WMA 0x0593
203-
#define IDP_MUSIC_WAV 0x0594
204-
#define IDP_MUSIC_TITLEBAR 0x0595
205-
#define IDP_MUSIC_PLAYLIST_ICO 0x0596
206-
#define IDP_MUSIC_ORDERBY 0x0597
207-
#define IDP_MUSIC_OGG 0x0598
208-
#define IDP_MUSIC_NEW_PLAYLIST 0x0599
209-
#define IDP_MUSIC_M4A 0x059A
210-
#define IDP_MUSIC_ICON 0x059B
211-
#define IDP_MUSIC_HOME_SEC 0x059C
212-
#define IDP_MUSIC_HOME 0x059D
213-
#define IDP_MUSIC_FLAC 0x059E
214-
#define IDP_MUSIC_DSF 0x059F
215-
#define IDP_MUSIC_APE 0x05A0
216-
#define IDP_MUSIC_AIFF 0x05A1
217-
#define IDP_MUSIC_AIF 0x05A2
218-
#define IDP_MUSIC_AAC 0x05A3
219-
#define IDP_MUSICINFO_ICON_DX90 0x05A4
220-
#define IDP_ORDER_SEC 0x05A5
221-
#define IDP_PLAYING_BACKGROUND 0x05A6
222-
#define IDP_PLAYING_LIST 0x05A7
223-
#define IDP_PLAYING_LIST_BACK 0x05A8
224-
#define IDP_PLAYING_MUSICNAME_BK 0x05A9
225-
#define IDP_PLAYING_MUSIC_ADD_PLAYLIST 0x05AA
226-
#define IDP_PLAYING_NAME_BK2 0x05AB
227-
#define IDP_PLAYING_NEXT_ACTIVE 0x05AC
228-
#define IDP_PLAYING_NEXT_INACTIVE 0x05AD
229-
#define IDP_PLAYING_PAUSE 0x05AE
230-
#define IDP_PLAYING_PLAY_ACTIVE 0x05AF
231-
#define IDP_PLAYING_PREV_ACTIVE 0x05B0
232-
#define IDP_PLAYING_PREV_INACTIVE 0x05B1
233-
#define IDP_PLAYLIST_LIST 0x05B2
234-
#define IDP_PLAYMODE_0 0x05B3
235-
#define IDP_PLAYMODE_0_S 0x05B4
236-
#define IDP_PLAYMODE_1 0x05B5
237-
#define IDP_PLAYMODE_1_S 0x05B6
238-
#define IDP_PLAYMODE_2 0x05B7
239-
#define IDP_PLAYMODE_2_S 0x05B8
240-
#define IDP_PLAYMODE_3 0x05B9
241-
#define IDP_PLAYMODE_3_S 0x05BA
242-
#define IDP_SDCARD_INSERT 0x05BB
243-
#define IDP_SEEKBAR_BKG 0x05BC
244-
#define IDP_SEEKBAR_SEEK 0x05BD
245-
#define IDP_SEEKBAR_THUMB 0x05BE
246-
#define IDP_SETTING_ADVANCED 0x05BF
247-
#define IDP_SETTING_ADVANCED_S 0x05C0
248-
#define IDP_SETTING_BACK 0x05C1
249-
#define IDP_SETTING_BACK_SEC 0x05C2
250-
#define IDP_SETTING_BGD 0x05C3
251-
#define IDP_SETTING_EQ 0x05C4
252-
#define IDP_SETTING_EQ_S 0x05C5
253-
#define IDP_SETTING_GAPLESS 0x05C6
254-
#define IDP_SETTING_GAPLESS_S 0x05C7
255-
#define IDP_SETTING_MUSICINFO 0x05C8
256-
#define IDP_SETTING_MUSICINFO_S 0x05C9
257-
#define IDP_SETTING_PLAYORDER 0x05CA
258-
#define IDP_SETTING_PLAYORDER_S 0x05CB
259-
#define IDP_SHUTDOWM_LOGO 0x05CC
260-
#define IDP_SHUTDOWM_LOGO_DX90 0x05CD
261-
#define IDP_STORAGE_SPACE 0x05CE
262-
#define IDP_STORAGE_USE 0x05CF
263-
#define IDP_SYSTEM_RESET 0x05D0
264-
#define IDP_SYS_FUNCTION 0x05D1
265-
#define IDP_SYSTEM_RESET_S 0x05D2
266-
#define IDP_USB_CONECT 0x05D3
267-
#define IDP_VULUME_ICON 0x05D4
268-
#define IDP_VULUME_ICON_BK 0x05D5
157+
#define DPI_VOLUME_ICON 0x0571
158+
#define IDB_DUSBOTG_ICON 0x0572
159+
#define IDP_ADVANCE_BATTARY 0x0573
160+
#define IDP_ADVANCE_BATTARY_S 0x0574
161+
#define IDP_ADVANCE_DISPLAY 0x0575
162+
#define IDP_ADVANCE_DISPLAY_S 0x0576
163+
#define IDP_ADVANCE_LANGUGE 0x0577
164+
#define IDP_ADVANCE_LANGUGE_S 0x0578
165+
#define IDP_ADVANCE_LIBRARY 0x0579
166+
#define IDP_ADVANCE_SYSTEM_INFO 0x057A
167+
#define IDP_ADVANCE_SYSTEM_INFO_S 0x057B
168+
#define IDP_ALBUM_LIST 0x057C
169+
#define IDP_ALL_MUSIC 0x057D
170+
#define IDP_ARTIST_LIST 0x057E
171+
#define IDP_BACKGROUND_BOTTOM 0x057F
172+
#define IDP_BATTERY_0 0x0580
173+
#define IDP_BATTERY_10 0x0581
174+
#define IDP_BATTERY_100 0x0582
175+
#define IDP_BATTERY_20 0x0583
176+
#define IDP_BATTERY_40 0x0584
177+
#define IDP_BATTERY_60 0x0585
178+
#define IDP_BATTERY_80 0x0586
179+
#define IDP_BATTERY_CHAGER 0x0587
180+
#define IDP_BATTERY_ICON 0x0588
181+
#define IDP_DEFAULT_ALBUM_ICON 0x0589
182+
#define IDP_DFLASH_ICON 0x058A
183+
#define IDP_DSDCARD_ICON 0x058B
184+
#define IDP_EQ_MODE_BGD 0x058C
185+
#define IDP_EQ_MODE_BGD_DS 0x058D
186+
#define IDP_EQ_MODE_BGD_S 0x058E
187+
#define IDP_EQ_SEEKBAR 0x058F
188+
#define IDP_EQ_SEEKBAR_THUMB 0x0590
189+
#define IDP_FILE_LIST 0x0591
190+
#define IDP_FOLDER_ICON 0x0592
191+
#define IDP_GENRE_LIST 0x0593
192+
#define IDP_KEY_LOCK 0x0594
193+
#define IDP_LISTICON_ALBUM 0x0595
194+
#define IDP_LIST_GENRE_ICON 0x0596
195+
#define IDP_LISTICON_ARTIST 0x0597
196+
#define IDP_LISTICON_MUSIC 0x0598
197+
#define IDP_LISTICON_PLAYING 0x0599
198+
#define IDP_LISTITEM_BGD 0x059A
199+
#define IDP_LISTITEM_BGD_SEC 0x059B
200+
#define IDP_LISTITEM_NO_SEC 0x059C
201+
#define IDP_LISTITEM_SEC 0x059D
202+
#define IDP_MEDIA_SCAN_STOP_D 0x059E
203+
#define IDP_MUSICINFO_ICON 0x059F
204+
#define IDP_MUSIC_WMA 0x05A0
205+
#define IDP_MUSIC_WAV 0x05A1
206+
#define IDP_MUSIC_TITLEBAR 0x05A2
207+
#define IDP_MUSIC_PLAYLIST_ICO 0x05A3
208+
#define IDP_MUSIC_ORDERBY 0x05A4
209+
#define IDP_MUSIC_OGG 0x05A5
210+
#define IDP_MUSIC_NEW_PLAYLIST 0x05A6
211+
#define IDP_MUSIC_M4A 0x05A7
212+
#define IDP_MUSIC_ICON 0x05A8
213+
#define IDP_MUSIC_HOME_SEC 0x05A9
214+
#define IDP_MUSIC_HOME 0x05AA
215+
#define IDP_MUSIC_FLAC 0x05AB
216+
#define IDP_MUSIC_DSF 0x05AC
217+
#define IDP_MUSIC_APE 0x05AD
218+
#define IDP_MUSIC_AIFF 0x05AE
219+
#define IDP_MUSIC_AIF 0x05AF
220+
#define IDP_MUSIC_AAC 0x05B0
221+
#define IDP_MUSICINFO_ICON_DX90 0x05B1
222+
#define IDP_ORDER_SEC 0x05B2
223+
#define IDP_PLAYING_BACKGROUND 0x05B3
224+
#define IDP_PLAYING_LIST 0x05B4
225+
#define IDP_PLAYING_LIST_BACK 0x05B5
226+
#define IDP_PLAYING_MUSICNAME_BK 0x05B6
227+
#define IDP_PLAYING_MUSIC_ADD_PLAYLIST 0x05B7
228+
#define IDP_PLAYING_NAME_BK2 0x05B8
229+
#define IDP_PLAYING_NEXT_ACTIVE 0x05B9
230+
#define IDP_PLAYING_NEXT_INACTIVE 0x05BA
231+
#define IDP_PLAYING_PAUSE 0x05BB
232+
#define IDP_PLAYING_PLAY_ACTIVE 0x05BC
233+
#define IDP_PLAYING_PREV_ACTIVE 0x05BD
234+
#define IDP_PLAYING_PREV_INACTIVE 0x05BE
235+
#define IDP_PLAYLIST_LIST 0x05BF
236+
#define IDP_PLAYMODE_0 0x05C0
237+
#define IDP_PLAYMODE_0_S 0x05C1
238+
#define IDP_PLAYMODE_1 0x05C2
239+
#define IDP_PLAYMODE_1_S 0x05C3
240+
#define IDP_PLAYMODE_2 0x05C4
241+
#define IDP_PLAYMODE_2_S 0x05C5
242+
#define IDP_PLAYMODE_3 0x05C6
243+
#define IDP_PLAYMODE_3_S 0x05C7
244+
#define IDP_SDCARD_INSERT 0x05C8
245+
#define IDP_SEEKBAR_BKG 0x05C9
246+
#define IDP_SEEKBAR_SEEK 0x05CA
247+
#define IDP_SEEKBAR_THUMB 0x05CB
248+
#define IDP_SETTING_ADVANCED 0x05CC
249+
#define IDP_SETTING_ADVANCED_S 0x05CD
250+
#define IDP_SETTING_BACK 0x05CE
251+
#define IDP_SETTING_BACK_SEC 0x05CF
252+
#define IDP_SETTING_BGD 0x05D0
253+
#define IDP_SETTING_EQ 0x05D1
254+
#define IDP_SETTING_EQ_S 0x05D2
255+
#define IDP_SETTING_GAPLESS 0x05D3
256+
#define IDP_SETTING_GAPLESS_S 0x05D4
257+
#define IDP_SETTING_MUSICINFO 0x05D5
258+
#define IDP_SETTING_MUSICINFO_S 0x05D6
259+
#define IDP_SETTING_PLAYORDER 0x05D7
260+
#define IDP_SETTING_PLAYORDER_S 0x05D8
261+
#define IDP_SHUTDOWM_LOGO 0x05D9
262+
#define IDP_SHUTDOWM_LOGO_DX90 0x05DA
263+
#define IDP_STORAGE_SPACE 0x05DB
264+
#define IDP_STORAGE_USE 0x05DC
265+
#define IDP_SYSTEM_RESET 0x05DD
266+
#define IDP_SYS_FUNCTION 0x05DE
267+
#define IDP_SYSTEM_RESET_S 0x05DF
268+
#define IDP_USB_CONECT 0x05E0
269+
#define IDP_VULUME_ICON 0x05E1
270+
#define IDP_VULUME_ICON_BK 0x05E2
269271
//--End Png from player
270272

0 commit comments

Comments
 (0)