From: luozheng <1732036298@qq.com> Date: Tue, 20 Aug 2024 02:53:07 +0000 (+0800) Subject: 倒计时界面配置多国语言 X-Git-Tag: release_V1.2.70_20241020_135402~627 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=2bc3d56d6fc6972b3907d06d744dacedf60db473;p=mirrors%2FFD230.git 倒计时界面配置多国语言 --- 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 fc0599e31..974f2c6e6 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 @@ -531,7 +531,20 @@ enum UIResourceTextId : uint16_t { STR_IGNORE = 518, STR_START = 519, STR_ARC_SCALE_LIST_DISPLAY = 520, - STR_MAX_ID = 521, + STR_COUNT_DOWN = 521, + STR_CUSTOM_TIME = 522, + STR_QUICK_START = 523, + STR_1_MIN = 524, + STR_5_MIN = 525, + STR_10_MIN = 526, + STR_30_MIN = 527, + STR_SET_COUNT_DOWN_NOTE = 528, + STR_COUNTDOWN_ENDS = 529, + STR_MAXIMUM_TIME_REACH = 530, + STR_STOPWATCH_STOP_NOTE = 531, + STR_TMCHBR = 532, + STR_MAXIMUM_TIME_REACH_NOTE = 533, + STR_MAX_ID = 534, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownPresenter.h index d946e7b39..c87e4a417 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownPresenter.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-07 18:15:53 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-07 19:57:56 + * @LastEditTime: 2024-08-20 10:17:35 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownPresenter.h */ #ifndef MAIN_COUNTDOWN_PRESENTER_H @@ -11,7 +11,7 @@ #include "View.h" #include "Presenter.h" #include "MainCountDownView.h" - +#include "ui_resource_string.h" /*倒计时的主界面*/ namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownView.h b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownView.h index 2eaf8ca2a..0b43fbb59 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-07 18:15:53 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-08 16:15:10 + * @LastEditTime: 2024-08-20 10:48:28 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownView.h */ #ifndef MAIN_COUNTDOWN_VIEW_H @@ -67,7 +67,7 @@ namespace OHOS private: void MainCountDownViewInit(void); void ClearAll(void); - UILabelButtonExt *SetUILabelButton(int x, int y, int w, int h, const char *id, const char *text); + UILabelButtonExt *SetUILabelButton(int x, int y, int w, int h, const char *id, const char *text,int textId); UIViewGroup *group = nullptr; UIScrollView *scrollView[COUNTDOWN_MAX_VIEW]{nullptr}; UILabelExt *Title{nullptr}; diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp index b93a47fc0..e89f7ce55 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-07 18:15:53 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-09 15:38:14 + * @LastEditTime: 2024-08-20 10:18:17 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp */ #include "countdown/include/CountDownModel.h" @@ -12,8 +12,8 @@ #include "wearable_log.h" #include "countdown/include/MainCountDownView.h" #include -#include "../../../../../../../drivers/peripheral/config/include/ConfigModel.h" - +#include "ConfigModel.h" +#include "ui_resource_string.h" namespace OHOS { /* -------------------------------------------------------------------------- */ @@ -386,7 +386,7 @@ namespace OHOS MainCountDownView::GetInstance()->GetStartCountDownView()->GetPlayOrPauseToggleButton()->SetVisible(false); MainCountDownView::GetInstance()->GetStartCountDownView()->GetRepeatButton()->SetVisible(true); CountDownModel::GetInstance()->CountDown_StopTimer(); // 停止定时器 - MainCountDownView::GetInstance()->GetStartCountDownView()->GetShowCountDownTimelabel()->SetText("倒计时结束"); + MainCountDownView::GetInstance()->GetStartCountDownView()->GetShowCountDownTimelabel()->SetTextId(STR_COUNTDOWN_ENDS);//倒计时结束 // 进行倒计时结束时的额外操作，比如播放声音、显示通知等 // CountDownModel::GetInstance()->StartRingtonePlayback(); CountDownModel::GetInstance()->RequestStartRingtone(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp index da9348c0e..3863c7917 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp @@ -91,13 +91,13 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeConfigView::Title is new fail!!"); return nullptr; } - Title->SetPosition(83, 52, 300, 40); + Title->SetPosition(83, 50, 300, 35); Title->SetStyle(STYLE_TEXT_FONT, 30); Title->SetStyle(STYLE_LINE_HEIGHT, 35); - Title->SetText("倒计时"); - Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + Title->SetTextId(STR_COUNT_DOWN);//倒计时 + Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(40); + Title->SetRollSpeed(70); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ timePicker = new UITimePicker(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp index dbb2cd97b..4f8918875 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp @@ -73,13 +73,13 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::Title is new fail!!"); return nullptr; } - Title->SetPosition(83, 52, 300, 40); + Title->SetPosition(83, 50, 300, 35); Title->SetStyle(STYLE_TEXT_FONT, 30); Title->SetStyle(STYLE_LINE_HEIGHT, 35); - Title->SetText("倒计时"); - Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + Title->SetTextId(STR_COUNT_DOWN); // 倒计时 + Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(40); + Title->SetRollSpeed(70); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ Attention = new UIImageView(); @@ -98,23 +98,25 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::AttentionLabel is new fail!!"); return nullptr; } - AttentionLabel->SetPosition(33, 253, 400, 40); + AttentionLabel->SetPosition(33, 253, 400, 35); AttentionLabel->SetStyle(STYLE_TEXT_FONT, 30); AttentionLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - AttentionLabel->SetText("请先设置好倒计时间"); - AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + AttentionLabel->SetTextId(STR_SET_COUNT_DOWN_NOTE); // 请先设置好倒计时间 + AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); AttentionLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - AttentionLabel->SetRollSpeed(40); + AttentionLabel->SetRollSpeed(70); AttentionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ + button = new UILabelButtonExt(); if (button == nullptr) { - button = new UILabelButtonExt(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::button is new fail!!"); + return nullptr; } button->SetPosition(0, 366, 466, 100); button->SetViewId(COUNTDOWNTIMENOTNULLVIEWRETURNBUTTON); button->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE); - button->SetText("知道了"); + button->SetTextId(STR_KONW); // 知道了 button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); button->SetStyle(STYLE_LINE_HEIGHT, 35); button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED); diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp index 2680cbae7..843c5693c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp @@ -142,13 +142,13 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title is new fail!!"); return; } - Title->SetPosition(83, 55, 300, 40); + Title->SetPosition(83, 50, 300, 35); Title->SetStyle(STYLE_TEXT_FONT, 30); Title->SetStyle(STYLE_LINE_HEIGHT, 35); - Title->SetText("倒计时"); - Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + Title->SetTextId(STR_COUNT_DOWN); // 倒计时 + Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(40); + Title->SetRollSpeed(70); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------- CUSTOM_COUNTDOWN ------------------------- */ CUSTOM_COUNTDOWN = new UILabelButtonExt(); @@ -161,7 +161,7 @@ namespace OHOS CUSTOM_COUNTDOWN->SetViewId(COUNTDOWN_LABELBUTTON_VIEWID); CUSTOM_COUNTDOWN->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffa800); CUSTOM_COUNTDOWN->SetStyle(STYLE_BORDER_RADIUS, 100); - CUSTOM_COUNTDOWN->SetText("自定义时间"); + CUSTOM_COUNTDOWN->SetTextId(STR_CUSTOM_TIME); // 自定义时间 CUSTOM_COUNTDOWN->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); CUSTOM_COUNTDOWN->SetStyle(STYLE_LINE_HEIGHT, 35); CUSTOM_COUNTDOWN->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffa800, UIButton::PRESSED); @@ -172,37 +172,37 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "QuickStart is new fail!!"); return; } - QuickStart->SetPosition(83, 270, 300, 40); + QuickStart->SetPosition(83, 270, 300, 35); QuickStart->SetStyle(STYLE_TEXT_FONT, 30); QuickStart->SetStyle(STYLE_LINE_HEIGHT, 35); - QuickStart->SetText("快速开始"); - QuickStart->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + QuickStart->SetTextId(STR_QUICK_START); + QuickStart->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); QuickStart->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - QuickStart->SetRollSpeed(40); + QuickStart->SetRollSpeed(70); QuickStart->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* ----------------------- COUNTDOWN_ONE_MINUTE_BUTTON ---------------------- */ - COUNTDOWN_ONE_MINUTE_BUTTON = SetUILabelButton(43, 345, 180, 150, COUNTDOWN_ONE_MINUTE_BUTTON_VIEWID, "1分钟"); + COUNTDOWN_ONE_MINUTE_BUTTON = SetUILabelButton(43, 345, 180, 150, COUNTDOWN_ONE_MINUTE_BUTTON_VIEWID, "1分钟", STR_1_MIN); if (COUNTDOWN_ONE_MINUTE_BUTTON == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_ONE_MINUTE_BUTTON is new fail!!"); return; } /* ---------------------- COUNTDOWN_FIVE_MINUTE_BUTTON ---------------------- */ - COUNTDOWN_FIVE_MINUTE_BUTTON = SetUILabelButton(243, 345, 180, 150, COUNTDOWN_FIVE_MINUTE_BUTTON_VIEWID, "5分钟"); + COUNTDOWN_FIVE_MINUTE_BUTTON = SetUILabelButton(243, 345, 180, 150, COUNTDOWN_FIVE_MINUTE_BUTTON_VIEWID, "5分钟", STR_5_MIN); if (COUNTDOWN_FIVE_MINUTE_BUTTON == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_FIVE_MINUTE_BUTTON is new fail!!"); return; } /* ----------------------- COUNTDOWN_TEN_MINUTE_BUTTON ---------------------- */ - COUNTDOWN_TEN_MINUTE_BUTTON = SetUILabelButton(43, 515, 180, 150, COUNTDOWN_TEN_MINUTE_BUTTON_VIEWID, "10分钟"); + COUNTDOWN_TEN_MINUTE_BUTTON = SetUILabelButton(43, 515, 180, 150, COUNTDOWN_TEN_MINUTE_BUTTON_VIEWID, "10分钟", STR_10_MIN); if (COUNTDOWN_TEN_MINUTE_BUTTON == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_TEN_MINUTE_BUTTON is new fail!!"); return; } /* --------------------- COUNTDOWN_THIRTY_MINUTE_BUTTON --------------------- */ - COUNTDOWN_THIRTY_MINUTE_BUTTON = SetUILabelButton(243, 515, 180, 150, COUNTDOWN_THIRTY_MINUTE_BUTTON_VIEWID, "30分钟"); + COUNTDOWN_THIRTY_MINUTE_BUTTON = SetUILabelButton(243, 515, 180, 150, COUNTDOWN_THIRTY_MINUTE_BUTTON_VIEWID, "30分钟", STR_30_MIN); if (COUNTDOWN_THIRTY_MINUTE_BUTTON == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_THIRTY_MINUTE_BUTTON is new fail!!"); @@ -218,7 +218,7 @@ namespace OHOS } } - UILabelButtonExt *MainCountDownView::SetUILabelButton(int x, int y, int w, int h, const char *id, const char *text) + UILabelButtonExt *MainCountDownView::SetUILabelButton(int x, int y, int w, int h, const char *id, const char *text, int textId) { UILabelButtonExt *button = new UILabelButtonExt(); if (button == nullptr) diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp index e93ec1234..42424d298 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp @@ -95,13 +95,13 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::Title is is new fail!!"); return nullptr; } - Title->SetPosition(83, 52, 300, 40); + Title->SetPosition(83, 50, 300, 35); Title->SetStyle(STYLE_TEXT_FONT, 30); Title->SetStyle(STYLE_LINE_HEIGHT, 35); - Title->SetText("倒计时"); - Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + Title->SetTextId(STR_COUNT_DOWN); // 倒计时 + Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - Title->SetRollSpeed(40); + Title->SetRollSpeed(70); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ showCountDownTimelabel = new UILabelExt(); @@ -142,9 +142,11 @@ namespace OHOS showTheRingTime->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); showTheRingTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 35); /* -------------------------------------------------------------------------- */ + play_or_pause_toggleButton = new UIToggleButton(); if (play_or_pause_toggleButton == nullptr) { - play_or_pause_toggleButton = new UIToggleButton(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "play_or_pause_toggleButton is new fail!!"); + return nullptr; } play_or_pause_toggleButton->SetPosition(248, 321, 100, 100); play_or_pause_toggleButton->SetViewId(PlayOrPauseToggleButton_ViewID); @@ -156,10 +158,11 @@ namespace OHOS play_or_pause_toggleButton->SetVisible(true); /* -------------------------------------------------------------------------- */ - // Add Button to App + endbutton = new UIButton(); if (endbutton == nullptr) { - endbutton = new UIButton(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "endbutton is new fail!!"); + return nullptr; } endbutton->SetPosition(118, 321); endbutton->Resize(100, 100); @@ -172,11 +175,11 @@ namespace OHOS endbutton->SetStyleForState(STYLE_BORDER_RADIUS, 100, UIButton::PRESSED); UIView::OnClickListener *buttonClick = static_cast(MainCountDownPresenter::GetInstance()); endbutton->SetOnClickListener(buttonClick); - /* ----------------------------------- Add ---------------------------------- */ - + RepeatButton = new UIButton(); if (nullptr == RepeatButton) { - RepeatButton = new UIButton(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "endbutton is new fail!!"); + return nullptr; } RepeatButton->SetPosition(248, 321); RepeatButton->Resize(100, 100); @@ -187,10 +190,11 @@ namespace OHOS RepeatButton->SetImageSrc(RepeatButtonImagePath, RepeatButtonImagePath); RepeatButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffa800, UIButton::PRESSED); RepeatButton->SetStyleForState(STYLE_BORDER_RADIUS, 100, UIButton::PRESSED); - UIView::OnClickListener * RepeatButtonClick = static_cast(MainCountDownPresenter::GetInstance()); + UIView::OnClickListener *RepeatButtonClick = static_cast(MainCountDownPresenter::GetInstance()); RepeatButton->SetOnClickListener(RepeatButtonClick); RepeatButton->SetVisible(false); - + + /* ----------------------------------- Add ---------------------------------- */ scrollView->Add(Title); scrollView->Add(showCountDownTimelabel); scrollView->Add(vectorImage); @@ -220,7 +224,7 @@ namespace OHOS return play_or_pause_toggleButton; } - UIButton * StartCountDownView::GetRepeatButton(void) + UIButton *StartCountDownView::GetRepeatButton(void) { return RepeatButton; } diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang index 0f091fb31..a7601977f 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ 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 fc0599e31..974f2c6e6 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 @@ -531,7 +531,20 @@ enum UIResourceTextId : uint16_t { STR_IGNORE = 518, STR_START = 519, STR_ARC_SCALE_LIST_DISPLAY = 520, - STR_MAX_ID = 521, + STR_COUNT_DOWN = 521, + STR_CUSTOM_TIME = 522, + STR_QUICK_START = 523, + STR_1_MIN = 524, + STR_5_MIN = 525, + STR_10_MIN = 526, + STR_30_MIN = 527, + STR_SET_COUNT_DOWN_NOTE = 528, + STR_COUNTDOWN_ENDS = 529, + STR_MAXIMUM_TIME_REACH = 530, + STR_STOPWATCH_STOP_NOTE = 531, + STR_TMCHBR = 532, + STR_MAXIMUM_TIME_REACH_NOTE = 533, + STR_MAX_ID = 534, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang index f82b5f251..9e4029325 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/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 86267f05c..677da9ead 100644 --- a/tools/language_tool/Language_xml/input_list_en.txt +++ b/tools/language_tool/Language_xml/input_list_en.txt @@ -510,7 +510,7 @@ STR_4G_NOTE$Note: After opening, the power consumption of the watch will be incr STR_MUSIC_PLAYER_SOURCE_NOTE$Please enter Music - Music Source from the watch app interface, set it to Mobile Mode and try again STR_MUSIC_LIST_IS_EMPTY$The current music list is empty, please download and add via APP STR_BT_HEADSET_RESCAN$Rescan -STR_BT_HEADSET_NOFOND$No headset Bluetooth device can be found +STR_BT_HEADSET_NOFOND$No Bluetooth headset device can be found STR_SCHEDULE$Schedule STR_SCHEDULE_TITLE$Schedule management STR_SCHEDULE_NO_DATA$No schedules @@ -518,4 +518,16 @@ STR_SCHEDULE_NO_DATA_PROMPT$Please sync with the APP STR_NO_PAIRED_DEV$No paired devices are available STR_IGNORE$Ignore STR_START$Start -STR_ARC_SCALE_LIST_DISPLAY$Arc list display \ No newline at end of file +STR_ARC_SCALE_LIST_DISPLAY$Arc list display +STR_COUNT_DOWN$Count Down +STR_CUSTOM_TIME$Custom time +STR_QUICK_START$Quick start +STR_1_MIN$1min +STR_5_MIN$5min +STR_10_MIN$10min +STR_30_MIN$30min +STR_SET_COUNT_DOWN_NOTE$Please set up the countdown room first +STR_COUNTDOWN_ENDS$Countdown ends +STR_MAXIMUM_TIME_REACH$The maximum time has been reached +STR_STOPWATCH_STOP_NOTE$Stopwatch stops automatically, please restart +STR_TMCHBR$The maximum count has been reached \ 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 8b688eb3a..6900f9dbd 100644 --- a/tools/language_tool/Language_xml/input_list_zh.txt +++ b/tools/language_tool/Language_xml/input_list_zh.txt @@ -510,7 +510,7 @@ STR_4G_NOTE$注：开启后，手表功耗会提高，待机时间会缩短 STR_MUSIC_PLAYER_SOURCE_NOTE$请从手表端应用界面进入“音乐”-“音乐来源”，设置为“手机模式”后重试 STR_MUSIC_LIST_IS_EMPTY$当前音乐列表为空请通过APP下载添加 STR_BT_HEADSET_RESCAN$重新搜索 -STR_BT_HEADSET_NOFOND$当前搜索不到耳机蓝牙设备 +STR_BT_HEADSET_NOFOND$当前搜索不到蓝牙耳机设备 STR_SCHEDULE$日程 STR_SCHEDULE_TITLE$日程管理 STR_SCHEDULE_NO_DATA$当前无日程 @@ -518,4 +518,16 @@ STR_SCHEDULE_NO_DATA_PROMPT$请先通过APP同步 STR_NO_PAIRED_DEV$暂无已配对设备 STR_IGNORE$忽略 STR_START$开始 -STR_ARC_SCALE_LIST_DISPLAY$弧形列表显示 \ No newline at end of file +STR_ARC_SCALE_LIST_DISPLAY$弧形列表显示 +STR_COUNT_DOWN$倒计时 +STR_CUSTOM_TIME$自定义时间 +STR_QUICK_START$快速开始 +STR_1_MIN$1分钟 +STR_5_MIN$5分钟 +STR_10_MIN$10分钟 +STR_30_MIN$30分钟 +STR_SET_COUNT_DOWN_NOTE$请先设置好倒计时间 +STR_COUNTDOWN_ENDS$倒计时结束 +STR_MAXIMUM_TIME_REACH_NOTE$当前已达到了最长时间 +STR_STOPWATCH_STOP_NOTE$秒表自动暂停，请重新开始 +STR_TMCHBR$当前已达到了最高计数 \ No newline at end of file diff --git a/tools/language_tool/Language_xml/language.xlsx b/tools/language_tool/Language_xml/language.xlsx index 9dab50fa2..924ee89cd 100644 Binary files a/tools/language_tool/Language_xml/language.xlsx and b/tools/language_tool/Language_xml/language.xlsx differ diff --git a/tools/language_tool/Language_xml/language_en.xml b/tools/language_tool/Language_xml/language_en.xml index 306a5e106..7d04ae171 100644 --- a/tools/language_tool/Language_xml/language_en.xml +++ b/tools/language_tool/Language_xml/language_en.xml @@ -511,7 +511,7 @@ - + @@ -520,4 +520,16 @@ + + + + + + + + + + + + diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml index 8470de53d..5533e5cdc 100644 --- a/tools/language_tool/Language_xml/language_zh.xml +++ b/tools/language_tool/Language_xml/language_zh.xml @@ -511,7 +511,7 @@ - + @@ -520,4 +520,16 @@ + + + + + + + + + + + + diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang index 0f091fb31..a7601977f 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 fc0599e31..974f2c6e6 100644 --- a/tools/language_tool/font/ui_resource_string.h +++ b/tools/language_tool/font/ui_resource_string.h @@ -531,7 +531,20 @@ enum UIResourceTextId : uint16_t { STR_IGNORE = 518, STR_START = 519, STR_ARC_SCALE_LIST_DISPLAY = 520, - STR_MAX_ID = 521, + STR_COUNT_DOWN = 521, + STR_CUSTOM_TIME = 522, + STR_QUICK_START = 523, + STR_1_MIN = 524, + STR_5_MIN = 525, + STR_10_MIN = 526, + STR_30_MIN = 527, + STR_SET_COUNT_DOWN_NOTE = 528, + STR_COUNTDOWN_ENDS = 529, + STR_MAXIMUM_TIME_REACH = 530, + STR_STOPWATCH_STOP_NOTE = 531, + STR_TMCHBR = 532, + STR_MAXIMUM_TIME_REACH_NOTE = 533, + STR_MAX_ID = 534, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang index f82b5f251..9e4029325 100644 Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ