From 6853553df12041652840ae84ef4199c541ccbb6b Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com>
Date: Tue, 5 Aug 2025 11:01:21 +0000
Subject: [PATCH] Merge #2046 into sdk650pathc0423 from refs/changes/2046/head
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

修改睡眠更新字符串获取逻辑

* refs/changes/2046/head: (1 commits squashed)

  - 修改睡眠更新字符串获取逻辑

Signed-off-by: Caisking <3449750381@qq.com>
Merged-by: aliyun6865282430 <1624952103@qq.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/2046
---
 .../fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp
index 3823e09fe..fbb2ca912 100644
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp
@@ -384,6 +384,9 @@ namespace OHOS
     cywee_get_sleep_time_data(&nap_fall_asleep_timestamp, &nap_wake_up_timestamp, &nap_total, NAP_DATA_TYPE);
 #endif
 
+  //获取最新的出睡时间
+  sleep_fall_asleep_timestamp =  nap_wake_up_timestamp>sleep_wake_up_timestamp?nap_fall_asleep_timestamp:sleep_fall_asleep_timestamp;
+
   OHOS::SleepModel::GetInstance().set_sleep_total(sleep_total);
   OHOS::SleepModel::GetInstance().set_nap_total(nap_total);
 
@@ -592,8 +595,6 @@ namespace OHOS
   {
     sleep_time_str.clear();
     // 获取睡眠最新时间
-    // sleep_update_time = get_sleep_update_timestamp();
-    sleep_update_time = 0;
     // 获取时间戳
     update_time_info(sleep_update_time, sleep_time_str);
     return sleep_time_str;
-- 
2.17.1