倒计时界面配置多国语言

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 fc0599e..974f2c6 100644 (file)
--- 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,\r
     STR_START = 519,\r
     STR_ARC_SCALE_LIST_DISPLAY = 520,\r
-    STR_MAX_ID = 521,\r
+    STR_COUNT_DOWN = 521,\r
+    STR_CUSTOM_TIME = 522,\r
+    STR_QUICK_START = 523,\r
+    STR_1_MIN = 524,\r
+    STR_5_MIN = 525,\r
+    STR_10_MIN = 526,\r
+    STR_30_MIN = 527,\r
+    STR_SET_COUNT_DOWN_NOTE = 528,\r
+    STR_COUNTDOWN_ENDS = 529,\r
+    STR_MAXIMUM_TIME_REACH = 530,\r
+    STR_STOPWATCH_STOP_NOTE = 531,\r
+    STR_TMCHBR = 532,\r
+    STR_MAXIMUM_TIME_REACH_NOTE = 533,\r
+    STR_MAX_ID = 534,\r
 }; // UIResourceTextId\r
 
 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 d946e7b..c87e4a4 100644 (file)
--- 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\r
  * @Date: 2024-04-07 18:15:53\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-06-07 19:57:56\r
+ * @LastEditTime: 2024-08-20 10:17:35\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownPresenter.h\r
  */\r
 #ifndef MAIN_COUNTDOWN_PRESENTER_H\r
@@ -11,7 +11,7 @@
 #include "View.h"\r
 #include "Presenter.h"\r
 #include "MainCountDownView.h"\r
-\r
+#include "ui_resource_string.h"\r
 /*倒计时的主界面*/\r
 namespace OHOS\r
 {\r

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 2eaf8ca..0b43fbb 100644 (file)
--- 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\r
  * @Date: 2024-04-07 18:15:53\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-04-08 16:15:10\r
+ * @LastEditTime: 2024-08-20 10:48:28\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/include/MainCountDownView.h\r
  */\r
 #ifndef MAIN_COUNTDOWN_VIEW_H\r
@@ -67,7 +67,7 @@ namespace OHOS
     private:\r
         void MainCountDownViewInit(void);\r
         void ClearAll(void);\r
-        UILabelButtonExt *SetUILabelButton(int x, int y, int w, int h, const char *id, const char *text);\r
+        UILabelButtonExt *SetUILabelButton(int x, int y, int w, int h, const char *id, const char *text,int textId);\r
         UIViewGroup *group = nullptr;\r
         UIScrollView *scrollView[COUNTDOWN_MAX_VIEW]{nullptr};\r
         UILabelExt *Title{nullptr};\r

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 b93a47f..e89f7ce 100644 (file)
--- 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\r
  * @Date: 2024-04-07 18:15:53\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-04-09 15:38:14\r
+ * @LastEditTime: 2024-08-20 10:18:17\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp\r
  */\r
 #include "countdown/include/CountDownModel.h"\r
@@ -12,8 +12,8 @@
 #include "wearable_log.h"\r
 #include "countdown/include/MainCountDownView.h"\r
 #include <cmsis_os.h>\r
-#include "../../../../../../../drivers/peripheral/config/include/ConfigModel.h"\r
-\r
+#include "ConfigModel.h"\r
+#include "ui_resource_string.h"\r
 namespace OHOS\r
 {\r
     /* -------------------------------------------------------------------------- */\r
@@ -386,7 +386,7 @@ namespace OHOS
             MainCountDownView::GetInstance()->GetStartCountDownView()->GetPlayOrPauseToggleButton()->SetVisible(false);\r
             MainCountDownView::GetInstance()->GetStartCountDownView()->GetRepeatButton()->SetVisible(true);\r
             CountDownModel::GetInstance()->CountDown_StopTimer(); // 停止定时器\r
-            MainCountDownView::GetInstance()->GetStartCountDownView()->GetShowCountDownTimelabel()->SetText("倒计时结束");\r
+            MainCountDownView::GetInstance()->GetStartCountDownView()->GetShowCountDownTimelabel()->SetTextId(STR_COUNTDOWN_ENDS);//倒计时结束\r
             // 进行倒计时结束时的额外操作，比如播放声音、显示通知等\r
             // CountDownModel::GetInstance()->StartRingtonePlayback();\r
             CountDownModel::GetInstance()->RequestStartRingtone();\r

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 da9348c..3863c79 100644 (file)
--- 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 dbb2cd9..4f89188 100644 (file)
--- 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!!");\r
                 return nullptr;\r
             }\r
-            Title->SetPosition(83, 52, 300, 40);\r
+            Title->SetPosition(83, 50, 300, 35);\r
             Title->SetStyle(STYLE_TEXT_FONT, 30);\r
             Title->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-            Title->SetText("倒计时");\r
-            Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+            Title->SetTextId(STR_COUNT_DOWN); // 倒计时\r
+            Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            Title->SetRollSpeed(40);\r
+            Title->SetRollSpeed(70);\r
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
             Attention = new UIImageView();\r
@@ -98,23 +98,25 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::AttentionLabel is new fail!!");\r
                 return nullptr;\r
             }\r
-            AttentionLabel->SetPosition(33, 253, 400, 40);\r
+            AttentionLabel->SetPosition(33, 253, 400, 35);\r
             AttentionLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
             AttentionLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-            AttentionLabel->SetText("请先设置好倒计时间");\r
-            AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+            AttentionLabel->SetTextId(STR_SET_COUNT_DOWN_NOTE); // 请先设置好倒计时间\r
+            AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             AttentionLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            AttentionLabel->SetRollSpeed(40);\r
+            AttentionLabel->SetRollSpeed(70);\r
             AttentionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
+            button = new UILabelButtonExt();\r
             if (button == nullptr)\r
             {\r
-                button = new UILabelButtonExt();\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::button is new fail!!");\r
+                return nullptr;\r
             }\r
             button->SetPosition(0, 366, 466, 100);\r
             button->SetViewId(COUNTDOWNTIMENOTNULLVIEWRETURNBUTTON);\r
             button->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE);\r
-            button->SetText("知道了");\r
+            button->SetTextId(STR_KONW); // 知道了\r
             button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             button->SetStyle(STYLE_LINE_HEIGHT, 35);\r
             button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED);\r

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 2680cba..843c569 100644 (file)
--- 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!!");\r
                 return;\r
             }\r
-            Title->SetPosition(83, 55, 300, 40);\r
+            Title->SetPosition(83, 50, 300, 35);\r
             Title->SetStyle(STYLE_TEXT_FONT, 30);\r
             Title->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-            Title->SetText("倒计时");\r
-            Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+            Title->SetTextId(STR_COUNT_DOWN); // 倒计时\r
+            Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            Title->SetRollSpeed(40);\r
+            Title->SetRollSpeed(70);\r
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------- CUSTOM_COUNTDOWN ------------------------- */\r
             CUSTOM_COUNTDOWN = new UILabelButtonExt();\r
@@ -161,7 +161,7 @@ namespace OHOS
             CUSTOM_COUNTDOWN->SetViewId(COUNTDOWN_LABELBUTTON_VIEWID);\r
             CUSTOM_COUNTDOWN->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffa800);\r
             CUSTOM_COUNTDOWN->SetStyle(STYLE_BORDER_RADIUS, 100);\r
-            CUSTOM_COUNTDOWN->SetText("自定义时间");\r
+            CUSTOM_COUNTDOWN->SetTextId(STR_CUSTOM_TIME); // 自定义时间\r
             CUSTOM_COUNTDOWN->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             CUSTOM_COUNTDOWN->SetStyle(STYLE_LINE_HEIGHT, 35);\r
             CUSTOM_COUNTDOWN->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffa800, UIButton::PRESSED);\r
@@ -172,37 +172,37 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "QuickStart is new fail!!");\r
                 return;\r
             }\r
-            QuickStart->SetPosition(83, 270, 300, 40);\r
+            QuickStart->SetPosition(83, 270, 300, 35);\r
             QuickStart->SetStyle(STYLE_TEXT_FONT, 30);\r
             QuickStart->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-            QuickStart->SetText("快速开始");\r
-            QuickStart->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+            QuickStart->SetTextId(STR_QUICK_START);\r
+            QuickStart->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             QuickStart->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            QuickStart->SetRollSpeed(40);\r
+            QuickStart->SetRollSpeed(70);\r
             QuickStart->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* ----------------------- COUNTDOWN_ONE_MINUTE_BUTTON ---------------------- */\r
-            COUNTDOWN_ONE_MINUTE_BUTTON = SetUILabelButton(43, 345, 180, 150, COUNTDOWN_ONE_MINUTE_BUTTON_VIEWID, "1分钟");\r
+            COUNTDOWN_ONE_MINUTE_BUTTON = SetUILabelButton(43, 345, 180, 150, COUNTDOWN_ONE_MINUTE_BUTTON_VIEWID, "1分钟", STR_1_MIN);\r
             if (COUNTDOWN_ONE_MINUTE_BUTTON == nullptr)\r
             {\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_ONE_MINUTE_BUTTON is new fail!!");\r
                 return;\r
             }\r
             /* ---------------------- COUNTDOWN_FIVE_MINUTE_BUTTON ---------------------- */\r
-            COUNTDOWN_FIVE_MINUTE_BUTTON = SetUILabelButton(243, 345, 180, 150, COUNTDOWN_FIVE_MINUTE_BUTTON_VIEWID, "5分钟");\r
+            COUNTDOWN_FIVE_MINUTE_BUTTON = SetUILabelButton(243, 345, 180, 150, COUNTDOWN_FIVE_MINUTE_BUTTON_VIEWID, "5分钟", STR_5_MIN);\r
             if (COUNTDOWN_FIVE_MINUTE_BUTTON == nullptr)\r
             {\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_FIVE_MINUTE_BUTTON is new fail!!");\r
                 return;\r
             }\r
             /* ----------------------- COUNTDOWN_TEN_MINUTE_BUTTON ---------------------- */\r
-            COUNTDOWN_TEN_MINUTE_BUTTON = SetUILabelButton(43, 515, 180, 150, COUNTDOWN_TEN_MINUTE_BUTTON_VIEWID, "10分钟");\r
+            COUNTDOWN_TEN_MINUTE_BUTTON = SetUILabelButton(43, 515, 180, 150, COUNTDOWN_TEN_MINUTE_BUTTON_VIEWID, "10分钟", STR_10_MIN);\r
             if (COUNTDOWN_TEN_MINUTE_BUTTON == nullptr)\r
             {\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_TEN_MINUTE_BUTTON is new fail!!");\r
                 return;\r
             }\r
             /* --------------------- COUNTDOWN_THIRTY_MINUTE_BUTTON --------------------- */\r
-            COUNTDOWN_THIRTY_MINUTE_BUTTON = SetUILabelButton(243, 515, 180, 150, COUNTDOWN_THIRTY_MINUTE_BUTTON_VIEWID, "30分钟");\r
+            COUNTDOWN_THIRTY_MINUTE_BUTTON = SetUILabelButton(243, 515, 180, 150, COUNTDOWN_THIRTY_MINUTE_BUTTON_VIEWID, "30分钟", STR_30_MIN);\r
             if (COUNTDOWN_THIRTY_MINUTE_BUTTON == nullptr)\r
             {\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_THIRTY_MINUTE_BUTTON is new fail!!");\r
@@ -218,7 +218,7 @@ namespace OHOS
         }\r
     }\r
 \r
-    UILabelButtonExt *MainCountDownView::SetUILabelButton(int x, int y, int w, int h, const char *id, const char *text)\r
+    UILabelButtonExt *MainCountDownView::SetUILabelButton(int x, int y, int w, int h, const char *id, const char *text, int textId)\r
     {\r
         UILabelButtonExt *button = new UILabelButtonExt();\r
         if (button == nullptr)\r

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 e93ec12..42424d2 100644 (file)
--- 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!!");\r
                 return nullptr;\r
             }\r
-            Title->SetPosition(83, 52, 300, 40);\r
+            Title->SetPosition(83, 50, 300, 35);\r
             Title->SetStyle(STYLE_TEXT_FONT, 30);\r
             Title->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-            Title->SetText("倒计时");\r
-            Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+            Title->SetTextId(STR_COUNT_DOWN); // 倒计时\r
+            Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            Title->SetRollSpeed(40);\r
+            Title->SetRollSpeed(70);\r
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
             showCountDownTimelabel = new UILabelExt();\r
@@ -142,9 +142,11 @@ namespace OHOS
             showTheRingTime->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
             showTheRingTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 35);\r
             /* -------------------------------------------------------------------------- */\r
+            play_or_pause_toggleButton = new UIToggleButton();\r
             if (play_or_pause_toggleButton == nullptr)\r
             {\r
-                play_or_pause_toggleButton = new UIToggleButton();\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "play_or_pause_toggleButton  is new fail!!");\r
+                return nullptr;\r
             }\r
             play_or_pause_toggleButton->SetPosition(248, 321, 100, 100);\r
             play_or_pause_toggleButton->SetViewId(PlayOrPauseToggleButton_ViewID);\r
@@ -156,10 +158,11 @@ namespace OHOS
             play_or_pause_toggleButton->SetVisible(true);\r
 \r
             /* -------------------------------------------------------------------------- */\r
-            // Add Button to App\r
+            endbutton = new UIButton();\r
             if (endbutton == nullptr)\r
             {\r
-                endbutton = new UIButton();\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "endbutton  is new fail!!");\r
+                return nullptr;\r
             }\r
             endbutton->SetPosition(118, 321);\r
             endbutton->Resize(100, 100);\r
@@ -172,11 +175,11 @@ namespace OHOS
             endbutton->SetStyleForState(STYLE_BORDER_RADIUS, 100, UIButton::PRESSED);\r
             UIView::OnClickListener *buttonClick = static_cast<UIView::OnClickListener *>(MainCountDownPresenter::GetInstance());\r
             endbutton->SetOnClickListener(buttonClick);\r
-            /* ----------------------------------- Add ---------------------------------- */\r
-\r
+            RepeatButton = new UIButton();\r
             if (nullptr == RepeatButton)\r
             {\r
-                RepeatButton = new UIButton();\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "endbutton  is new fail!!");\r
+                return nullptr;\r
             }\r
             RepeatButton->SetPosition(248, 321);\r
             RepeatButton->Resize(100, 100);\r
@@ -187,10 +190,11 @@ namespace OHOS
             RepeatButton->SetImageSrc(RepeatButtonImagePath, RepeatButtonImagePath);\r
             RepeatButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffa800, UIButton::PRESSED);\r
             RepeatButton->SetStyleForState(STYLE_BORDER_RADIUS, 100, UIButton::PRESSED);\r
-            UIView::OnClickListener * RepeatButtonClick = static_cast<UIView::OnClickListener *>(MainCountDownPresenter::GetInstance());\r
+            UIView::OnClickListener *RepeatButtonClick = static_cast<UIView::OnClickListener *>(MainCountDownPresenter::GetInstance());\r
             RepeatButton->SetOnClickListener(RepeatButtonClick);\r
             RepeatButton->SetVisible(false);\r
-\r
+            \r
+            /* ----------------------------------- Add ---------------------------------- */\r
             scrollView->Add(Title);\r
             scrollView->Add(showCountDownTimelabel);\r
             scrollView->Add(vectorImage);\r
@@ -220,7 +224,7 @@ namespace OHOS
         return play_or_pause_toggleButton;\r
     }\r
 \r
-    UIButton * StartCountDownView::GetRepeatButton(void)\r
+    UIButton *StartCountDownView::GetRepeatButton(void)\r
     {\r
         return RepeatButton;\r
     }\r

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 0f091fb..a760197 100644 (file)
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 fc0599e..974f2c6 100644 (file)
--- 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,\r
     STR_START = 519,\r
     STR_ARC_SCALE_LIST_DISPLAY = 520,\r
-    STR_MAX_ID = 521,\r
+    STR_COUNT_DOWN = 521,\r
+    STR_CUSTOM_TIME = 522,\r
+    STR_QUICK_START = 523,\r
+    STR_1_MIN = 524,\r
+    STR_5_MIN = 525,\r
+    STR_10_MIN = 526,\r
+    STR_30_MIN = 527,\r
+    STR_SET_COUNT_DOWN_NOTE = 528,\r
+    STR_COUNTDOWN_ENDS = 529,\r
+    STR_MAXIMUM_TIME_REACH = 530,\r
+    STR_STOPWATCH_STOP_NOTE = 531,\r
+    STR_TMCHBR = 532,\r
+    STR_MAXIMUM_TIME_REACH_NOTE = 533,\r
+    STR_MAX_ID = 534,\r
 }; // UIResourceTextId\r
 
 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 f82b5f2..9e40293 100644 (file)
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 86267f0..677da9e 100644 (file)
--- 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\r
 STR_MUSIC_LIST_IS_EMPTY$The current music list is empty, please download and add via APP\r
 STR_BT_HEADSET_RESCAN$Rescan\r
-STR_BT_HEADSET_NOFOND$No headset Bluetooth device can be found\r
+STR_BT_HEADSET_NOFOND$No Bluetooth headset device can be found\r
 STR_SCHEDULE$Schedule\r
 STR_SCHEDULE_TITLE$Schedule management\r
 STR_SCHEDULE_NO_DATA$No schedules\r
@@ -518,4 +518,16 @@ STR_SCHEDULE_NO_DATA_PROMPT$Please sync with the APP
 STR_NO_PAIRED_DEV$No paired devices are available\r
 STR_IGNORE$Ignore\r
 STR_START$Start\r
-STR_ARC_SCALE_LIST_DISPLAY$Arc list display
\ No newline at end of file
+STR_ARC_SCALE_LIST_DISPLAY$Arc list display\r
+STR_COUNT_DOWN$Count Down\r
+STR_CUSTOM_TIME$Custom time\r
+STR_QUICK_START$Quick start\r
+STR_1_MIN$1min\r
+STR_5_MIN$5min\r
+STR_10_MIN$10min\r
+STR_30_MIN$30min\r
+STR_SET_COUNT_DOWN_NOTE$Please set up the countdown room first\r
+STR_COUNTDOWN_ENDS$Countdown ends\r
+STR_MAXIMUM_TIME_REACH$The maximum time has been reached\r
+STR_STOPWATCH_STOP_NOTE$Stopwatch stops automatically, please restart\r
+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 8b688eb..6900f9d 100644 (file)
--- 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$请从手表端应用界面进入“音乐”-“音乐来源”，设置为“手机模式”后重试\r
 STR_MUSIC_LIST_IS_EMPTY$当前音乐列表为空请通过APP下载添加\r
 STR_BT_HEADSET_RESCAN$重新搜索\r
-STR_BT_HEADSET_NOFOND$å½\93å\89\8dæ\90\9cç´¢ä¸\8då\88°è\80³æ\9cºè\93\9dç\89\99设备\r
+STR_BT_HEADSET_NOFOND$å½\93å\89\8dæ\90\9cç´¢ä¸\8då\88°è\93\9dç\89\99è\80³æ\9cº设备\r
 STR_SCHEDULE$日程\r
 STR_SCHEDULE_TITLE$日程管理\r
 STR_SCHEDULE_NO_DATA$当前无日程\r
@@ -518,4 +518,16 @@ STR_SCHEDULE_NO_DATA_PROMPT$请先通过APP同步
 STR_NO_PAIRED_DEV$暂无已配对设备\r
 STR_IGNORE$忽略\r
 STR_START$开始\r
-STR_ARC_SCALE_LIST_DISPLAY$弧形列表显示
\ No newline at end of file
+STR_ARC_SCALE_LIST_DISPLAY$弧形列表显示\r
+STR_COUNT_DOWN$倒计时\r
+STR_CUSTOM_TIME$自定义时间\r
+STR_QUICK_START$快速开始\r
+STR_1_MIN$1分钟\r
+STR_5_MIN$5分钟\r
+STR_10_MIN$10分钟\r
+STR_30_MIN$30分钟\r
+STR_SET_COUNT_DOWN_NOTE$请先设置好倒计时间\r
+STR_COUNTDOWN_ENDS$倒计时结束\r
+STR_MAXIMUM_TIME_REACH_NOTE$当前已达到了最长时间\r
+STR_STOPWATCH_STOP_NOTE$秒表自动暂停，请重新开始\r
+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 9dab50f..924ee89 100644 (file)
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 306a5e1..7d04ae1 100644 (file)
--- a/tools/language_tool/Language_xml/language_en.xml
+++ b/tools/language_tool/Language_xml/language_en.xml
@@ -511,7 +511,7 @@
        <lanstr id="STR_MUSIC_PLAYER_SOURCE_NOTE" value="Please enter Music - Music Source from the watch app interface, set it to Mobile Mode and try again"/>
        <lanstr id="STR_MUSIC_LIST_IS_EMPTY" value="The current music list is empty, please download and add via APP"/>
        <lanstr id="STR_BT_HEADSET_RESCAN" value="Rescan"/>
-       <lanstr id="STR_BT_HEADSET_NOFOND" value="No headset Bluetooth device can be found"/>
+       <lanstr id="STR_BT_HEADSET_NOFOND" value="No Bluetooth headset device can be found"/>
        <lanstr id="STR_SCHEDULE" value="Schedule"/>
        <lanstr id="STR_SCHEDULE_TITLE" value="Schedule management"/>
        <lanstr id="STR_SCHEDULE_NO_DATA" value="No schedules"/>
@@ -520,4 +520,16 @@
        <lanstr id="STR_IGNORE" value="Ignore"/>
        <lanstr id="STR_START" value="Start"/>
        <lanstr id="STR_ARC_SCALE_LIST_DISPLAY" value="Arc list display"/>
+       <lanstr id="STR_COUNT_DOWN" value="Count Down"/>
+       <lanstr id="STR_CUSTOM_TIME" value="Custom time"/>
+       <lanstr id="STR_QUICK_START" value="Quick start"/>
+       <lanstr id="STR_1_MIN" value="1min"/>
+       <lanstr id="STR_5_MIN" value="5min"/>
+       <lanstr id="STR_10_MIN" value="10min"/>
+       <lanstr id="STR_30_MIN" value="30min"/>
+       <lanstr id="STR_SET_COUNT_DOWN_NOTE" value="Please set up the countdown room first"/>
+       <lanstr id="STR_COUNTDOWN_ENDS" value="Countdown ends"/>
+       <lanstr id="STR_MAXIMUM_TIME_REACH" value="The maximum time has been reached"/>
+       <lanstr id="STR_STOPWATCH_STOP_NOTE" value="Stopwatch stops automatically, please restart"/>
+       <lanstr id="STR_TMCHBR" value="The maximum count has been reached"/>
 </language>

diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index 8470de5..5533e5c 100644 (file)
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -511,7 +511,7 @@
        <lanstr id="STR_MUSIC_PLAYER_SOURCE_NOTE" value="请从手表端应用界面进入“音乐”-“音乐来源”，设置为“手机模式”后重试"/>
        <lanstr id="STR_MUSIC_LIST_IS_EMPTY" value="当前音乐列表为空请通过APP下载添加"/>
        <lanstr id="STR_BT_HEADSET_RESCAN" value="重新搜索"/>
-       <lanstr id="STR_BT_HEADSET_NOFOND" value="å½\93å\89\8dæ\90\9cç´¢ä¸\8då\88°è\80³æ\9cºè\93\9dç\89\99设备"/>
+       <lanstr id="STR_BT_HEADSET_NOFOND" value="å½\93å\89\8dæ\90\9cç´¢ä¸\8då\88°è\93\9dç\89\99è\80³æ\9cº设备"/>
        <lanstr id="STR_SCHEDULE" value="日程"/>
        <lanstr id="STR_SCHEDULE_TITLE" value="日程管理"/>
        <lanstr id="STR_SCHEDULE_NO_DATA" value="当前无日程"/>
@@ -520,4 +520,16 @@
        <lanstr id="STR_IGNORE" value="忽略"/>
        <lanstr id="STR_START" value="开始"/>
        <lanstr id="STR_ARC_SCALE_LIST_DISPLAY" value="弧形列表显示"/>
+       <lanstr id="STR_COUNT_DOWN" value="倒计时"/>
+       <lanstr id="STR_CUSTOM_TIME" value="自定义时间"/>
+       <lanstr id="STR_QUICK_START" value="快速开始"/>
+       <lanstr id="STR_1_MIN" value="1分钟"/>
+       <lanstr id="STR_5_MIN" value="5分钟"/>
+       <lanstr id="STR_10_MIN" value="10分钟"/>
+       <lanstr id="STR_30_MIN" value="30分钟"/>
+       <lanstr id="STR_SET_COUNT_DOWN_NOTE" value="请先设置好倒计时间"/>
+       <lanstr id="STR_COUNTDOWN_ENDS" value="倒计时结束"/>
+       <lanstr id="STR_MAXIMUM_TIME_REACH_NOTE" value="当前已达到了最长时间"/>
+       <lanstr id="STR_STOPWATCH_STOP_NOTE" value="秒表自动暂停，请重新开始"/>
+       <lanstr id="STR_TMCHBR" value="当前已达到了最高计数"/>
 </language>

diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang
index 0f091fb..a760197 100644 (file)
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 fc0599e..974f2c6 100644 (file)
--- 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,\r
     STR_START = 519,\r
     STR_ARC_SCALE_LIST_DISPLAY = 520,\r
-    STR_MAX_ID = 521,\r
+    STR_COUNT_DOWN = 521,\r
+    STR_CUSTOM_TIME = 522,\r
+    STR_QUICK_START = 523,\r
+    STR_1_MIN = 524,\r
+    STR_5_MIN = 525,\r
+    STR_10_MIN = 526,\r
+    STR_30_MIN = 527,\r
+    STR_SET_COUNT_DOWN_NOTE = 528,\r
+    STR_COUNTDOWN_ENDS = 529,\r
+    STR_MAXIMUM_TIME_REACH = 530,\r
+    STR_STOPWATCH_STOP_NOTE = 531,\r
+    STR_TMCHBR = 532,\r
+    STR_MAXIMUM_TIME_REACH_NOTE = 533,\r
+    STR_MAX_ID = 534,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang
index f82b5f2..9e40293 100644 (file)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ