From 2402de3171d52b87434bb9add617f4c16fb436a9 Mon Sep 17 00:00:00 2001
From: penglei <1624952103@qq.com>
Date: Tue, 20 Aug 2024 19:32:26 +0800
Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E8=BF=90=E5=8A=A8=E6=95=B0?=
 =?utf8?q?=E6=8D=AE=E7=87=83=E8=84=82=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97?=
 =?utf8?q?=E3=80=82=20=E7=9D=A1=E7=9C=A0=E7=9B=91=E6=B5=8B=E5=88=87?=
 =?utf8?q?=E6=8D=A2=E6=97=B6=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B0=8F=E7=9D=A1?=
 =?utf8?q?=E4=B8=8E=E7=9D=A1=E7=9C=A0=E7=8A=B6=E6=80=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../src/AlarmClockTimerConfig.cpp                    |  2 ++
 .../service/msg_center/src/msg_center_customer.cpp   | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
index 8eaf609a4..34f42cb0a 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -397,6 +397,7 @@ extern "C"
                 if (uapi_dev_runtime_get_sleep_status() == 0)
                 {
                     // 设置状态为小睡
+                    uapi_dev_runtime_set_nap_status(0);//清零小睡状态
                     uapi_dev_runtime_set_nap_monitoring_status(1);
                     uapi_dev_runtime_set_sleep_monitoring_status(0);
                     OHOS::SleepModel::GetInstance().ReInitData(); // 更新睡眠数据
@@ -409,6 +410,7 @@ extern "C"
             // 进入睡眠检测模式并退出小睡检测模式
             else if ((!WAKE_TIME_RANGE) && (uapi_dev_runtime_get_sleep_monitoring_status() == 0))
             {
+                uapi_dev_runtime_set_sleep_status(0);//清零睡眠状态
                 uapi_dev_runtime_set_sleep_monitoring_status(1);
                 uapi_dev_runtime_set_nap_monitoring_status(0);
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);//强制获取小睡数据，结束小睡
diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index fc65cf674..a36b74a77 100644
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@ -1105,6 +1105,8 @@ void MsgCenterNotifyActivityProc(const Topic topic, Request* req)
     c_activity_result_t = NULL;
 }
 
+static int train_fat_time = 0;
+
 void MsgCenterNotifyActivityExtraInfoProc(const Topic topic, Request* req)
 {
     unused(topic);
@@ -1124,8 +1126,16 @@ void MsgCenterNotifyActivityExtraInfoProc(const Topic topic, Request* req)
         return;
     }
 
+    if(uapi_dev_runtime_get_train_status() && c_activity_result_extre_info_t->ativity_zone_high_duration)
+    {
+        train_fat_time = c_activity_result_extre_info_t->ativity_zone_high_duration;
+    }
     /*更新燃脂时间数据*/
-    set_fat_time_data(c_activity_result_extre_info_t->ativity_zone_high_duration);
+    else if(uapi_dev_runtime_get_train_status() == 0 && train_fat_time)
+    {
+        set_fat_time_data(train_fat_time);
+        train_fat_time = 0;
+    }
 
     free(c_activity_result_extre_info_t);
     c_activity_result_extre_info_t = NULL;
-- 
2.17.1