From 7f3a0064002abd74956efd885508d2fae5a0d796 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Wed, 11 Mar 2026 15:53:47 +0800
Subject: [PATCH] =?utf8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E7=95=8C=E9=9D=A2?=
 =?utf8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8F=AA=E8=A6=81=E9=9C=87=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeapp/nativeui/countdown/src/CountDownModel.cpp  | 9 ++-------
 .../nativeui/countdown/src/MainCountDownPresenter.cpp    | 4 ++++
 .../nativeui/countdown/src/StartCountDownView.cpp        | 1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/CountDownModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/CountDownModel.cpp
index cc661312c..818267fd8 100644
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/CountDownModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/CountDownModel.cpp
@@ -341,7 +341,7 @@ namespace OHOS
     /*触发铃声的停止*/
     void CountDownModel::RequestStopRingtone(void)
     {
-        PostRingtoneEvent(&CountDownModel::StopRingtonePlaybackAndReleaseResources);
+        // PostRingtoneEvent(&CountDownModel::StopRingtonePlaybackAndReleaseResources);
     }
 
     // 判断计时器是否结束
@@ -383,7 +383,7 @@ namespace OHOS
         {
             CountDown_StopTimer();                                 // 停止定时器
             uapi_set_screen_on_api();                              // 点亮屏幕
-            CountDownModel::GetInstance()->RequestStartRingtone(); // 播放铃声
+            // CountDownModel::GetInstance()->RequestStartRingtone(); // 播放铃声
             CountDownModel::GetInstance()->CountDown_VibratorTimerStart(); // 触发震动
 
             StartCountDownView::GetInstance()->GetPlayOrPauseToggleButton()->SetVisible(false);
@@ -637,11 +637,6 @@ namespace OHOS
     static void CountDown_VibratorTimerCallbackProc(void *arg)
     {
         WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "CountDown_VibratorTimerCallbackProc");
-        if(CountDownModel::GetInstance()->isNeedVibratorTimerStop())
-        {
-            CountDownModel::GetInstance()->CountDown_VibratorTimerStop();
-            return;
-        }
         // 触发震动
         custom_VibratorFunc_int(0);
         custom_VibratorFunc_int(0);
diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp
index 639caadf3..74f721757 100644
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp
@@ -194,6 +194,8 @@ namespace OHOS
 
         if (strcmp(view.GetViewId(), STARTCOUNTDOWNVIEWRETURNBUTTON) == 0) // 从开始倒计时视图退到倒计时主视图
         {
+            CountDownModel::GetInstance()->CountDown_VibratorTimerStop();//重新开始倒计时要将震动关闭
+
             CountDownModel::GetInstance()->SetCountDownTime("00:00:00");
             CountDownModel::GetInstance()->SetRingTime("00:00:00");
             CountDownModel::GetInstance()->CountDown_StopTimer();
@@ -212,6 +214,8 @@ namespace OHOS
             // close prompt
             CountDownModel::GetInstance()->StopRingtonePlaybackAndReleaseResources();
 
+            CountDownModel::GetInstance()->CountDown_VibratorTimerStop();//重新开始倒计时要将震动关闭
+
             /*结束视图恢复*/
             if (p_StartCountDownView == nullptr)
                 return false;
diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/StartCountDownView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/StartCountDownView.cpp
index af12408a2..5cdf57886 100644
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/StartCountDownView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/countdown/src/StartCountDownView.cpp
@@ -21,6 +21,7 @@ namespace OHOS
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StartCountDownView::~StartCountDownView");
         ClearAll();
+        CountDownModel::GetInstance()->CountDown_VibratorTimerStop();
         g_pStartCountDownView = nullptr;
     }
 
-- 
2.17.1