倒计时界面修改为只要震动

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 cc66131..818267f 100644 (file)
--- 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
     /*触发铃声的停止*/\r
     void CountDownModel::RequestStopRingtone(void)\r
     {\r
-        PostRingtoneEvent(&CountDownModel::StopRingtonePlaybackAndReleaseResources);\r
+        // PostRingtoneEvent(&CountDownModel::StopRingtonePlaybackAndReleaseResources);\r
     }\r
 \r
     // 判断计时器是否结束\r
@@ -383,7 +383,7 @@ namespace OHOS
         {\r
             CountDown_StopTimer();                                 // 停止定时器\r
             uapi_set_screen_on_api();                              // 点亮屏幕\r
-            CountDownModel::GetInstance()->RequestStartRingtone(); // 播放铃声\r
+            // CountDownModel::GetInstance()->RequestStartRingtone(); // 播放铃声\r
             CountDownModel::GetInstance()->CountDown_VibratorTimerStart(); // 触发震动\r
 \r
             StartCountDownView::GetInstance()->GetPlayOrPauseToggleButton()->SetVisible(false);\r
@@ -637,11 +637,6 @@ namespace OHOS
     static void CountDown_VibratorTimerCallbackProc(void *arg)\r
     {\r
         WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "CountDown_VibratorTimerCallbackProc");\r
-        if(CountDownModel::GetInstance()->isNeedVibratorTimerStop())\r
-        {\r
-            CountDownModel::GetInstance()->CountDown_VibratorTimerStop();\r
-            return;\r
-        }\r
         // 触发震动\r
         custom_VibratorFunc_int(0);\r
         custom_VibratorFunc_int(0);\r

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 639caad..74f7217 100644 (file)
--- 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
 \r
         if (strcmp(view.GetViewId(), STARTCOUNTDOWNVIEWRETURNBUTTON) == 0) // 从开始倒计时视图退到倒计时主视图\r
         {\r
+            CountDownModel::GetInstance()->CountDown_VibratorTimerStop();//重新开始倒计时要将震动关闭\r
+\r
             CountDownModel::GetInstance()->SetCountDownTime("00:00:00");\r
             CountDownModel::GetInstance()->SetRingTime("00:00:00");\r
             CountDownModel::GetInstance()->CountDown_StopTimer();\r
@@ -212,6 +214,8 @@ namespace OHOS
             // close prompt\r
             CountDownModel::GetInstance()->StopRingtonePlaybackAndReleaseResources();\r
 \r
+            CountDownModel::GetInstance()->CountDown_VibratorTimerStop();//重新开始倒计时要将震动关闭\r
+\r
             /*结束视图恢复*/\r
             if (p_StartCountDownView == nullptr)\r
                 return false;\r

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 af12408..5cdf578 100644 (file)
--- 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
     {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StartCountDownView::~StartCountDownView");\r
         ClearAll();\r
+        CountDownModel::GetInstance()->CountDown_VibratorTimerStop();\r
         g_pStartCountDownView = nullptr;\r
     }\r
 \r