From ef2c859fee59231373dc9445bed55adf4c5fc2dd Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Wed, 3 Jul 2024 11:05:33 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D=E7=9D=A1=E7=9C=A0=E6=95=B0?=
 =?utf8?q?=E6=8D=AE=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 15144367)
---
 .../nativeui/sleep/src/SleepModel.cpp         | 41 +++++++++++++++----
 1 file changed, 34 insertions(+), 7 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 843d782e9..5628619fa 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
@@ -87,7 +87,12 @@ namespace OHOS
         fwrite(&wake_up_timestamp, 1, 4, fp);
 
         uint16_t total_time = data->total_time;
-        fwrite(&total_time, 1, 2, fp);
+
+        uint8_t total_time_hour = (total_time / 60);
+        fwrite(&total_time_hour, 1, 1, fp);
+
+        uint8_t total_time_minute = (total_time % 60);
+        fwrite(&total_time_minute, 1, 1, fp);
 
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "save_nap_sleep_data succ");
 
@@ -156,26 +161,47 @@ namespace OHOS
         fwrite(&wake_up_timestamp, 1, 4, fp);
 
         uint16_t total_time = data->total_time;
-        fwrite(&total_time, 1, 2, fp);
+
+        uint8_t total_time_hour = (total_time / 60);
+        fwrite(&total_time_hour, 1, 1, fp);
+
+        uint8_t total_time_minute = (total_time % 60);
+        fwrite(&total_time_minute, 1, 1, fp);
 
         uint16_t total_deep_sleep_time = data->total_deep_sleep_time;
-        fwrite(&total_deep_sleep_time, 1, 2, fp);
+
+        total_time_hour = (total_deep_sleep_time / 60);
+        fwrite(&total_time_hour, 1, 1, fp);
+
+        total_time_minute = (total_deep_sleep_time % 60);
+        fwrite(&total_time_minute, 1, 1, fp);
 
         uint16_t total_mild_sleep_time = data->total_mild_sleep_time;
-        fwrite(&total_mild_sleep_time, 1, 2, fp);
+        total_time_hour = (total_mild_sleep_time / 60);
+        fwrite(&total_time_hour, 1, 1, fp);
+
+        total_time_minute = (total_mild_sleep_time % 60);
+        fwrite(&total_time_minute, 1, 1, fp);
 
         uint16_t total_rem_sleep_time = data->total_rem_sleep_time;
-        fwrite(&total_rem_sleep_time, 1, 2, fp);
+        total_time_hour = (total_rem_sleep_time / 60);
+        fwrite(&total_time_hour, 1, 1, fp);
+
+        total_time_minute = (total_rem_sleep_time % 60);
+        fwrite(&total_time_minute, 1, 1, fp);
 
         uint16_t total_wake_time = data->total_wake_time;
-        fwrite(&total_wake_time, 1, 2, fp);
+        total_time_hour = (total_wake_time / 60);
+        fwrite(&total_time_hour, 1, 1, fp);
+
+        total_time_minute = (total_wake_time % 60);
+        fwrite(&total_time_minute, 1, 1, fp);
 
         fwrite(data->sleep_status, sizeof(SLEEP_STATE_T), data->status_num, fp);
 
         fclose(fp);
         return true;
     }
-
     void set_sleep_data(SLEEP_T *data)
     {
         memset(&sleep_data, 0, sizeof(SLEEP_T));
@@ -184,6 +210,7 @@ namespace OHOS
         // 刷新model里面的数据
         SleepModel::GetInstance().update_sleep(&sleep_data);
     }
+    /* -------------------------------------------------------------------------- */
     SleepModel::SleepModel()
     {
         set_sleep_goal();
-- 
2.17.1