From: luozheng <1732036298@qq.com> Date: Mon, 26 May 2025 08:55:28 +0000 (+0800) Subject: 1.修改多国语言脚本 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~276 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=add352eeacf3d2bf6df236bf6b08695c1b3b5f67;p=mirrors%2FFD230.git 1.修改多国语言脚本 2.显示方式“瀑布流”多国语言ID修改 --- diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h index 58639fba8..e318efa8c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h @@ -1,15 +1,15 @@ -/* -* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. -* Description: language -* Author: Graphic develop team -* Create: 2021-07-06 -*/ - -#ifndef UI_RESOURCE_STRING_H -#define UI_RESOURCE_STRING_H -#include -namespace OHOS { -enum UIResourceTextId : uint16_t { +/* +* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. +* Description: language +* Author: Graphic develop team +* Create: 2021-07-06 +*/ + +#ifndef UI_RESOURCE_STRING_H +#define UI_RESOURCE_STRING_H +#include +namespace OHOS { +enum UIResourceTextId : uint16_t { STR_EXERCISE_OUTDOORWALKING = 0, STR_EXERCISE_OUTDOORRUNNING = 1, STR_EXERCISE_OUTDOORBIKING = 2, @@ -653,10 +653,11 @@ enum UIResourceTextId : uint16_t { STR_CLEAR_ALL_RECORDS = 640, STR_DEEPSEEK = 641, STR_AIMODES_LINGXI = 642, - STR_MAX_ID = 643, + STR_WATERFALL_DISPLAY = 643, + STR_MAX_ID = 644, }; // UIResourceTextId - -enum FontLanguageId : uint8_t { + +enum FontLanguageId : uint8_t { LANGUAGE_ID_AR, LANGUAGE_ID_AZ, LANGUAGE_ID_CS, diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp index ab18c6fb8..c99ad8c17 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp @@ -181,7 +181,7 @@ namespace OHOS scrollView->Add(titleText); /* -------------------------------------------------------------------------- */ // int16_t textId[] = {STR_LIST_DISPLAY, STR_CELLULAR_DISPLAY, STR_ARC_SCALE_LIST_DISPLAY,STR_DIAL_PLATE}; - int16_t textId[] = {STR_ARC_SCALE_LIST_DISPLAY, STR_CELLULAR_DISPLAY,STR_DIAL_PLATE,STR_DIAL_PLATE}; + int16_t textId[] = {STR_ARC_SCALE_LIST_DISPLAY, STR_CELLULAR_DISPLAY,STR_DIAL_PLATE,STR_WATERFALL_DISPLAY}; LabelConfig labelConfig = { .left = 143, .top = 153, diff --git a/code/sdk/files/fd230/fs/user/res/font/en.lang b/code/sdk/files/fd230/fs/user/res/font/en.lang index e737dabdf..123fa4325 100644 Binary files a/code/sdk/files/fd230/fs/user/res/font/en.lang and b/code/sdk/files/fd230/fs/user/res/font/en.lang differ diff --git a/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h index 64565ce03..e318efa8c 100644 --- a/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h +++ b/code/sdk/files/fd230/fs/user/res/font/ui_resource_string.h @@ -653,7 +653,8 @@ enum UIResourceTextId : uint16_t { STR_CLEAR_ALL_RECORDS = 640, STR_DEEPSEEK = 641, STR_AIMODES_LINGXI = 642, - STR_MAX_ID = 643, + STR_WATERFALL_DISPLAY = 643, + STR_MAX_ID = 644, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/files/fd230/fs/user/res/font/zh.lang b/code/sdk/files/fd230/fs/user/res/font/zh.lang index 2fd356c0e..f9138db4f 100644 Binary files a/code/sdk/files/fd230/fs/user/res/font/zh.lang and b/code/sdk/files/fd230/fs/user/res/font/zh.lang differ diff --git a/tools/language_tool/Language_xml/input_list_en.txt b/tools/language_tool/Language_xml/input_list_en.txt index ffafb47e7..c01835a88 100644 --- a/tools/language_tool/Language_xml/input_list_en.txt +++ b/tools/language_tool/Language_xml/input_list_en.txt @@ -642,4 +642,5 @@ STR_FRE_CONTACT$Frequent contact STR_RECORD_MAX$The recording space is full STR_CLEAR_ALL_RECORDS$Clear all records STR_DEEPSEEK$DeepSeek -STR_AIMODES_LINGXI$jiutian \ No newline at end of file +STR_AIMODES_LINGXI$jiutian +STR_WATERFALL_DISPLAY$Waterfall flow \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_zh.txt b/tools/language_tool/Language_xml/input_list_zh.txt index a0be7d7de..313911157 100644 --- a/tools/language_tool/Language_xml/input_list_zh.txt +++ b/tools/language_tool/Language_xml/input_list_zh.txt @@ -642,4 +642,5 @@ STR_FRE_CONTACT$常用联系人 STR_RECORD_MAX$录音空间已满 STR_CLEAR_ALL_RECORDS$清除全部记录 STR_DEEPSEEK$DeepSeek -STR_AIMODES_LINGXI$九天大模型 \ No newline at end of file +STR_AIMODES_LINGXI$九天大模型 +STR_WATERFALL_DISPLAY$瀑布流 \ No newline at end of file diff --git a/tools/language_tool/Language_xml/language_custom.xlsx b/tools/language_tool/Language_xml/language_custom.xlsx index 214b00981..2667bdb44 100644 Binary files a/tools/language_tool/Language_xml/language_custom.xlsx and b/tools/language_tool/Language_xml/language_custom.xlsx differ diff --git a/tools/language_tool/Language_xml/language_en.xml b/tools/language_tool/Language_xml/language_en.xml index ca5ed51d5..6252a36cc 100644 --- a/tools/language_tool/Language_xml/language_en.xml +++ b/tools/language_tool/Language_xml/language_en.xml @@ -644,4 +644,5 @@ + diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml index ecc53438d..b0f7134c9 100644 --- a/tools/language_tool/Language_xml/language_zh.xml +++ b/tools/language_tool/Language_xml/language_zh.xml @@ -644,4 +644,5 @@ + diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang index e737dabdf..123fa4325 100644 Binary files a/tools/language_tool/font/en.lang and b/tools/language_tool/font/en.lang differ diff --git a/tools/language_tool/font/ui_resource_string.h b/tools/language_tool/font/ui_resource_string.h index 64565ce03..e318efa8c 100644 --- a/tools/language_tool/font/ui_resource_string.h +++ b/tools/language_tool/font/ui_resource_string.h @@ -653,7 +653,8 @@ enum UIResourceTextId : uint16_t { STR_CLEAR_ALL_RECORDS = 640, STR_DEEPSEEK = 641, STR_AIMODES_LINGXI = 642, - STR_MAX_ID = 643, + STR_WATERFALL_DISPLAY = 643, + STR_MAX_ID = 644, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang index 2fd356c0e..f9138db4f 100644 Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ diff --git a/tools/language_tool/make_language.sh b/tools/language_tool/make_language.sh index 08b3cab2c..7be7697b2 100644 --- a/tools/language_tool/make_language.sh +++ b/tools/language_tool/make_language.sh @@ -32,10 +32,10 @@ python language_trans.py ../Language_xml/ ../font/ ../font/ echo "脚本生成文件执行完成。" #复制头文件 -cp ../font/ui_resource_string.h ../../../code/sdk/application/wearable/fd230app/nativelauncher/include/ +cp ../font/ui_resource_string.h ../../../code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ #复制资源文件 -cp -r ./font ../../code/sdk/files/fd230/fs/user/res/ +cp -r ../font ../../../code/sdk/files/fd230/fs/user/res/ #打印完成信息 echo "脚本复制文件执行完成。"