1.增加媒体库重新扫描设置

2.修改codec判断机制
3.去掉codec是ES9018时，重新播放的问题

Author: liuwenlong

apps/player/ChosenView.cpp

@@ -102,6 +102,10 @@ namespace mango
 				titleres = STR_OPERATE_DELETE;
 				noticeres = STR_FILE_DELETE_MESSAGE;
 				break;
+			case CHOSEN_RESCAN:
+				titleres = STR_RESCAN_LIBRARY;
+				noticeres = STR_FILE_DELETE_MESSAGE;
+				break;				
 		}
 		mBrightnessValue->setTextResoure(noticeres);
 		mTitle->setTextResoure(titleres);
@@ -140,6 +144,9 @@ namespace mango
 			case CHOSEN_DELETFILE:
 				gMessageQueue.post(mCallView,VM_NOTIFY,NM_CHOSEN_CALLBY,1);
 				break;
+			case CHOSEN_RESCAN:
+				gmediaprovider.externVolumeScanner("null");
+				break;				
 		}
 	}
 	void ChosenView::setCallView(View *view){
@@ -170,7 +177,7 @@ namespace mango
 		}else if(fromView == mHome){
 			gPlayer.showPlayingView();
 		}else if(parameter == mMyMusicText){
-			if(mType == CHOSEN_DELETFILE){
+			if(mType == CHOSEN_DELETFILE || mType == CHOSEN_RESCAN){
 				dispatchEvent();
 				gPlayer.dismissView(this);
 			}else{

apps/player/ChosenView.h

@@ -9,6 +9,7 @@ namespace mango
 		const static int CHOSEN_RECOVERY = 2;
 		const static int CHOSEN_SYSTEMUPDATE = 3;
 		const static int CHOSEN_DELETFILE = 4;
+		const static int CHOSEN_RESCAN = 5;
 
 	public:
 		ChosenView(void);

apps/player/SettingsView.cpp

@@ -345,7 +345,7 @@ namespace mango
 							initPowerList();
 							break;
 						case 3:
-							gmediaprovider.externVolumeScanner("null");
+							gPlayer.showChosenView(ChosenView::CHOSEN_RESCAN);
 							break;							
 						case 4:
 							gPlayer.showSystemInfoView(); break;

apps/player/ShutDownView.cpp

@@ -98,7 +98,7 @@ namespace mango
 
 	int ShutDownView::onPaint(Canvas& canvas)
 	{
-		if(gPlayer.mBoardType == 1)
+		if(gPlayer.mProductType == 1)
 			canvas.drawImageResource(IDP_SHUTDOWM_LOGO_DX90,0,0,false);
 		else
 			canvas.drawImageResource(IDP_SHUTDOWM_LOGO,0,0,false);

apps/player/SystemInfoView.cpp

@@ -127,10 +127,10 @@ namespace mango
 		mTitle->setTextResoure(STR_ADVANCE_SYSINFO);
 		mTitle->setTextLayoutType(TEXT_LAYOUT_CENTER);
 
-		if(strcmp(board,"rk2928")==0){
+		if(gPlayer.mProductType == 0){
 			mModelNumber->setTextString("DX50");
 			mFirmwareVersion->setTextString("V1.2.9");
-		}else if(strcmp(board,"rk3026")==0){
+		}else if(gPlayer.mProductType == 1){
 			mModelNumber->setTextString("DX90");
 			mFirmwareVersion->setTextString("V2.0.0");
 		}
@@ -144,7 +144,7 @@ namespace mango
 		char *ipath = "/mnt/sdcard";
 		char *epath = "/mnt/external_sd";
 		Mstring *mstr;
-		mstr = new Mstring(20);
+		mstr = new Mstring(50);
 
 		Environment::space_info(ipath,total,avail,free);
 		Environment::memSizeToStr(total,iSpaceAll);

apps/player/Uvcontert.cpp

@@ -44,7 +44,6 @@ void Uvcontert::addItem(const char * str){
 	uint32_t tmp = getpossibleEncodings(str);
 	entry.addString(str);
 	encode = encode & tmp;
-	log_i("tmp=0x%x,encode=0x%x",tmp,encode);
 }
 void Uvcontert::doContert(){
 	uint32_t locale;
@@ -60,8 +59,8 @@ void Uvcontert::doContert(){
 		CString item;
 
 		entry.getCString(i,item);
-		
-		if(encode != kEncodingAll && encode != kEncodingNone){
+
+		if(encode != kEncodingAll && encode != kEncodingNone)){
 			if(encode & locale){
 				ponvertValues(locale,item.string,out);
 			}else if(encode & kEncodingShiftJIS){

apps/player/player.cpp

@@ -347,6 +347,14 @@ namespace mango
 			mBoardType = -1;
 		}
 		log_i("ro.board.platform=%s,mBoardType=%d",board,mBoardType);
+
+		if(FileAttr::FileExist(ES9018_VOLUME)){
+			mCodecType = 1;
+			mProductType = 1;
+		}else{
+			mCodecType = 0;
+			mProductType = 0;
+		}
 	}
 	void Player::VolumeCheck(){
 		int value;
@@ -475,7 +483,7 @@ namespace mango
 
 		file  = fopen("/dev/codec_volume", "r");
 		if(file == NULL)
-			file  = fopen("/sys/class/codec/wm8740_volume", "r");
+			file  = fopen(ES9018_VOLUME, "r");
 
 		if (file == NULL) {
 			log_e("/dev/codec_volume");
@@ -505,8 +513,8 @@ namespace mango
 
 		if(FileAttr::FileExist("/dev/codec_volume"))
 			file  = fopen("/dev/codec_volume", "w");
-		else if(FileAttr::FileExist("/sys/class/codec/wm8740_volume"))
-			file  = fopen("/sys/class/codec/wm8740_volume", "w");
+		else if(FileAttr::FileExist(ES9018_VOLUME))
+			file  = fopen(ES9018_VOLUME, "w");
 
 		if (file != NULL) {
 			sprintf(buffer, "%d", volume);

apps/player/player.h

@@ -45,6 +45,7 @@
 
 #define ARRAY_LIST_NUM 100
 #define CONVERT_UTF8
+#define ES9018_VOLUME "/sys/class/codec/es9018_volume"
 
 namespace mango
 {	
@@ -259,6 +260,8 @@ namespace mango
 
 		bool volumeInitFail;
 		int mBoardType;//-1-unknow,0-rk2926,1-rk3026.
+		int mCodecType;//-1-unknow,0-wm8740,1-es9018.
+		int mProductType;//0-dx50,1-dx90.
 	};
 
 	extern Player  gPlayer;

apps/player/playingView.cpp

@@ -66,7 +66,7 @@ namespace mango
 
 		rect.setEx(6, 30, 109, 109);
 		mAlbumImage = new ImageView(PLAYING_IDB_ALBUM_IMAGE, TEXT("mAlbumImage"), this, &rect, 0);
-		if(gPlayer.mBoardType==1)
+		if(gPlayer.mProductType==1)
 			mAlbumImage->setImageResoure(IDP_MUSICINFO_ICON_DX90);
 		else
 			mAlbumImage->setImageResoure(IDP_MUSICINFO_ICON);
@@ -616,9 +616,10 @@ namespace mango
 				mBattery = val;
 			}
 			if(gPlayer.mSpdifSwitch->isToSwicth()){
-				isSpdifIn = gPlayer.isSpdifIn();
-				//gPlayer.openCodecPower(!isSpdifIn);
-				mPlayinglist->setSpdifOut(isSpdifIn);
+				if(gPlayer.mCodecType == 0){
+					isSpdifIn = gPlayer.isSpdifIn();
+					mPlayinglist->setSpdifOut(isSpdifIn);
+				}
 				gPlayer.mSpdifSwitch->resetSwicth();
 			}
 			if(gPlayer.mHeadestSwitch->isToSwicth()){

apps/player/playinglist.cpp

@@ -252,10 +252,10 @@ static const char *PlayerLock = "playerlock";
 				if(inPause!=state){
 					inPause = state;
 					if(state){
-						if(gPlayer.mBoardType == 1)
+						if(gPlayer.mCodecType == 1)
 							gPlayer.openWm8740Mute();
 					}else{
-						if(gPlayer.mBoardType == 1){
+						if(gPlayer.mCodecType == 1){
 							Thread::sleep(200);
 							gPlayer.closeWm8740Mute();
 						}