From: luozheng <1732036298@qq.com> Date: Tue, 20 Aug 2024 07:17:50 +0000 (+0800) Subject: 倒计时优化修改 X-Git-Tag: release_V1.2.70_20241020_135402~623 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d89b629523d4b7388c5e8098453c42e80991c0a7;p=mirrors%2FFD230.git 倒计时优化修改 --- 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 e89f7ce55..a8a031f74 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-08-20 10:18:17 + * @LastEditTime: 2024-08-20 15:16:40 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp */ #include "countdown/include/CountDownModel.h" @@ -354,7 +354,7 @@ namespace OHOS static void CountDown_TimerCallbackProc(int data) { CountDownModel::g_CountDownTimes--; // 每次回调减少1秒 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "g_CountDownTimes:%d\n", CountDownModel::g_CountDownTimes); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_CountDownTimes:%d\n", CountDownModel::g_CountDownTimes); if (MainCountDownView::GetInstance() == nullptr) { @@ -387,6 +387,7 @@ namespace OHOS MainCountDownView::GetInstance()->GetStartCountDownView()->GetRepeatButton()->SetVisible(true); CountDownModel::GetInstance()->CountDown_StopTimer(); // 停止定时器 MainCountDownView::GetInstance()->GetStartCountDownView()->GetShowCountDownTimelabel()->SetTextId(STR_COUNTDOWN_ENDS);//倒计时结束 + MainCountDownView::GetInstance()->GetStartCountDownView()->GetShowCountDownTimelabel()->ForceResetText(); // 进行倒计时结束时的额外操作，比如播放声音、显示通知等 // CountDownModel::GetInstance()->StartRingtonePlayback(); CountDownModel::GetInstance()->RequestStartRingtone(); 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 962c81942..f2d4dc97a 100644 --- 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!!"); return nullptr; } - AttentionLabel->SetPosition(33, 253, 360, 35); + AttentionLabel->SetPosition(53, 253, 360, 35); AttentionLabel->SetStyle(STYLE_TEXT_FONT, 30); AttentionLabel->SetStyle(STYLE_LINE_HEIGHT, 35); AttentionLabel->SetTextId(STR_SET_COUNT_DOWN_NOTE); // 请先设置好倒计时间 @@ -121,6 +121,11 @@ namespace OHOS button->SetStyle(STYLE_LINE_HEIGHT, 35); button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED); UIView::OnClickListener *buttonClick = static_cast(MainCountDownPresenter::GetInstance()); + if (buttonClick == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownTimeNotNullView::buttonClick is new fail!!"); + return nullptr; + } button->SetOnClickListener(buttonClick); /* ----------------------------------- Add ---------------------------------- */ scrollView->Add(Title); 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 42424d298..d5b3083f5 100644 --- 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); showCountDownTimelabel->SetStyle(STYLE_LINE_HEIGHT, 94); showCountDownTimelabel->SetText(CountDownModel::GetInstance()->GetCountDownTime().c_str()); - showCountDownTimelabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + showCountDownTimelabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); showCountDownTimelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); showCountDownTimelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 80); + showCountDownTimelabel->SetRollSpeed(70); /* -------------------------------------------------------------------------- */ vectorImage = new UIImageView(); if (vectorImage == nullptr) @@ -164,8 +165,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "endbutton is new fail!!"); return nullptr; } - endbutton->SetPosition(118, 321); - endbutton->Resize(100, 100); + endbutton->SetPosition(118, 321, 100, 100); endbutton->SetViewId(STARTCOUNTDOWNVIEWRETURNBUTTON); endbutton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); endbutton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); @@ -174,6 +174,11 @@ namespace OHOS endbutton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffa800, UIButton::PRESSED); endbutton->SetStyleForState(STYLE_BORDER_RADIUS, 100, UIButton::PRESSED); UIView::OnClickListener *buttonClick = static_cast(MainCountDownPresenter::GetInstance()); + if (buttonClick == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "buttonClick is new fail!!"); + return nullptr; + } endbutton->SetOnClickListener(buttonClick); RepeatButton = new UIButton(); if (nullptr == RepeatButton) @@ -181,8 +186,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "endbutton is new fail!!"); return nullptr; } - RepeatButton->SetPosition(248, 321); - RepeatButton->Resize(100, 100); + RepeatButton->SetPosition(248, 321, 100, 100); RepeatButton->SetViewId(RepeatButtonViewID); RepeatButton->SetStyle(STYLE_BACKGROUND_COLOR, 0x00); RepeatButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); @@ -193,7 +197,7 @@ namespace OHOS UIView::OnClickListener *RepeatButtonClick = static_cast(MainCountDownPresenter::GetInstance()); RepeatButton->SetOnClickListener(RepeatButtonClick); RepeatButton->SetVisible(false); - + /* ----------------------------------- Add ---------------------------------- */ scrollView->Add(Title); scrollView->Add(showCountDownTimelabel); 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 f866b60ae..dc906baa6 100644 --- 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 * @Date: 2024-04-04 15:13:51 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-07 17:07:38 + * @LastEditTime: 2024-08-20 11:25:11 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/stopwatch/include/MainStopWatchPresenter.h */ #ifndef MAIN_STOPWATCH_PRESENTER_H @@ -12,6 +12,7 @@ #include "View.h" #include "MainStopWatchView.h" #include +#include "ui_resource_string.h" /*秒表主视图*/ namespace OHOS {