From: luozheng <1732036298@qq.com>
Date: Wed, 3 Jul 2024 10:51:30 +0000 (+0800)
Subject: 修改倒计时铃声，修改下拉定时器停止逻辑，在下拉视图析构前停止定时器
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=128e8878f32e7826217825fafd12deb498fe5460;p=mirrors%2FFD230.git

修改倒计时铃声，修改下拉定时器停止逻辑，在下拉视图析构前停止定时器
---

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;
     }