From 9497ebf6edf49dddb9e46238f22a551f71d8fe41 Mon Sep 17 00:00:00 2001
From: penglei <1624952103@qq.com>
Date: Fri, 8 Nov 2024 12:27:24 +0800
Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E5=BF=83=E7=8E=87=E5=8D=A1?=
 =?utf8?q?=E7=89=87=E5=88=B7=E6=96=B0=E7=9D=A1=E7=9C=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/sleep/src/SleepModel.cpp    | 15 ++++++++++-----
 code/sdk/drivers/peripheral/cywee/src/main_dml.c  |  4 ++++
 2 files changed, 14 insertions(+), 5 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 00215d87b..4936f4d14 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
@@ -2,7 +2,7 @@
  * @Author: penglei 1624952103@qq.com
  * @Date: SLEPPNOTIFY24-06-26 19:36:48
  * @LastEditors: penglei 1624952103@qq.com
- * @LastEditTime: 2024-11-06 18:28:20
+ * @LastEditTime: 2024-11-08 12:26:04
  * @FilePath:
  * /FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
  * @Description:
@@ -137,7 +137,7 @@ namespace OHOS
     FILE *fp = fopen(file_path, "rb");
     if (fp == NULL)
     {
-      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "read_sleep_data fopen fail");
+      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "read_sleep_data fopen fail %s \n",file_path);
       // osal_mutex_unlock(&sleep_mutex);
       return false;
     }
@@ -307,8 +307,13 @@ namespace OHOS
 
   // 开机读取
   void SleepModel::read_sleep_file_data() {
-    custom_read_sleep_data();
-    custom_read_nap_data();
+    // custom_read_sleep_data();
+    do_custom_fileoperate_service_check_msg(  
+            CUSTOM_FILEOPERATE_MSG_TYPE_SLEEPDATA_READ, nullptr, 0);  
+    do_custom_fileoperate_service_check_msg(  
+            CUSTOM_FILEOPERATE_MSG_TYPE_NAPDATA_READ, nullptr, 0);
+    // custom_read_nap_data();
+
   }
   // 保存睡眠数据
  void SleepModel::msg_save_sleep_data() {
@@ -792,7 +797,7 @@ namespace OHOS
       sleep_data.total_time = totaltime;
     }
     // 更新小睡数据
-    void updata_nap_data(uint32_t sleep_timestamp, uint32_t wake_timestamp,
+    void update_nap_data(uint32_t sleep_timestamp, uint32_t wake_timestamp,
                          uint32_t totaltime) {
       nap_data.fall_asleep_timestamp = sleep_timestamp;  
       nap_data.wake_up_timestamp = wake_timestamp;  
diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
index eecb29463..962656301 100644
--- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c
+++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
@@ -18,6 +18,7 @@
 #include "time.h"
 #include "ConfigModelC.h"
 #include "battery_hal.h"
+#include "sleep/include/SleepModelC.h"
 
 #define AP_ENABLE_DML_SDO_LISTEN
 
@@ -212,6 +213,8 @@ void cywee_save_nap_data(cywee_inactivity_accumulate_time_t c_inactivity_accumul
     // CWM_OS_dbgPrintf("save_nap_sleep_data succ \n");
 
     fclose(fp);
+
+    update_nap_data(fall_asleep_timestamp,wake_up_timestamp,total_time);
 }
 
 void cywee_set_sleep_time_data(cywee_inactivity_accumulate_time_t *sleep_data)
@@ -300,6 +303,7 @@ void cywee_save_sleep_time_data(cywee_inactivity_accumulate_time_t sleep_time)
     // CWM_OS_dbgPrintf("total_time[%d], total_deep_sleep_time[%d], total_mild_sleep_time[%d], total_rem_sleep_time[%d], total_wake_time[%d] \n",
     // total_time,total_deep_sleep_time,total_mild_sleep_time,total_rem_sleep_time,total_wake_time);
 
+    update_sleep_data(fall_asleep_timestamp,wake_up_timestamp,total_time);
 
 }
 
-- 
2.17.1