From 01a07579ec06ef7377399b33075845467ca87787 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Sat, 7 Sep 2024 17:59:55 +0800
Subject: [PATCH] =?utf8?q?=E7=9D=A1=E7=9C=A0=EF=BC=8C=E8=AE=AD=E7=BB=83?=
 =?utf8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E5=88=A0=E9=99=A4=E5=A2=9E=E5=8A=A0?=
 =?utf8?q?=E5=81=9C=E6=AD=A2=E5=AE=9A=E6=97=B6=E5=99=A8=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../wearable/fd230app/nativeui/sleep/src/SleepModel.cpp      | 5 +++--
 .../wearable/fd230app/nativeui/traing/src/TraingModel.cpp    | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

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 998a824f9..5fa418323 100644
--- 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 43827fb8d..fd8cf06f0 100644
--- 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)
                 {
-- 
2.17.1