Skip to content

Commit 9999c6d

Browse files
liuwenlongliuwenlong
committed
1.增加 Czech语言
2.增加壁纸兼容 3.修改系统版本到V1.5.0
1 parent 8b14c5c commit 9999c6d

File tree

5 files changed

+139
-133
lines changed

5 files changed

+139
-133
lines changed

‎apps/player/BitmapFactory.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,10 @@ namespace mango
427427
if(gWallpaperBitmap.isVaild()){
428428
canvas.drawBitmap(gWallpaperBitmap.mBits,0,0,gWallpaperBitmap.width,gWallpaperBitmap.height);
429429
}else{
430-
canvas.drawImageResource(IDP_PLAYING_BACKGROUND,0,0,false);
430+
if(gPlayer.mProductType == 0)
431+
canvas.drawImageResource(IDP_PLAYING_BACKGROUND,0,0,false);
432+
else
433+
canvas.drawImageResource(IDP_PLAYING_BACKGROUND_DX90,0,0,false);
431434
}
432435
}
433436
void Environment::setDigitalFilter(int val){

‎apps/player/SettingsView.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,8 @@ namespace mango
343343
int imgsec[]={0,0,0,0,0};
344344
int text[]={STR_LANGUAGE_EN,STR_LANGUAGE_CN,STR_LANGUAGE_JA,STR_LANGUAGE_JAP,STR_LANGUAGE_KR,
345345
STR_LANGUAGE_TH,STR_LANGUAGE_RU,STR_LANGUAGE_SP,STR_LANGUAGE_PU,STR_LANGUAGE_DE,
346-
STR_LANGUAGE_FR,STR_LANGUAGE_DU};
347-
int i,count = 12;
346+
STR_LANGUAGE_FR,STR_LANGUAGE_DU,STR_LANGUAGE_CZ};
347+
int i,count = sizeof(text)/sizeof(text[0]);
348348

349349
if(mLanguageListAdapter == NULL){
350350
mListView->deleteAllItems();

‎apps/player/SystemInfoView.cpp

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

130130
if(gPlayer.mProductType == 0){
131131
mModelNumber->setTextString("DX50");
132-
mFirmwareVersion->setTextString("V1.2.9");
132+
mFirmwareVersion->setTextString("V1.5.0");
133133
}else if(gPlayer.mProductType == 1){
134134
mModelNumber->setTextString("DX90");
135135
mFirmwareVersion->setTextString("V2.0.5");

‎apps/player/resource.h

Lines changed: 130 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Module Name:
2121
2222
Revision History:
2323
24-
2014-5-16 21:36:22 Created by Fibo Lu
24+
2014-6-17 11:54:22 Created by Fibo Lu
2525
2626
--*/
2727

@@ -153,6 +153,7 @@ Revision History:
153153
#define STR_SETTING_DIGITAL_FILTER 0x007A
154154
#define STR_SETTING_DIGITAL_FILTER_FAST 0x007B
155155
#define STR_SETTING_DIGITAL_FILTER_SLOW 0x007C
156+
#define STR_LANGUAGE_CZ 0x007D
156157

157158
#define RESOURCE_STRING_MAX_CHARS 68
158159

@@ -162,132 +163,133 @@ Revision History:
162163
//
163164
//Png from player
164165
//
165-
#define DPI_VOLUME_ICON 0x05D1
166-
#define IDB_DUSBOTG_ICON 0x05D2
167-
#define IDB_DUSBOTG_ICON_S 0x05D3
168-
#define IDP_ADVANCE_BATTARY 0x05D4
169-
#define IDP_ADVANCE_BATTARY_S 0x05D5
170-
#define IDP_ADVANCE_DISPLAY 0x05D6
171-
#define IDP_ADVANCE_DISPLAY_S 0x05D7
172-
#define IDP_ADVANCE_LANGUGE 0x05D8
173-
#define IDP_ADVANCE_LANGUGE_S 0x05D9
174-
#define IDP_ADVANCE_LIBRARY 0x05DA
175-
#define IDP_ADVANCE_LIBRARY_S 0x05DB
176-
#define IDP_ADVANCE_SYSTEM_INFO 0x05DC
177-
#define IDP_ADVANCE_SYSTEM_INFO_S 0x05DD
178-
#define IDP_ALBUM_LIST 0x05DE
179-
#define IDP_ALBUM_LIST_S 0x05DF
180-
#define IDP_ALL_MUSIC 0x05E0
181-
#define IDP_ALL_MUSIC_S 0x05E1
182-
#define IDP_ARTIST_LIST 0x05E2
183-
#define IDP_ARTIST_LIST_S 0x05E3
184-
#define IDP_BACKGROUND_BOTTOM 0x05E4
185-
#define IDP_BATTERY_0 0x05E5
186-
#define IDP_BATTERY_10 0x05E6
187-
#define IDP_BATTERY_100 0x05E7
188-
#define IDP_BATTERY_20 0x05E8
189-
#define IDP_BATTERY_40 0x05E9
190-
#define IDP_BATTERY_60 0x05EA
191-
#define IDP_BATTERY_80 0x05EB
192-
#define IDP_BATTERY_CHAGER 0x05EC
193-
#define IDP_BATTERY_ICON 0x05ED
194-
#define IDP_DEFAULT_ALBUM_ICON 0x05EE
195-
#define IDP_DFLASH_ICON 0x05EF
196-
#define IDP_DFLASH_ICON_S 0x05F0
197-
#define IDP_DSDCARD_ICON 0x05F1
198-
#define IDP_DSDCARD_ICON_S 0x05F2
199-
#define IDP_EQ_MODE_BGD 0x05F3
200-
#define IDP_EQ_MODE_BGD_DS 0x05F4
201-
#define IDP_EQ_MODE_BGD_S 0x05F5
202-
#define IDP_EQ_SEEKBAR 0x05F6
203-
#define IDP_EQ_SEEKBAR_THUMB 0x05F7
204-
#define IDP_FILE_LIST 0x05F8
205-
#define IDP_FILE_LIST_S 0x05F9
206-
#define IDP_FOLDER_ICON 0x05FA
207-
#define IDP_GENRE_LIST 0x05FB
208-
#define IDP_GENRE_LIST_S 0x05FC
209-
#define IDP_KEY_LOCK 0x05FD
210-
#define IDP_LISTICON_ALBUM 0x05FE
211-
#define IDP_LIST_GENRE_ICON 0x05FF
212-
#define IDP_LISTICON_ARTIST 0x0600
213-
#define IDP_LISTICON_MUSIC 0x0601
214-
#define IDP_LISTICON_PLAYING 0x0602
215-
#define IDP_LISTITEM_BGD 0x0603
216-
#define IDP_LISTITEM_BGD_SEC 0x0604
217-
#define IDP_LISTITEM_NO_SEC 0x0605
218-
#define IDP_LISTITEM_SEC 0x0606
219-
#define IDP_MEDIA_SCAN_STOP_D 0x0607
220-
#define IDP_MUSICINFO_ICON 0x0608
221-
#define IDP_MUSIC_WMA 0x0609
222-
#define IDP_MUSIC_WAV 0x060A
223-
#define IDP_MUSIC_TITLEBAR 0x060B
224-
#define IDP_MUSIC_PLAYLIST_ICO 0x060C
225-
#define IDP_MUSIC_ORDERBY 0x060D
226-
#define IDP_MUSIC_OGG 0x060E
227-
#define IDP_MUSIC_NEW_PLAYLIST 0x060F
228-
#define IDP_MUSIC_M4A 0x0610
229-
#define IDP_MUSIC_ICON 0x0611
230-
#define IDP_MUSIC_HOME_SEC 0x0612
231-
#define IDP_MUSIC_HOME 0x0613
232-
#define IDP_MUSIC_FLAC 0x0614
233-
#define IDP_MUSIC_DSF 0x0615
234-
#define IDP_MUSIC_APE 0x0616
235-
#define IDP_MUSIC_AIFF 0x0617
236-
#define IDP_MUSIC_AIF 0x0618
237-
#define IDP_MUSIC_AAC 0x0619
238-
#define IDP_MUSICINFO_ICON_DX90 0x061A
239-
#define IDP_ORDER_SEC 0x061B
240-
#define IDP_PLAYING_BACKGROUND 0x061C
241-
#define IDP_PLAYING_LIST 0x061D
242-
#define IDP_PLAYING_LIST_BACK 0x061E
243-
#define IDP_PLAYING_LIST_S 0x061F
244-
#define IDP_PLAYING_MUSICNAME_BK 0x0620
245-
#define IDP_PLAYING_MUSIC_ADD_PLAYLIST 0x0621
246-
#define IDP_PLAYING_NAME_BK2 0x0622
247-
#define IDP_PLAYING_NEXT_ACTIVE 0x0623
248-
#define IDP_PLAYING_NEXT_INACTIVE 0x0624
249-
#define IDP_PLAYING_PAUSE 0x0625
250-
#define IDP_PLAYING_PLAY_ACTIVE 0x0626
251-
#define IDP_PLAYING_PREV_ACTIVE 0x0627
252-
#define IDP_PLAYING_PREV_INACTIVE 0x0628
253-
#define IDP_PLAYLIST_LIST 0x0629
254-
#define IDP_PLAYLIST_LIST_S 0x062A
255-
#define IDP_PLAYMODE_0 0x062B
256-
#define IDP_PLAYMODE_0_S 0x062C
257-
#define IDP_PLAYMODE_1 0x062D
258-
#define IDP_PLAYMODE_1_S 0x062E
259-
#define IDP_PLAYMODE_2 0x062F
260-
#define IDP_PLAYMODE_2_S 0x0630
261-
#define IDP_PLAYMODE_3 0x0631
262-
#define IDP_PLAYMODE_3_S 0x0632
263-
#define IDP_SDCARD_INSERT 0x0633
264-
#define IDP_SEEKBAR_BKG 0x0634
265-
#define IDP_SEEKBAR_SEEK 0x0635
266-
#define IDP_SEEKBAR_THUMB 0x0636
267-
#define IDP_SETTING_ADVANCED 0x0637
268-
#define IDP_SETTING_ADVANCED_S 0x0638
269-
#define IDP_SETTING_BACK 0x0639
270-
#define IDP_SETTING_BACK_SEC 0x063A
271-
#define IDP_SETTING_BGD 0x063B
272-
#define IDP_SETTING_DF 0x063C
273-
#define IDP_SETTING_DF_S 0x063D
274-
#define IDP_SETTING_EQ 0x063E
275-
#define IDP_SETTING_EQ_S 0x063F
276-
#define IDP_SETTING_GAPLESS 0x0640
277-
#define IDP_SETTING_GAPLESS_S 0x0641
278-
#define IDP_SETTING_MUSICINFO 0x0642
279-
#define IDP_SETTING_MUSICINFO_S 0x0643
280-
#define IDP_SETTING_PLAYORDER 0x0644
281-
#define IDP_SETTING_PLAYORDER_S 0x0645
282-
#define IDP_SHUTDOWM_LOGO 0x0646
283-
#define IDP_SHUTDOWM_LOGO_DX90 0x0647
284-
#define IDP_STORAGE_SPACE 0x0648
285-
#define IDP_STORAGE_USE 0x0649
286-
#define IDP_SYSTEM_RESET 0x064A
287-
#define IDP_SYS_FUNCTION 0x064B
288-
#define IDP_SYSTEM_RESET_S 0x064C
289-
#define IDP_USB_CONECT 0x064D
290-
#define IDP_VULUME_ICON 0x064E
291-
#define IDP_VULUME_ICON_BK 0x064F
166+
#define DPI_VOLUME_ICON 0x065A
167+
#define IDB_DUSBOTG_ICON 0x065B
168+
#define IDB_DUSBOTG_ICON_S 0x065C
169+
#define IDP_ADVANCE_BATTARY 0x065D
170+
#define IDP_ADVANCE_BATTARY_S 0x065E
171+
#define IDP_ADVANCE_DISPLAY 0x065F
172+
#define IDP_ADVANCE_DISPLAY_S 0x0660
173+
#define IDP_ADVANCE_LANGUGE 0x0661
174+
#define IDP_ADVANCE_LANGUGE_S 0x0662
175+
#define IDP_ADVANCE_LIBRARY 0x0663
176+
#define IDP_ADVANCE_LIBRARY_S 0x0664
177+
#define IDP_ADVANCE_SYSTEM_INFO 0x0665
178+
#define IDP_ADVANCE_SYSTEM_INFO_S 0x0666
179+
#define IDP_ALBUM_LIST 0x0667
180+
#define IDP_ALBUM_LIST_S 0x0668
181+
#define IDP_ALL_MUSIC 0x0669
182+
#define IDP_ALL_MUSIC_S 0x066A
183+
#define IDP_ARTIST_LIST 0x066B
184+
#define IDP_ARTIST_LIST_S 0x066C
185+
#define IDP_BACKGROUND_BOTTOM 0x066D
186+
#define IDP_BATTERY_0 0x066E
187+
#define IDP_BATTERY_10 0x066F
188+
#define IDP_BATTERY_100 0x0670
189+
#define IDP_BATTERY_20 0x0671
190+
#define IDP_BATTERY_40 0x0672
191+
#define IDP_BATTERY_60 0x0673
192+
#define IDP_BATTERY_80 0x0674
193+
#define IDP_BATTERY_CHAGER 0x0675
194+
#define IDP_BATTERY_ICON 0x0676
195+
#define IDP_DEFAULT_ALBUM_ICON 0x0677
196+
#define IDP_DFLASH_ICON 0x0678
197+
#define IDP_DFLASH_ICON_S 0x0679
198+
#define IDP_DSDCARD_ICON 0x067A
199+
#define IDP_DSDCARD_ICON_S 0x067B
200+
#define IDP_EQ_MODE_BGD 0x067C
201+
#define IDP_EQ_MODE_BGD_DS 0x067D
202+
#define IDP_EQ_MODE_BGD_S 0x067E
203+
#define IDP_EQ_SEEKBAR 0x067F
204+
#define IDP_EQ_SEEKBAR_THUMB 0x0680
205+
#define IDP_FILE_LIST 0x0681
206+
#define IDP_FILE_LIST_S 0x0682
207+
#define IDP_FOLDER_ICON 0x0683
208+
#define IDP_GENRE_LIST 0x0684
209+
#define IDP_GENRE_LIST_S 0x0685
210+
#define IDP_KEY_LOCK 0x0686
211+
#define IDP_LISTICON_ALBUM 0x0687
212+
#define IDP_LIST_GENRE_ICON 0x0688
213+
#define IDP_LISTICON_ARTIST 0x0689
214+
#define IDP_LISTICON_MUSIC 0x068A
215+
#define IDP_LISTICON_PLAYING 0x068B
216+
#define IDP_LISTITEM_BGD 0x068C
217+
#define IDP_LISTITEM_BGD_SEC 0x068D
218+
#define IDP_LISTITEM_NO_SEC 0x068E
219+
#define IDP_LISTITEM_SEC 0x068F
220+
#define IDP_MEDIA_SCAN_STOP_D 0x0690
221+
#define IDP_MUSICINFO_ICON 0x0691
222+
#define IDP_MUSIC_WMA 0x0692
223+
#define IDP_MUSIC_WAV 0x0693
224+
#define IDP_MUSIC_TITLEBAR 0x0694
225+
#define IDP_MUSIC_PLAYLIST_ICO 0x0695
226+
#define IDP_MUSIC_ORDERBY 0x0696
227+
#define IDP_MUSIC_OGG 0x0697
228+
#define IDP_MUSIC_NEW_PLAYLIST 0x0698
229+
#define IDP_MUSIC_M4A 0x0699
230+
#define IDP_MUSIC_ICON 0x069A
231+
#define IDP_MUSIC_HOME_SEC 0x069B
232+
#define IDP_MUSIC_HOME 0x069C
233+
#define IDP_MUSIC_FLAC 0x069D
234+
#define IDP_MUSIC_DSF 0x069E
235+
#define IDP_MUSIC_APE 0x069F
236+
#define IDP_MUSIC_AIFF 0x06A0
237+
#define IDP_MUSIC_AIF 0x06A1
238+
#define IDP_MUSIC_AAC 0x06A2
239+
#define IDP_MUSICINFO_ICON_DX90 0x06A3
240+
#define IDP_ORDER_SEC 0x06A4
241+
#define IDP_PLAYING_BACKGROUND 0x06A5
242+
#define IDP_PLAYING_BACKGROUND_DX90 0x06A6
243+
#define IDP_PLAYING_LIST 0x06A7
244+
#define IDP_PLAYING_LIST_BACK 0x06A8
245+
#define IDP_PLAYING_LIST_S 0x06A9
246+
#define IDP_PLAYING_MUSICNAME_BK 0x06AA
247+
#define IDP_PLAYING_MUSIC_ADD_PLAYLIST 0x06AB
248+
#define IDP_PLAYING_NAME_BK2 0x06AC
249+
#define IDP_PLAYING_NEXT_ACTIVE 0x06AD
250+
#define IDP_PLAYING_NEXT_INACTIVE 0x06AE
251+
#define IDP_PLAYING_PAUSE 0x06AF
252+
#define IDP_PLAYING_PLAY_ACTIVE 0x06B0
253+
#define IDP_PLAYING_PREV_ACTIVE 0x06B1
254+
#define IDP_PLAYING_PREV_INACTIVE 0x06B2
255+
#define IDP_PLAYLIST_LIST 0x06B3
256+
#define IDP_PLAYLIST_LIST_S 0x06B4
257+
#define IDP_PLAYMODE_0 0x06B5
258+
#define IDP_PLAYMODE_0_S 0x06B6
259+
#define IDP_PLAYMODE_1 0x06B7
260+
#define IDP_PLAYMODE_1_S 0x06B8
261+
#define IDP_PLAYMODE_2 0x06B9
262+
#define IDP_PLAYMODE_2_S 0x06BA
263+
#define IDP_PLAYMODE_3 0x06BB
264+
#define IDP_PLAYMODE_3_S 0x06BC
265+
#define IDP_SDCARD_INSERT 0x06BD
266+
#define IDP_SEEKBAR_BKG 0x06BE
267+
#define IDP_SEEKBAR_SEEK 0x06BF
268+
#define IDP_SEEKBAR_THUMB 0x06C0
269+
#define IDP_SETTING_ADVANCED 0x06C1
270+
#define IDP_SETTING_ADVANCED_S 0x06C2
271+
#define IDP_SETTING_BACK 0x06C3
272+
#define IDP_SETTING_BACK_SEC 0x06C4
273+
#define IDP_SETTING_BGD 0x06C5
274+
#define IDP_SETTING_DF 0x06C6
275+
#define IDP_SETTING_DF_S 0x06C7
276+
#define IDP_SETTING_EQ 0x06C8
277+
#define IDP_SETTING_EQ_S 0x06C9
278+
#define IDP_SETTING_GAPLESS 0x06CA
279+
#define IDP_SETTING_GAPLESS_S 0x06CB
280+
#define IDP_SETTING_MUSICINFO 0x06CC
281+
#define IDP_SETTING_MUSICINFO_S 0x06CD
282+
#define IDP_SETTING_PLAYORDER 0x06CE
283+
#define IDP_SETTING_PLAYORDER_S 0x06CF
284+
#define IDP_SHUTDOWM_LOGO 0x06D0
285+
#define IDP_SHUTDOWM_LOGO_DX90 0x06D1
286+
#define IDP_STORAGE_SPACE 0x06D2
287+
#define IDP_STORAGE_USE 0x06D3
288+
#define IDP_SYSTEM_RESET 0x06D4
289+
#define IDP_SYS_FUNCTION 0x06D5
290+
#define IDP_SYSTEM_RESET_S 0x06D6
291+
#define IDP_USB_CONECT 0x06D7
292+
#define IDP_VULUME_ICON 0x06D8
293+
#define IDP_VULUME_ICON_BK 0x06D9
292294
//--End Png from player
293295

‎base/party/session.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,8 @@ namespace mango
906906
case LANGID_LA:
907907
case 9:
908908
case 10:
909-
case 11:
909+
case 11:
910+
case 12:
910911
path = conCodePageFileName[6] ;
911912
break ;
912913
case LANGID_PU:

0 commit comments

Comments
 (0)