取消代码中utf8的编码转换

Project/Src/MyWin/mywin_cfg.c

@@ -403,14 +403,14 @@ int WIN_GetWordData(u8 size,u8 type,unsigned char *buff, int word, int buff_size
 	{
 		gbk[0]=(word>>16)&0xff;
 		gbk[1]=(word>>8)&0xff;
-		gbk[2]=word&0xff;
+		// gbk[2]=word&0xff;
 	}
 	else
 	{
 		gbk[0]=word;
 	}
 
-	utf82uni_str(gbk,uni);
+	gbk2uni_str(gbk,uni);
 
 
 	if (g_ft_face)

Project/Src/MyWinApp/mywin_user_filder.c

@@ -14,6 +14,7 @@
 #include "nrf.h"
 #include "mywin_user_debug.h"
 #include "string.h"
+#include "char_encode.h"
 
 // 文件管理器
 

Project/Src/MyWinApp/mywin_user_filder.h

@@ -1,10 +1,6 @@
 #ifndef MYWIN_USER_FILDER_H__
 #define MYWIN_USER_FILDER_H__
 
-
-
-
-
 // 定义列表中最大显示文件数
 #define FILDER_FILE_MAXNUM 1000
 
@@ -15,7 +11,6 @@
 #define FILDER_FILE_TYPE 1
 #define FILDER_DIR_TYPE 0
 
-
 // 路径栈
 typedef struct
 {
@@ -24,9 +19,6 @@ typedef struct
 	int fileNum;
 } Filder_Path;
 
-
-
-
 typedef struct
 {
 	char name[256];
@@ -34,9 +26,6 @@ typedef struct
 	uint64_t size;
 } Filder_FildInfo;
 
-
-
-
 typedef struct
 {
 	WIN_TouchWinStruct win;
@@ -63,15 +52,10 @@ typedef struct
 	int y_off; // 支持触屏
 } WIN_FilderStruct;
 
-
-
 WIN_FilderStruct *WIN_CreatFilder(WIN_WindowStruct *base,
 																	void (*msgLoop)(struct _WIN_WindowStruct *win, WIN_MsgStruct *msg),
 																	int x, int y, int x_size, int y_size);
 
-
-	
-
 // 设置文件路径，同时扫描路径下的文件
 void FILDER_SetFileDir(WIN_FilderStruct *filder, char *dir);
 
@@ -93,15 +77,12 @@ void FILDER_GetFileRoute (WIN_FilderStruct *filder);
 // 清空条目
 void FILDER_ClearItem(WIN_FilderStruct *filder);
 
-			
 // 添加一个文件条目
 void FILDER_AddItem(WIN_FilderStruct *filder, Filder_FildInfo *file);
 
-			
 // 在指定位置插入一个条目
 void FILDER_InsertItem(WIN_FilderStruct *filder, Filder_FildInfo *file, int index);
 
-			
 // 扫描文件
 void FILDER_ScanFile(WIN_FilderStruct *filder);
 
@@ -117,6 +98,4 @@ void FILDER_defaultMsgLoop (WIN_FilderStruct *filder,WIN_MsgStruct *msg);
 // 选则文件
 int FILDER_ChooseFile(WIN_WindowStruct *win, char *dir);
 
-
 #endif
-

Project/Src/MyWinApp/mywin_user_tool.c

@@ -53,12 +53,9 @@ static void MENU_ToolEnter(WIN_MenuStruct *menu)
 {
 	// 选择了一个
 	char *path = mymalloc(256);
-	char *tmp = mymalloc(256);
-	utf82gbk_str(MENU_GetSelectItem(menu), tmp);
-	sprintf(path, "%s/%s", TOOL_APP_PATH, tmp);
+	sprintf(path, "%s/%s", TOOL_APP_PATH, MENU_GetSelectItem(menu));
 	app_run_path(path);
 	myfree(path);
-	myfree(tmp);
 }
 
 static void MENU_ToolDeleteFun(WIN_MenuStruct *menu)

Project/make.py

@@ -237,7 +237,6 @@ def run_cmd_queue(cmd_queue:Queue,cpu_num:int=8):
   while not cmd_queue.empty():
     cmd_queue.get()
   cmd_queue.cancel_join_thread()
-  
   return ret
 
 

conv_code.py

@@ -25,10 +25,10 @@ def find_type(path:str,fix:str):
 def conv(file:str):
     s=""
     try:
-        with open(file,encoding="gb2312") as f:
+        with open(file,encoding="utf-8") as f:
             s=f.read()
         os.remove(file)
-        with open(file,mode="w+",encoding="utf-8") as f:
+        with open(file,mode="w+",encoding="gbk") as f:
             f.write(s)
     except Exception as e:
         print("conv failed",file)