倒计时优化修改

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 e89f7ce..a8a031f 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-08-20 10:18:17\r
+ * @LastEditTime: 2024-08-20 15:16:40\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp\r
  */\r
 #include "countdown/include/CountDownModel.h"\r
@@ -354,7 +354,7 @@ namespace OHOS
     static void CountDown_TimerCallbackProc(int data)\r
     {\r
         CountDownModel::g_CountDownTimes--; // 每次回调减少1秒\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "g_CountDownTimes:%d\n", CountDownModel::g_CountDownTimes);\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_CountDownTimes:%d\n", CountDownModel::g_CountDownTimes);\r
 \r
         if (MainCountDownView::GetInstance() == nullptr)\r
         {\r
@@ -387,6 +387,7 @@ namespace OHOS
             MainCountDownView::GetInstance()->GetStartCountDownView()->GetRepeatButton()->SetVisible(true);\r
             CountDownModel::GetInstance()->CountDown_StopTimer(); // 停止定时器\r
             MainCountDownView::GetInstance()->GetStartCountDownView()->GetShowCountDownTimelabel()->SetTextId(STR_COUNTDOWN_ENDS);//倒计时结束\r
+            MainCountDownView::GetInstance()->GetStartCountDownView()->GetShowCountDownTimelabel()->ForceResetText();\r
             // 进行倒计时结束时的额外操作，比如播放声音、显示通知等\r
             // CountDownModel::GetInstance()->StartRingtonePlayback();\r
             CountDownModel::GetInstance()->RequestStartRingtone();\r

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 962c819..f2d4dc9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp
@@ -98,7 +98,7 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::AttentionLabel is new fail!!");\r
                 return nullptr;\r
             }\r
-            AttentionLabel->SetPosition(33, 253, 360, 35);\r
+            AttentionLabel->SetPosition(53, 253, 360, 35);\r
             AttentionLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
             AttentionLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
             AttentionLabel->SetTextId(STR_SET_COUNT_DOWN_NOTE); // 请先设置好倒计时间\r
@@ -121,6 +121,11 @@ namespace OHOS
             button->SetStyle(STYLE_LINE_HEIGHT, 35);\r
             button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED);\r
             UIView::OnClickListener *buttonClick = static_cast<UIView::OnClickListener *>(MainCountDownPresenter::GetInstance());\r
+            if (buttonClick == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::buttonClick is new fail!!");\r
+                return nullptr;\r
+            }\r
             button->SetOnClickListener(buttonClick);\r
             /* ----------------------------------- Add ---------------------------------- */\r
             scrollView->Add(Title);\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 42424d2..d5b3083 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp
@@ -114,9 +114,10 @@ namespace OHOS
             showCountDownTimelabel->SetStyle(STYLE_TEXT_FONT, 80);\r
             showCountDownTimelabel->SetStyle(STYLE_LINE_HEIGHT, 94);\r
             showCountDownTimelabel->SetText(CountDownModel::GetInstance()->GetCountDownTime().c_str());\r
-            showCountDownTimelabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+            showCountDownTimelabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             showCountDownTimelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
             showCountDownTimelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 80);\r
+            showCountDownTimelabel->SetRollSpeed(70);\r
             /* -------------------------------------------------------------------------- */\r
             vectorImage = new UIImageView();\r
             if (vectorImage == nullptr)\r
@@ -164,8 +165,7 @@ namespace OHOS
                 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
+            endbutton->SetPosition(118, 321, 100, 100);\r
             endbutton->SetViewId(STARTCOUNTDOWNVIEWRETURNBUTTON);\r
             endbutton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
             endbutton->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
@@ -174,6 +174,11 @@ namespace OHOS
             endbutton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffa800, UIButton::PRESSED);\r
             endbutton->SetStyleForState(STYLE_BORDER_RADIUS, 100, UIButton::PRESSED);\r
             UIView::OnClickListener *buttonClick = static_cast<UIView::OnClickListener *>(MainCountDownPresenter::GetInstance());\r
+            if (buttonClick == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "buttonClick  is new fail!!");\r
+                return nullptr;\r
+            }\r
             endbutton->SetOnClickListener(buttonClick);\r
             RepeatButton = new UIButton();\r
             if (nullptr == RepeatButton)\r
@@ -181,8 +186,7 @@ namespace OHOS
                 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
+            RepeatButton->SetPosition(248, 321, 100, 100);\r
             RepeatButton->SetViewId(RepeatButtonViewID);\r
             RepeatButton->SetStyle(STYLE_BACKGROUND_COLOR, 0x00);\r
             RepeatButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
@@ -193,7 +197,7 @@ namespace OHOS
             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

diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/include/MainStopWatchPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/include/MainStopWatchPresenter.h
index f866b60..dc906ba 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/include/MainStopWatchPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/include/MainStopWatchPresenter.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-04-04 15:13:51\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-06-07 17:07:38\r
+ * @LastEditTime: 2024-08-20 11:25:11\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/stopwatch/include/MainStopWatchPresenter.h\r
  */\r
 #ifndef MAIN_STOPWATCH_PRESENTER_H\r
@@ -12,6 +12,7 @@
 #include "View.h"\r
 #include "MainStopWatchView.h"\r
 #include <string>\r
+#include "ui_resource_string.h"\r
 /*秒表主视图*/\r
 namespace OHOS\r
 {\r