From: 袁清梦 <3449750381@qq.com> Date: Mon, 19 Aug 2024 03:33:44 +0000 (+0000) Subject: Merge #722 into sdk602patch0626 from refs/changes/722/head X-Git-Tag: release_V1.2.70_20241020_135402~636^2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=b30f41554b94a14c5770f2a052b82d91d3b52def;p=mirrors%2FFD230.git Merge #722 into sdk602patch0626 from refs/changes/722/head 更新语言工具进行适配 * refs/changes/722/head: (1 commits squashed) - 更新语言工具进行适配 Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/722 --- diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h index 75923127f..061540995 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h @@ -534,8 +534,8 @@ enum UIResourceTextId : uint16_t { }; // UIResourceTextId enum FontLanguageId : uint8_t { - LANGUAGE_ID_EN, LANGUAGE_ID_ZH, + LANGUAGE_ID_EN, LANGUAGE_ID_MAX }; // UITextLanguageTextId } diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h index 75923127f..061540995 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h @@ -534,8 +534,8 @@ enum UIResourceTextId : uint16_t { }; // UIResourceTextId enum FontLanguageId : uint8_t { - LANGUAGE_ID_EN, LANGUAGE_ID_ZH, + LANGUAGE_ID_EN, LANGUAGE_ID_MAX }; // UITextLanguageTextId } diff --git a/tools/language_tool/Language_xml/language.xlsx b/tools/language_tool/Language_xml/language.xlsx new file mode 100644 index 000000000..95c1b8cb0 Binary files /dev/null and b/tools/language_tool/Language_xml/language.xlsx differ diff --git a/tools/language_tool/Language_xml/languagetool.py b/tools/language_tool/Language_xml/languagetool.py index a10ba3bef..982aca87c 100644 --- a/tools/language_tool/Language_xml/languagetool.py +++ b/tools/language_tool/Language_xml/languagetool.py @@ -1,3 +1,9 @@ +''' +Date: 2024-07-11 20:53:59 +LastEditors: Caisking 3449750381@qq.com +LastEditTime: 2024-08-19 11:13:38 +FilePath: /FD230/tools/language_tool/Language_xml/languagetool.py +''' import xml.dom.minidom # 从外部文件读取列表数据，使用特殊分隔符 @@ -42,3 +48,5 @@ generate_xml_from_list(input_list_zh, "./language_zh.xml", "zh", "$") #generate_xml_from_list(input_list_de, "./language_de.xml", "de", "$") print("XML文件生成完成。") + + diff --git a/tools/language_tool/Language_xml/sheettool.py b/tools/language_tool/Language_xml/sheettool.py new file mode 100644 index 000000000..1aee7222f --- /dev/null +++ b/tools/language_tool/Language_xml/sheettool.py @@ -0,0 +1,53 @@ +''' +Date: 2024-08-19 11:11:21 +LastEditors: Caisking 3449750381@qq.com +LastEditTime: 2024-08-19 11:19:48 +FilePath: /FD230/tools/language_tool/Language_xml/sheettool.py +''' + +import xlsxwriter +import os + +# 设置路径 +path = r"." +# os.chdir(path) # 如果需要更改工作目录可以取消注释 + +# 文件名称 +output_file = "language.xlsx" + +# 检查文件是否存在并删除 +if os.path.isfile(output_file): + os.remove(output_file) + +# 创建一个新的 Excel 文件 +workbook = xlsxwriter.Workbook(output_file) + +# 定义表头 +headings = ['id', '内容'] + +def write_to_worksheet(worksheet, filename): + """ + 从指定文件读取内容并写入指定工作表 + """ + worksheet.write_row('A1', headings) # 写入表头 + + with open(filename, 'r', encoding='utf-8') as f: # 使用 with 语句确保文件正确关闭 + for i, line in enumerate(f, start=1): # start=1 自然从 1 开始计数 + line = line.strip() # 去掉前后空白字符 + if line: # 确保行不为空 + parts = line.split('$') + worksheet.write(i, 0, parts[0]) + worksheet.write(i, 1, parts[-1]) + +# 创建英语工作表并写入数据 +worksheet_en = workbook.add_worksheet("英文") +write_to_worksheet(worksheet_en, "input_list_en.txt") + +# 创建中文工作表并写入数据 +worksheet_zh = workbook.add_worksheet("中文") +write_to_worksheet(worksheet_zh, "input_list_zh.txt") + +# 关闭工作簿 +workbook.close() + +print("脚本生成表格文件执行完成。") \ No newline at end of file diff --git a/tools/language_tool/font/ui_resource_string.h b/tools/language_tool/font/ui_resource_string.h index 75923127f..061540995 100644 --- a/tools/language_tool/font/ui_resource_string.h +++ b/tools/language_tool/font/ui_resource_string.h @@ -534,8 +534,8 @@ enum UIResourceTextId : uint16_t { }; // UIResourceTextId enum FontLanguageId : uint8_t { - LANGUAGE_ID_EN, LANGUAGE_ID_ZH, + LANGUAGE_ID_EN, LANGUAGE_ID_MAX }; // UITextLanguageTextId } diff --git a/tools/language_tool/make_language.sh b/tools/language_tool/make_language.sh index fddddbc3d..a85449c97 100644 --- a/tools/language_tool/make_language.sh +++ b/tools/language_tool/make_language.sh @@ -2,7 +2,7 @@ ### # @Date: 2024-07-11 20:53:59 # @LastEditors: Caisking 3449750381@qq.com - # @LastEditTime: 2024-08-16 10:20:31 + # @LastEditTime: 2024-08-19 11:16:33 # @FilePath: /FD230/tools/language_tool/make_language.sh ### @@ -32,5 +32,11 @@ cp ../font/ui_resource_string.h ../../../code/sdk/application/wearable/fd230app #复制资源文件 cp -r ../font ../../../code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ -# 打印完成信息 -echo "脚本复制文件执行完成。" \ No newline at end of file +#打印完成信息 +echo "脚本复制文件执行完成。" + +#cd表格生成路径 +cd ../Language_xml/ + +#运行 生成xlsx表格 +python ./sheettool.py \ No newline at end of file diff --git "a/tools/language_tool/\345\244\232\345\233\275\350\257\255\350\250\200\345\267\245\345\205\267\350\204\232\346\234\254.md" "b/tools/language_tool/\345\244\232\345\233\275\350\257\255\350\250\200\345\267\245\345\205\267\350\204\232\346\234\254.md" index 87d9315be..794ddb6cd 100644 --- "a/tools/language_tool/\345\244\232\345\233\275\350\257\255\350\250\200\345\267\245\345\205\267\350\204\232\346\234\254.md" +++ "b/tools/language_tool/\345\244\232\345\233\275\350\257\255\350\250\200\345\267\245\345\205\267\350\204\232\346\234\254.md" @@ -1,7 +1,7 @@ ## 多国语言工具脚本使用方法 @@ -91,3 +91,6 @@ chmod +x languagemake.sh ### 更新 0815 脚本增加生成文件直接copy功能 复制到对应文件夹 + +### 更新 0819 +脚本增加xlsx表格生成功能 \ No newline at end of file