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

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 935850e..bb52096 100644 (file)
--- 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\r
  * @Date: 2024-04-07 18:15:53\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-04-09 15:27:19\r
+ * @LastEditTime: 2024-07-03 18:44:50\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/include/CountDownModel.h\r
  */\r
 #ifndef COUNTDOWN_MODEL_H\r
@@ -106,7 +106,8 @@ namespace OHOS
         std::shared_ptr<CountDownRingPlayerListener> playerInterruptListener{nullptr};\r
         AudioSession sessionId;\r
         AudioInterrupt interrupt;\r
-        const char *RingMusicPath = "/user/music/alarm.mp3"; // 铃声路径\r
+        // const char *RingMusicPath = "/user/music/alarm.mp3"; // 铃声路径\r
+        const char *RingMusicPath = "/music/ring/alarm.mp3"; // 铃声路径\r
 \r
         std::string countdownDuration{nullptr};\r
         std::string RingTime{"00:00:00"};  // 响铃时间\r

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 92d983f..f58fa75 100644 (file)
--- 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;
     }