睡眠，训练定时器删除增加停止定时器操作

diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
index 998a824..5fa4183 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
@@ -1,8 +1,8 @@
 /*
  * @Author: penglei 1624952103@qq.com
  * @Date: SLEPPNOTIFY24-06-26 19:36:48
- * @LastEditors: penglei 1624952103@qq.com
- * @LastEditTime: 2024-09-07 12:03:34
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-09-07 17:56:51
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
  * @Description:
  *
@@ -787,6 +787,7 @@ namespace OHOS
         if (g_timer != NULL)
         {
             // 删除定时器并置为 NULL
+            osTimerStop(g_timer);
             osStatus_t ret = osTimerDelete(g_timer);
             if (ret != osOK)
             {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
index 43827fb..fd8cf06 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -1373,6 +1373,7 @@ namespace OHOS
         {
             if (g_startCounting != NULL)
             {
+                PauseTimer();
                 osStatus_t ret = osTimerDelete(g_startCounting);
                 if (ret != osOK)
                 {