增加编码检测，支持中文GBK编码和日文ShiftJIS编码的支持

Author: liuwenlong

apps/player/Android.mk

@@ -72,6 +72,7 @@ LOCAL_SRC_FILES += InterfaceID3.cpp
 LOCAL_SRC_FILES += OggID3.cpp
 LOCAL_SRC_FILES += AudioId3.cpp
 LOCAL_SRC_FILES += base64.cpp
+LOCAL_SRC_FILES += Uvcontert.cpp
 
 LOCAL_CPPFLAGS:=\
 -I $(MY_ANDROID_SOURCE)/frameworks/base/core/jni/android/graphics\

apps/player/Uvcontert.cpp

@@ -0,0 +1,88 @@
+
+#include "player.h"
+namespace mango
+{
+	uint32_t Uvcontert::getpossibleEncodings(const char *entry){
+		uint8_t* src = (uint8_t *)entry;
+		uint8_t uch;
+		uint32_t tmpEncoding,encoding=0;
+		bool noAsci = false;
+		int ret = 0;
+		
+		if(!entry)
+			return 0;
+		
+        while ((uch = *src++)) {
+			if (uch & 0x80){
+				noAsci = true;
+				break;
+			}
+        }
+		
+		if(noAsci){
+			if(possibleEncodings&&ponvertValues){
+				tmpEncoding = possibleEncodings(entry);
+				if(tmpEncoding != kEncodingAll && tmpEncoding != kEncodingNone){
+					encoding = tmpEncoding;
+				}
+			}else
+				log_i("-----possibleEncodings is null");
+		}else
+			encoding = kEncodingAll;
+		
+		return encoding;		
+	}
+
+Uvcontert::Uvcontert(){
+	encode = kEncodingAll;
+}
+
+Uvcontert::~Uvcontert(){
+	encode = 0;
+}
+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;
+	int i;
+	if(gSessionLocal.getLangId() == LANGID_SIMPLIFIED ||
+		gSessionLocal.getLangId() == LANGID_TRADITIONAL){
+		locale = kEncodingGBK;
+	}else{
+		locale = kEncodingShiftJIS;
+	}
+	for(i=0;i<entry.getCount();i++){
+		char out[1024];
+		CString item;
+		
+		entry.getCString(i,item);
+		
+		if(encode != kEncodingAll && encode != kEncodingNone){
+			if(encode & locale){
+				ponvertValues(locale,item.string,out);
+			}else if(encode & kEncodingShiftJIS){
+				ponvertValues(kEncodingShiftJIS,item.string,out);
+			}else if(encode & kEncodingGBK){
+				ponvertValues(kEncodingGBK,item.string,out);
+			}else{
+				strcpy(out,item.string);
+			}
+		}else{
+			strcpy(out,item.string);
+		}
+		
+		result.addString(out);
+	}
+	
+}
+int Uvcontert::getItem(int pos,CString& str){
+	return result.getCString(pos,str);
+}
+
+};
+
+

apps/player/Uvcontert.h

@@ -0,0 +1,19 @@
+
+namespace mango
+{
+
+	class Uvcontert{
+	public:
+		Uvcontert();
+		~Uvcontert();
+		void addItem(const char* str);
+		void doContert();
+		int getItem(int pos,CString& str);
+		uint32_t getpossibleEncodings(const char *entry);
+	private:
+		CStringArray entry;
+		CStringArray result;
+		uint32_t encode;
+	};
+
+};

apps/player/mediaprovider.cpp

@@ -6,6 +6,51 @@
 namespace mango
 {
 	unsigned long t0=0,t1=0,t2=0;
+	
+	int uvcontertUtf8(const char *entry,char * out){
+		uint8_t* src = (uint8_t *)entry;
+		uint8_t uch;
+		uint32_t tmpEncoding,encoding;
+		bool noAsci = false;
+		int ret = 0;
+		
+		if(!entry)
+			return 0;
+		
+        while ((uch = *src++)) {
+			if (uch & 0x80){
+				noAsci = true;
+				break;
+			}
+        }
+		log_i("noAsci=%d",noAsci);
+		if(noAsci){
+			if(possibleEncodings&&ponvertValues){
+				tmpEncoding = possibleEncodings(entry);
+				log_i("tmpEncoding=0x%x",tmpEncoding);
+				encoding = tmpEncoding;
+				if(encoding != kEncodingAll && encoding != kEncodingNone)
+				{
+					// if the locale encoding matches, then assume we have a native encoding.
+						if (encoding & mLocaleEncoding)
+							ponvertValues(mLocaleEncoding,entry,out);
+						else if(encoding & kEncodingEUCKR)
+							ponvertValues(kEncodingEUCKR,entry,out);
+						else if(encoding & kEncodingGBK)
+							ponvertValues(kEncodingGBK,entry,out);
+						else if(encoding & kEncodingBig5)
+							ponvertValues(kEncodingBig5,entry,out);
+						else if(encoding & kEncodingShiftJIS)
+							ponvertValues(kEncodingShiftJIS,entry,out);
+						else
+							return 0;
+						ret = 1;
+				}
+			}
+		}
+		return ret;
+	}
+
 
 	static void strlwr(char *string);
 	static char * getfiletype(char *file);
@@ -534,6 +579,7 @@ namespace mango
 				existSDcard = 1;
 			}else{
 				analyzeAudioID3(curItem,fileArray.mList[i]);
+				log_i("--->analyzeAudioID3 out");
 			}
 			if(sdcard.isSdcard){
 				sdcard.checkAlbumImage(curItem);
@@ -617,6 +663,8 @@ namespace mango
 		int len = 1024;
 		char sqlStr[1024]={0},filename[1024]={0};
 		CString md5;
+		Uvcontert mUvcontert;
+		CString contertOut;
 
 		item.clearAll();
 
@@ -637,17 +685,6 @@ namespace mango
 
 		strlwr(filename,sqlStr);
 		item.addItem("name_key",sqlStr);
-
-		memset(value, 0, len);
-		if (m_id3.GetTags(METADATA_KEY_TITLE, value)){
-			slqCheck(value);
-		}else{
-			getFileTitle(filename,value);
-		}
-		item.addItem("title",value);
-		
-		strlwr(value,sqlStr);
-		item.addItem("title_key",sqlStr);
 
 		item.addItem("inPlay",0);
 
@@ -658,29 +695,51 @@ namespace mango
 			item.addItem("track",1000);
 		}
 
+/*********************************Uvcontert********************************/		
+#if 1
+		memset(value, 0, len);
+		if (m_id3.GetTags(METADATA_KEY_TITLE, value)){
+		}else{
+			getFileTitle(filename,value);
+		}
+		slqCheck(value);
+		mUvcontert.addItem(value);
+		
 		memset(value, 0, len);
 		if (m_id3.GetTags(METADATA_KEY_ALBUM, value)){
-
 		}else{
 			getFileParentName(info.path.string,value);
 		}
 		slqCheck(value);
-		item.addItem("album",value);
-		
-		strlwr(value,sqlStr);
-		item.addItem("album_key",sqlStr);
+		mUvcontert.addItem(value);
 
 		memset(value, 0, len);
 		if (m_id3.GetTags(METADATA_KEY_ARTIST, value)){
 		}else{
 			sprintf(value,"(null)");
 		}
 		slqCheck(value);
-		item.addItem("artist",value);
+		mUvcontert.addItem(value);
 
-		strlwr(value,sqlStr);
-		item.addItem("artist_key",sqlStr);
+		mUvcontert.doContert();
 
+		mUvcontert.getItem(0,contertOut);
+		item.addItem("title",contertOut.string);
+		strlwr(contertOut.string,sqlStr);
+		item.addItem("title_key",sqlStr);
+
+		mUvcontert.getItem(1,contertOut);
+		item.addItem("album",contertOut.string);
+		strlwr(contertOut.string,sqlStr);
+		item.addItem("album_key",sqlStr);
+		
+		mUvcontert.getItem(2,contertOut);
+		item.addItem("artist",contertOut.string);
+		strlwr(contertOut.string,sqlStr);
+		item.addItem("artist_key",sqlStr);
+#endif
+/*************************Uvcontert UFT-8***************************************/
+
 		memset(value, 0, len);
 		if (m_id3.GetTags(METADATA_KEY_GENRE, value)){
 		}else{
@@ -737,7 +796,7 @@ namespace mango
 		}else{
 			item.addItem("img_path","(null)");
 		}
-
+		log_i("------>end");
 		free(value);
 		value = NULL;
 	}

apps/player/player.cpp

@@ -796,6 +796,9 @@ namespace mango
 
 	Player  gPlayer;
 	MSkBitmap gWallpaperBitmap;
+	uint32_t (*possibleEncodings)(const char*) = NULL;
+	void (*ponvertValues)(uint32_t,const char*,char*) = NULL;
+	uint32_t mLocaleEncoding = kEncodingGBK;
 };
 
 
@@ -805,5 +808,28 @@ int main (int argc, char* argv[])
 #ifndef WIN32
 	//mango::Thread::sleep(1000 * 3);
 #endif
+#ifdef CONVERT_UTF8
+			log_i("------dlopen (/system/lib/libmedia.so)------");
+			void *	filehandle = dlopen("/system/lib/libmedia.so", RTLD_NOW);
+			
+			if(filehandle){
+				mango::possibleEncodings = (uint32_t (*)(const char*))dlsym(filehandle, "_ZN7android6mytestEPKc");
+				mango::ponvertValues = (void (*)(uint32_t,const char*,char*))dlsym(filehandle, "_ZN7android5myponEjPKcPc");
+				if(mango::possibleEncodings){
+					log_i("---------->get method possibleEncodings success");
+				}else{
+					log_i("---------->get possibleEncodings fail:%s",dlerror());
+				}
+
+				if(mango::ponvertValues){
+					log_i("---------->get method ponvertValues success");
+				}else{
+					log_i("---------->get ponvertValues fail:%s",dlerror());
+				}
+			}else{
+				log_i("dlopen (/system/lib/libmedia.so) fail!");
+			}
+#endif
+
 	return mango::gPlayer.main();
 }

apps/player/player.h

@@ -39,13 +39,28 @@
 #include "OggID3.h"
 #include "DsfID3.h"
 #include "AudioId3.h"
+#include <dlfcn.h>
+#include "Uvcontert.h"
 
 
 #define ARRAY_LIST_NUM 100
+#define CONVERT_UTF8
 
 namespace mango
 {	
 //#define NEED_SLEEP
+	enum {
+		kEncodingNone				= 0,
+		kEncodingShiftJIS			= (1 << 0),
+		kEncodingGBK				= (1 << 1),
+		kEncodingBig5				= (1 << 2),
+		kEncodingEUCKR				= (1 << 3),
+		kEncodingUTF8				= (1<<4),
+		kEncodingWin1251		   = (1<<5),
+		kEncodingWin1252		   = (1<<6),
+		kEncodingAll				= (kEncodingShiftJIS | kEncodingGBK | kEncodingBig5 | kEncodingEUCKR|kEncodingUTF8|kEncodingWin1251|kEncodingWin1252),
+	};
+
 
 	enum{
 		IOCTRL_BRIGTNESS_READ=0,
@@ -248,4 +263,7 @@ namespace mango
 
 	extern Player  gPlayer;
 	extern MSkBitmap gWallpaperBitmap;
+	extern uint32_t (*possibleEncodings)(const char*);
+	extern void (*ponvertValues)(uint32_t,const char*,char*);
+	extern uint32_t mLocaleEncoding;
 };