From: luozheng <1732036298@qq.com> Date: Thu, 23 Oct 2025 03:08:29 +0000 (+0800) Subject: 多国语言资源添加,272,230,n9同步修改 X-Git-Tag: V1.0.9_20251128_194606_LN~180^2~8 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=ef06959746f40890aa8d5113678ce0c035d3b9e1;p=mirrors%2FFD230.git 多国语言资源添加,272,230,n9同步修改 --- 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 51aba65f9..f47b2773f 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 @@ -733,8 +733,15 @@ enum UIResourceTextId : uint16_t { STR_REGISTER_TIME = 720, STR_CHECKIN_GPS = 721, STR_WORKSYNC = 722, - STR_EPHEMERIS_DOWNLOAD = 723, - STR_MAX_ID = 724, + STR_HRV = 723, + STR_WOMANHEALTH = 724, + STR_STRESS = 725, + STR_EPHEMERIS_DOWNLOAD = 726, + STR_STRESS_OVERLOAD = 727, + STR_STRESS_WARNING = 728, + STR_STRESS_NORMAL = 729, + STR_STRESS_EXCELLENT = 730, + STR_MAX_ID = 731, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingItemView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingItemView.cpp index aa583f2bb..17580ce28 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingItemView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingItemView.cpp @@ -60,15 +60,7 @@ namespace OHOS Icon.SetSrc(itemInfo.icon); settingLabelExt.SetVisible(true); settingLabelExt.SetPosition(SETTINGLABELEXT_X, SETTINGLABELEXT_Y, SETTINGLABELEXT_W, SETTINGLABELEXT_H); - if(itemInfo.textId == STR_SCREEN_OFF_DISPLAY){ - settingLabelExt.SetText("息屏表盘"); - } - else if(itemInfo.textId == STR_EPHEMERIS_DOWNLOAD){ - settingLabelExt.SetText("星历下载"); - } - else{ - settingLabelExt.SetTextId(itemInfo.textId); - } + settingLabelExt.SetTextId(itemInfo.textId); settingLabelExt.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); settingLabelButtonExt.SetVisible(true); SetHeight(120); @@ -89,15 +81,7 @@ namespace OHOS SetHeight(120); } settingLabelExt.SetPosition(SETTINGLABELEXT_X2, SETTINGLABELEXT_Y2, SETTINGLABELEXT_W2, SETTINGLABELEXT_H2); - if(itemInfo.textId == STR_SCREEN_OFF_DISPLAY){ - settingLabelExt.SetText("息屏表盘"); - } - else if(itemInfo.textId == STR_EPHEMERIS_DOWNLOAD){ - settingLabelExt.SetText("星历下载"); - } - else{ settingLabelExt.SetTextId(itemInfo.textId); - } settingLabelExt.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); settingLabelButtonExt.SetVisible(false); SetTouchable(false); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/ui_resource_string.h index 7ff7ffc23..3be910f64 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/ui_resource_string.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/ui_resource_string.h @@ -733,8 +733,15 @@ enum UIResourceTextId : uint16_t { STR_REGISTER_TIME = 720, STR_CHECKIN_GPS = 721, STR_WORKSYNC = 722, - STR_EPHEMERIS_DOWNLOAD = 723, - STR_MAX_ID = 724, + STR_HRV = 723, + STR_WOMANHEALTH = 724, + STR_STRESS = 725, + STR_EPHEMERIS_DOWNLOAD = 726, + STR_STRESS_OVERLOAD = 727, + STR_STRESS_WARNING = 728, + STR_STRESS_NORMAL = 729, + STR_STRESS_EXCELLENT = 730, + STR_MAX_ID = 731, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingItemView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingItemView.cpp index aa583f2bb..17580ce28 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingItemView.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingItemView.cpp @@ -60,15 +60,7 @@ namespace OHOS Icon.SetSrc(itemInfo.icon); settingLabelExt.SetVisible(true); settingLabelExt.SetPosition(SETTINGLABELEXT_X, SETTINGLABELEXT_Y, SETTINGLABELEXT_W, SETTINGLABELEXT_H); - if(itemInfo.textId == STR_SCREEN_OFF_DISPLAY){ - settingLabelExt.SetText("息屏表盘"); - } - else if(itemInfo.textId == STR_EPHEMERIS_DOWNLOAD){ - settingLabelExt.SetText("星历下载"); - } - else{ - settingLabelExt.SetTextId(itemInfo.textId); - } + settingLabelExt.SetTextId(itemInfo.textId); settingLabelExt.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); settingLabelButtonExt.SetVisible(true); SetHeight(120); @@ -89,15 +81,7 @@ namespace OHOS SetHeight(120); } settingLabelExt.SetPosition(SETTINGLABELEXT_X2, SETTINGLABELEXT_Y2, SETTINGLABELEXT_W2, SETTINGLABELEXT_H2); - if(itemInfo.textId == STR_SCREEN_OFF_DISPLAY){ - settingLabelExt.SetText("息屏表盘"); - } - else if(itemInfo.textId == STR_EPHEMERIS_DOWNLOAD){ - settingLabelExt.SetText("星历下载"); - } - else{ settingLabelExt.SetTextId(itemInfo.textId); - } settingLabelExt.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); settingLabelButtonExt.SetVisible(false); SetTouchable(false); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/stress/src/stressTestPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/stress/src/stressTestPresenter.cpp index 588131c65..b20c0776d 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/stress/src/stressTestPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/stress/src/stressTestPresenter.cpp @@ -13,7 +13,7 @@ namespace OHOS { REGIST_MENU_PRO(VIEW_STRESS_TEST, StressTestMainView, StressTestPresenter, - PNG_APPLIST_STRESS_IMAGE_BIG, PNG_APPLIST_STRESS_IMAGE, PNG_APPLIST_STRESS_IMAGE, "stress", STR_MUSIC); + PNG_APPLIST_STRESS_IMAGE_BIG, PNG_APPLIST_STRESS_IMAGE, PNG_APPLIST_STRESS_IMAGE, "stress", STR_STRESS); // 当前Presenter属性实例化的内存指针 static StressTestPresenter *g_pStressTestPresenter = nullptr; diff --git a/code/sdk/application/wearable/n9/nativeapp/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/n9/nativeapp/nativelauncher/include/ui_resource_string.h index 51aba65f9..f47b2773f 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativelauncher/include/ui_resource_string.h +++ b/code/sdk/application/wearable/n9/nativeapp/nativelauncher/include/ui_resource_string.h @@ -733,8 +733,15 @@ enum UIResourceTextId : uint16_t { STR_REGISTER_TIME = 720, STR_CHECKIN_GPS = 721, STR_WORKSYNC = 722, - STR_EPHEMERIS_DOWNLOAD = 723, - STR_MAX_ID = 724, + STR_HRV = 723, + STR_WOMANHEALTH = 724, + STR_STRESS = 725, + STR_EPHEMERIS_DOWNLOAD = 726, + STR_STRESS_OVERLOAD = 727, + STR_STRESS_WARNING = 728, + STR_STRESS_NORMAL = 729, + STR_STRESS_EXCELLENT = 730, + STR_MAX_ID = 731, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/settings/src/SettingItemView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/settings/src/SettingItemView.cpp index aa583f2bb..17580ce28 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/settings/src/SettingItemView.cpp +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/settings/src/SettingItemView.cpp @@ -60,15 +60,7 @@ namespace OHOS Icon.SetSrc(itemInfo.icon); settingLabelExt.SetVisible(true); settingLabelExt.SetPosition(SETTINGLABELEXT_X, SETTINGLABELEXT_Y, SETTINGLABELEXT_W, SETTINGLABELEXT_H); - if(itemInfo.textId == STR_SCREEN_OFF_DISPLAY){ - settingLabelExt.SetText("息屏表盘"); - } - else if(itemInfo.textId == STR_EPHEMERIS_DOWNLOAD){ - settingLabelExt.SetText("星历下载"); - } - else{ - settingLabelExt.SetTextId(itemInfo.textId); - } + settingLabelExt.SetTextId(itemInfo.textId); settingLabelExt.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); settingLabelButtonExt.SetVisible(true); SetHeight(120); @@ -89,15 +81,7 @@ namespace OHOS SetHeight(120); } settingLabelExt.SetPosition(SETTINGLABELEXT_X2, SETTINGLABELEXT_Y2, SETTINGLABELEXT_W2, SETTINGLABELEXT_H2); - if(itemInfo.textId == STR_SCREEN_OFF_DISPLAY){ - settingLabelExt.SetText("息屏表盘"); - } - else if(itemInfo.textId == STR_EPHEMERIS_DOWNLOAD){ - settingLabelExt.SetText("星历下载"); - } - else{ settingLabelExt.SetTextId(itemInfo.textId); - } settingLabelExt.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); settingLabelButtonExt.SetVisible(false); SetTouchable(false); 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 c14436584..71902bbfa 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 f29fee73e..fb3489cd9 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 @@ -733,7 +733,15 @@ enum UIResourceTextId : uint16_t { STR_REGISTER_TIME = 720, STR_CHECKIN_GPS = 721, STR_WORKSYNC = 722, - STR_MAX_ID = 723, + STR_HRV = 723, + STR_WOMANHEALTH = 724, + STR_STRESS = 725, + STR_EPHEMERIS_DOWNLOAD = 726, + STR_STRESS_OVERLOAD = 727, + STR_STRESS_WARNING = 728, + STR_STRESS_NORMAL = 729, + STR_STRESS_EXCELLENT = 730, + STR_MAX_ID = 731, }; // 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 1bbe6dabb..7f7535477 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/code/sdk/files/fd272/fs/user/res/font/en.lang b/code/sdk/files/fd272/fs/user/res/font/en.lang index c14436584..71902bbfa 100644 Binary files a/code/sdk/files/fd272/fs/user/res/font/en.lang and b/code/sdk/files/fd272/fs/user/res/font/en.lang differ diff --git a/code/sdk/files/fd272/fs/user/res/font/ui_resource_string.h b/code/sdk/files/fd272/fs/user/res/font/ui_resource_string.h index f29fee73e..f47b2773f 100644 --- a/code/sdk/files/fd272/fs/user/res/font/ui_resource_string.h +++ b/code/sdk/files/fd272/fs/user/res/font/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, @@ -733,10 +733,18 @@ enum UIResourceTextId : uint16_t { STR_REGISTER_TIME = 720, STR_CHECKIN_GPS = 721, STR_WORKSYNC = 722, - STR_MAX_ID = 723, + STR_HRV = 723, + STR_WOMANHEALTH = 724, + STR_STRESS = 725, + STR_EPHEMERIS_DOWNLOAD = 726, + STR_STRESS_OVERLOAD = 727, + STR_STRESS_WARNING = 728, + STR_STRESS_NORMAL = 729, + STR_STRESS_EXCELLENT = 730, + STR_MAX_ID = 731, }; // UIResourceTextId - -enum FontLanguageId : uint8_t { + +enum FontLanguageId : uint8_t { LANGUAGE_ID_AR, LANGUAGE_ID_AZ, LANGUAGE_ID_CS, diff --git a/code/sdk/files/fd272/fs/user/res/font/zh.lang b/code/sdk/files/fd272/fs/user/res/font/zh.lang index 1bbe6dabb..7f7535477 100644 Binary files a/code/sdk/files/fd272/fs/user/res/font/zh.lang and b/code/sdk/files/fd272/fs/user/res/font/zh.lang differ diff --git a/code/sdk/files/n9/fs/user/res/font/en.lang b/code/sdk/files/n9/fs/user/res/font/en.lang index c14436584..71902bbfa 100644 Binary files a/code/sdk/files/n9/fs/user/res/font/en.lang and b/code/sdk/files/n9/fs/user/res/font/en.lang differ diff --git a/code/sdk/files/n9/fs/user/res/font/ui_resource_string.h b/code/sdk/files/n9/fs/user/res/font/ui_resource_string.h index f29fee73e..fb3489cd9 100644 --- a/code/sdk/files/n9/fs/user/res/font/ui_resource_string.h +++ b/code/sdk/files/n9/fs/user/res/font/ui_resource_string.h @@ -733,7 +733,15 @@ enum UIResourceTextId : uint16_t { STR_REGISTER_TIME = 720, STR_CHECKIN_GPS = 721, STR_WORKSYNC = 722, - STR_MAX_ID = 723, + STR_HRV = 723, + STR_WOMANHEALTH = 724, + STR_STRESS = 725, + STR_EPHEMERIS_DOWNLOAD = 726, + STR_STRESS_OVERLOAD = 727, + STR_STRESS_WARNING = 728, + STR_STRESS_NORMAL = 729, + STR_STRESS_EXCELLENT = 730, + STR_MAX_ID = 731, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/files/n9/fs/user/res/font/zh.lang b/code/sdk/files/n9/fs/user/res/font/zh.lang index 1bbe6dabb..7f7535477 100644 Binary files a/code/sdk/files/n9/fs/user/res/font/zh.lang and b/code/sdk/files/n9/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 7474239ff..8e5e9acdd 100644 --- a/tools/language_tool/Language_xml/input_list_en.txt +++ b/tools/language_tool/Language_xml/input_list_en.txt @@ -645,7 +645,7 @@ STR_DEEPSEEK$DeepSeek STR_AIMODES_LINGXI$jiutian STR_WATERFALL_DISPLAY$Waterfall flow STR_AOD_DIAL$AOD dial -STR_SCREEN_OFF_DISPLAY$Screen-off display +STR_SCREEN_OFF_DISPLAY$AOD Watch Face STR_AOD_REMIND$After enabling, the watch will display time and other information in the screen-off state, but it will also increase power consumption. STR_BP_CHECK$Blood pressure measurement STR_BP_CALIBRATE$Blood pressure calibration @@ -722,4 +722,8 @@ STR_DEPARTMENT$Department: STR_PHONE_NUMBER$Phone number: STR_REGISTER_TIME$Registration time: STR_CHECKIN_GPS$Waiting for GPS positioning. -STR_WORKSYNC$worksync \ No newline at end of file +STR_WORKSYNC$worksync +STR_HRV$HRV +STR_WOMANHEALTH$Woman Health +STR_STRESS$Stress +STR_EPHEMERIS_DOWNLOAD$Ephemeris Download \ 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 3902fc877..6114eefad 100644 --- a/tools/language_tool/Language_xml/input_list_zh.txt +++ b/tools/language_tool/Language_xml/input_list_zh.txt @@ -645,7 +645,7 @@ STR_DEEPSEEK$DeepSeek STR_AIMODES_LINGXI$九天大模型 STR_WATERFALL_DISPLAY$瀑布流 STR_AOD_DIAL$AOD表盘 -STR_SCREEN_OFF_DISPLAY$息屏显示 +STR_SCREEN_OFF_DISPLAY$息屏表盘 STR_AOD_REMIND$开启后,手表在在息屏状态下也会显示时间等信息,但同时会增加耗电 STR_BP_CHECK$血压测量 STR_BP_CALIBRATE$血压校准 @@ -722,4 +722,12 @@ STR_DEPARTMENT$部门: STR_PHONE_NUMBER$手机号: STR_REGISTER_TIME$注册时间: STR_CHECKIN_GPS$等待GPS定位中 -STR_WORKSYNC$worksync \ No newline at end of file +STR_WORKSYNC$worksync +STR_HRV$HRV +STR_WOMANHEALTH$女性健康 +STR_STRESS$压力 +STR_EPHEMERIS_DOWNLOAD$星历下载 +STR_STRESS_OVERLOAD$当前压力过高,建议暂停工作,进行呼吸训练或冥想 +STR_STRESS_WARNING$存在轻微压力,建议试试1分钟深呼吸或远眺 +STR_STRESS_NORMAL$压力在健康范围,建议继续保持规律作息,状态良好 +STR_STRESS_EXCELLENT$当前压力极低,建议保持当前状态,享受放松时刻 \ 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 519395672..b6783667f 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 f794955e7..4c40853bd 100644 --- a/tools/language_tool/Language_xml/language_en.xml +++ b/tools/language_tool/Language_xml/language_en.xml @@ -646,7 +646,7 @@ - + @@ -724,4 +724,8 @@ + + + + diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml index 51bd300e9..aea70c323 100644 --- a/tools/language_tool/Language_xml/language_zh.xml +++ b/tools/language_tool/Language_xml/language_zh.xml @@ -646,7 +646,7 @@ - + @@ -724,4 +724,12 @@ + + + + + + + + diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang index c14436584..71902bbfa 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 f29fee73e..fb3489cd9 100644 --- a/tools/language_tool/font/ui_resource_string.h +++ b/tools/language_tool/font/ui_resource_string.h @@ -733,7 +733,15 @@ enum UIResourceTextId : uint16_t { STR_REGISTER_TIME = 720, STR_CHECKIN_GPS = 721, STR_WORKSYNC = 722, - STR_MAX_ID = 723, + STR_HRV = 723, + STR_WOMANHEALTH = 724, + STR_STRESS = 725, + STR_EPHEMERIS_DOWNLOAD = 726, + STR_STRESS_OVERLOAD = 727, + STR_STRESS_WARNING = 728, + STR_STRESS_NORMAL = 729, + STR_STRESS_EXCELLENT = 730, + STR_MAX_ID = 731, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang index 1bbe6dabb..7f7535477 100644 Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ