From 9befa0fa1b33d758fa1e6349fedd8c32aa48044a Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Wed, 3 Jul 2024 18:51:30 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E5=80=92=E8=AE=A1=E6=97=B6?=
 =?utf8?q?=E9=93=83=E5=A3=B0=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=8B=89?=
 =?utf8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E5=81=9C=E6=AD=A2=E9=80=BB=E8=BE=91?=
 =?utf8?q?=EF=BC=8C=E5=9C=A8=E4=B8=8B=E6=8B=89=E8=A7=86=E5=9B=BE=E6=9E=90?=
 =?utf8?q?=E6=9E=84=E5=89=8D=E5=81=9C=E6=AD=A2=E5=AE=9A=E6=97=B6=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/countdown/include/CountDownModel.h    | 5 +++--
 .../wearable/fd230app/nativeui/main/src/PullUpDownView.cpp  | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownModel.h b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownModel.h
index 935850e4b..bb520961c 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownModel.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-04-07 18:15:53
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-04-09 15:27:19
+ * @LastEditTime: 2024-07-03 18:44:50
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownModel.h
  */
 #ifndef COUNTDOWN_MODEL_H
@@ -106,7 +106,8 @@ namespace OHOS
         std::shared_ptr<CountDownRingPlayerListener> playerInterruptListener{nullptr};
         AudioSession sessionId;
         AudioInterrupt interrupt;
-        const char *RingMusicPath = "/user/music/alarm.mp3"; // 铃声路径
+        // const char *RingMusicPath = "/user/music/alarm.mp3"; // 铃声路径
+        const char *RingMusicPath = "/music/ring/alarm.mp3"; // 铃声路径
 
         std::string countdownDuration{nullptr};
         std::string RingTime{"00:00:00"};  // 响铃时间
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
index 92d983fe3..f58fa7582 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-26 18:14:24
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-01 09:30:03
+ * @LastEditTime: 2024-07-03 18:42:05
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
  */
 
@@ -117,6 +117,10 @@ namespace OHOS
     PullUpDownView::~PullUpDownView()
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::~PullUpDownView");
+        if (MainPresenterSample::GetInstance() != nullptr)
+        {
+            MainPresenterSample::GetInstance()->PullUpDown_StopTimer();
+        }
         ClearAll();
         g_pPullUpDownView = nullptr;
     }
-- 
2.17.1