From: Caisking <3449750381@qq.com>
Date: Tue, 13 Aug 2024 08:26:53 +0000 (+0800)
Subject: 修复睡眠数据覆盖单位的bug
X-Git-Tag: release_V1.2.70_20241020_135402~673^2~2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d3e88ef93575c5cfb06c1f5bcecb017f0491e835;p=mirrors%2FFD230.git

修复睡眠数据覆盖单位的bug
---

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 be9e7086e..e66efd33d 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
@@ -616,7 +616,7 @@ namespace OHOS
             total_hours--;       // 如果分钟差为负数，小时差减1
             total_minutes += 60; // 转换为正数，加60分钟
         }
-        goal_total_time = (total_hours == 0 && total_minutes < 60) ? 1 : total_hours; // 确保最小时间为1小时
+        goal_total_time = total_hours; // 确保最小时间为0小时
     }
     // 获取睡眠总时长（小时）
     int SleepModel::get_sleep_hour()
diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
index e222aa5c4..23f40d376 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
@@ -112,7 +112,7 @@ namespace OHOS
         /*初始化单位*/
         InitLabelExt(hour, 157, 246, 75, 75, "lablehour", STR_HOUR, DEFAULT_VECTOR_FONT_FILENAME, 26);
         hour->SetTextColor(Color::Gray());
-        InitLabelExt(minute, 299, 246, 100, 75, "lableminute", STR_MIN, DEFAULT_VECTOR_FONT_FILENAME, 26);
+        InitLabelExt(minute, 295, 246, 100, 75, "lableminute", STR_MIN, DEFAULT_VECTOR_FONT_FILENAME, 26);
         minute->SetTextColor(Color::Gray());
         /*初始化image*/
         InitImageView(roomimage, 192, 127, 82, 82, "image", roomimagePath);
@@ -129,16 +129,16 @@ namespace OHOS
         time_hour->SetText("--");
         time_hour->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         time_hour->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        time_hour->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 80);
+        time_hour->SetFont(GILROY_BOLD_FONT, 65);
 
         time_minute = new UILabel();
-        time_minute->SetPosition(230, 237);
+        time_minute->SetPosition(240, 237);
         time_minute->Resize(40, 75);
         time_minute->SetViewId("time_minute");
         time_minute->SetText("--");
         time_minute->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         time_minute->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        time_minute->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 80);
+        time_minute->SetFont(GILROY_BOLD_FONT, 65);
         /* --------------------------------- 初始化进度条 --------------------------------- */
         circleProgress_ = new UICircleProgress();
         if (circleProgress_ == nullptr)