From e49b19c93d99601203a5c2ee9e596edaecf8f587 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Tue, 9 Apr 2024 16:23:37 +0800
Subject: [PATCH] =?utf8?q?=E8=AE=BE=E7=BD=AE=E8=AE=A1=E6=97=B6=E5=99=A8?=
 =?utf8?q?=E5=9C=A8=E5=80=92=E8=AE=A1=E6=97=B6=E7=9A=84=E6=97=B6=E5=80=99?=
 =?utf8?q?=E4=B8=8D=E6=81=AF=E5=B1=8F=20=E8=A7=A3=E5=86=B3=E8=AE=A1?=
 =?utf8?q?=E6=97=B6=E5=99=A8=E4=B8=BB=E9=A1=B5=E9=9D=A2=E5=8F=B3=E6=BB=91?=
 =?utf8?q?=E9=80=80=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../countdown/src/MainCountDownPresenter.cpp       |  5 +++--
 .../nativeui/countdown/src/MainCountDownView.cpp   | 14 +++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

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 a0a16ca69..1f086046b 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp
@@ -37,8 +37,8 @@ namespace OHOS
 
     void MainCountDownPresenter::OnStart()
     {
-
         Presenter<MainCountDownView>::OnStart();
+        ScreenAlwaysOnCtr(1); // 长亮屏
     }
 
     void MainCountDownPresenter::OnPause(void)
@@ -55,8 +55,9 @@ namespace OHOS
 
     void MainCountDownPresenter::OnStop(void)
     {
-
         Presenter<MainCountDownView>::OnStop();
+        ScreenAlwaysOnCtr(0); // 取消长亮屏
+
     }
 
     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 4b474624e..a70dd21e3 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp
@@ -113,13 +113,6 @@ namespace OHOS
             /* ---------------------------------- group --------------------------------- */
             group = new UIViewGroup();
             group->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
-            UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(MainCountDownPresenter::GetInstance());
-            if (draglistener == nullptr)
-            {
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "draglistener is nullptr!!");
-                return;
-            }
-            group->SetOnDragListener(draglistener);
             group->SetTouchable(true);
             group->SetDraggable(true);
             /* ----------------------- scrollView[MAIN_COUNTDOWN] ----------------------- */
@@ -132,6 +125,13 @@ namespace OHOS
             scrollView[MAIN_COUNTDOWN]->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
             scrollView[MAIN_COUNTDOWN]->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
             scrollView[MAIN_COUNTDOWN]->SetViewId(MAINCOUNTDOWNVIEW);
+            UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(MainCountDownPresenter::GetInstance());
+            if (draglistener == nullptr)
+            {
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "draglistener is nullptr!!");
+                return;
+            }
+            scrollView[MAIN_COUNTDOWN]->SetOnDragListener(draglistener);
             scrollView[MAIN_COUNTDOWN]->SetReboundSize(50);              // 设置回弹大小
             scrollView[MAIN_COUNTDOWN]->SetHorizontalScrollState(false); // 设置横向不可以滚动
             scrollView[MAIN_COUNTDOWN]->SetScrollBlankSize(50);          // 设置高位50可滑动空白区域
-- 
2.17.1