From e1485c3643abc2a81cbec45306c60bd2daeee4ba Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Fri, 30 Aug 2024 11:19:51 +0800 Subject: [PATCH] =?utf8?q?1.=E5=80=92=E8=AE=A1=E6=97=B6=E7=95=8C=E9=9D=A2?= =?utf8?q?=E5=8F=96=E6=B6=88=E9=95=BF=E4=BA=AE=E5=B1=8F=EF=BC=8C=E5=B9=B6?= =?utf8?q?=E5=9C=A8=E5=80=92=E8=AE=A1=E6=97=B6=E7=BB=93=E6=9D=9F=E6=97=B6?= =?utf8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E4=BA=AE=E5=B1=8F5s?= =?utf8?q?=E6=93=8D=E4=BD=9C=202.=E4=BC=98=E5=8C=96=E8=87=AA=E5=AE=9A?= =?utf8?q?=E4=B9=89=E5=80=92=E8=AE=A1=E6=97=B6=E6=97=B6=E9=97=B4=E6=80=BB?= =?utf8?q?=E6=97=B6=E9=95=BF=E6=96=87=E5=AD=97=E4=B8=8D=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../countdown/include/StartCountDownView.h | 1 + .../nativeui/countdown/src/CountDownModel.cpp | 5 ++++- .../countdown/src/MainCountDownPresenter.cpp | 4 ++-- .../nativeui/countdown/src/MainCountDownView.cpp | 16 +++++++++++++--- .../countdown/src/StartCountDownView.cpp | 12 +++++++++++- 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/StartCountDownView.h b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/StartCountDownView.h index 56cc03b0a..0645f4a31 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/StartCountDownView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/StartCountDownView.h @@ -47,6 +47,7 @@ namespace OHOS void SetEndView(); void SetImageAndLabel(bool state); void ShowEndView(bool state); + void UpdateimageAndLabelPosition(void); private: UIScrollView *scrollView = 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 e56a8286a..6a19107be 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 15:16:40 + * @LastEditTime: 2024-08-30 10:24:52 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp */ #include "countdown/include/CountDownModel.h" @@ -15,6 +15,7 @@ #include "ConfigModel.h" #include "ui_resource_string.h" #include "custom_runtime.h" +#include "uiservice/include/ui_service.h" namespace OHOS { /* -------------------------------------------------------------------------- */ @@ -388,6 +389,8 @@ namespace OHOS // 检查倒计时是否结束 if (CountDownModel::g_CountDownTimes <= 0) { + ScreenTurnOn(5*1000);//亮屏5s + MainCountDownView::GetInstance()->GetStartCountDownView()->GetPlayOrPauseToggleButton()->SetVisible(false); MainCountDownView::GetInstance()->GetStartCountDownView()->GetRepeatButton()->SetVisible(true); CountDownModel::GetInstance()->CountDown_StopTimer(); // 停止定时器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp index 8d27721bc..9574f6863 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp @@ -45,7 +45,7 @@ namespace OHOS void MainCountDownPresenter::OnStart() { Presenter::OnStart(); - ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); // 长亮屏 + // ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); // 长亮屏 } void MainCountDownPresenter::OnPause(void) @@ -63,7 +63,7 @@ namespace OHOS void MainCountDownPresenter::OnStop(void) { Presenter::OnStop(); - ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); // 取消长亮屏 + // ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); // 取消长亮屏 } bool MainCountDownPresenter::OnDrag(UIView &view, const DragEvent &event) 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 6a7674a9e..fbfe36222 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp @@ -134,7 +134,13 @@ namespace OHOS scrollView[MAIN_COUNTDOWN]->SetOnDragListener(draglistener); scrollView[MAIN_COUNTDOWN]->SetReboundSize(50); // 设置回弹大小 scrollView[MAIN_COUNTDOWN]->SetHorizontalScrollState(false); // 设置横向不可以滚动 - scrollView[MAIN_COUNTDOWN]->SetScrollBlankSize(50); // 设置高位50可滑动空白区域 + scrollView[MAIN_COUNTDOWN]->SetScrollBlankSize(75); + scrollView[MAIN_COUNTDOWN]->SetThrowDrag(true); + scrollView[MAIN_COUNTDOWN]->SetMaxScrollDistance(1000); + scrollView[MAIN_COUNTDOWN]->SetSwipeACCLevel(800); // 800: compensation distance + scrollView[MAIN_COUNTDOWN]->SetDragACCLevel(5); // 5: drag acceleration + scrollView[MAIN_COUNTDOWN]->SetRotateFactor(2); + scrollView[MAIN_COUNTDOWN]->RequestFocus(); /* ---------------------------------- Title --------------------------------- */ Title = new UILabelExt(); if (Title == nullptr) @@ -234,8 +240,8 @@ namespace OHOS button->SetImageSrc(img, img); // button->SetText(text); button->SetTextId(textId); - button->SetAlign(TEXT_ALIGNMENT_LEFT); - button->SetLabelPosition(51, 61); + button->SetAlign(TEXT_ALIGNMENT_CENTER); + button->SetLabelPosition(0, 61); button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); button->SetStyle(STYLE_LINE_HEIGHT, 35); button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffa800, UIButton::PRESSED); @@ -292,6 +298,10 @@ namespace OHOS scrollView[thisView] = p_StartCountDownView->StartCountDownViewInit(); group->Add(scrollView[thisView]); } + if (p_StartCountDownView) + { + p_StartCountDownView->UpdateimageAndLabelPosition(); + } return true; } 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 1e187ba3c..00d3bb359 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp @@ -147,7 +147,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "showTheRingTime is new fail!!"); return nullptr; } - showTheRingTime->SetPosition(209, 241, 84, 41); + showTheRingTime->SetPosition(209, 241, 81, 41); showTheRingTime->SetStyle(STYLE_TEXT_FONT, 35); showTheRingTime->SetStyle(STYLE_LINE_HEIGHT, 41); showTheRingTime->SetText(CountDownModel::GetInstance()->GetRingTime().c_str()); @@ -271,4 +271,14 @@ namespace OHOS vectorbigImage->SetVisible(state); showTheEndRingTime->SetVisible(state); } + void StartCountDownView::UpdateimageAndLabelPosition(void) + { + if (vectorImage == nullptr || showTheRingTime == nullptr) + return; + int w = vectorImage->GetWidth() + showTheRingTime->GetTextWidth() + 7; + vectorImage->SetX((Screen::GetInstance().GetWidth() - w) / 2); + showTheRingTime->SetX(vectorImage->GetX() + vectorImage->GetWidth() + 7); + vectorImage->Invalidate(); + showTheRingTime->Invalidate(); + } } \ No newline at end of file -- 2.17.1