From edf752aabf8b9ffcb36092c14a4c1a4bd76a2011 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Thu, 4 Jul 2024 19:23:23 +0800
Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E7=9D=A1=E7=9C=A0UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/sleep/src/SleepTimeView.cpp | 15 +++++++++++----
 .../fd230app/nativeui/sleep/src/SleepView.cpp     | 14 ++++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp
index 24765744a..d4d13bfd4 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp
@@ -29,8 +29,15 @@ namespace OHOS
 
     void SleepTimeView::SleepDataRefresh()
     {
-        sleep->SetText((SleepModel::GetInstance().get_rest_str()).c_str());
-        walk->SetText((SleepModel::GetInstance().get_walk_str()).c_str());
+        int sleep_hour = SleepModel::GetInstance().get_sleep_hour();
+        int sleep_min = SleepModel::GetInstance().get_sleep_min();
+
+        // 有数据则刷新
+        if (sleep_hour != 0 || sleep_min != 0)
+        {
+            sleep->SetText((SleepModel::GetInstance().get_rest_str()).c_str());
+            walk->SetText((SleepModel::GetInstance().get_walk_str()).c_str());
+        }
         goal->SetText((SleepModel::GetInstance().get_goal_str()).c_str());
     }
 
@@ -143,10 +150,10 @@ namespace OHOS
         // goal->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
         goal->SetTextColor(Color::Gray());
         sleepStr = "--";
-        InitLabelAdapt(sleep, 99, 238, 230, 47, "sleeplabel", sleepStr.c_str(), DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelAdapt(sleep, 79, 238, 230, 47, "sleeplabel", sleepStr.c_str(), DEFAULT_VECTOR_FONT_FILENAME, 40);
         sleep->SetTextColor(Color::Purple());
         walkStr = "--";
-        InitLabelAdapt(walk, 321, 238, 230, 47, "walklabel", walkStr.c_str(), DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelAdapt(walk, 319, 238, 230, 47, "walklabel", walkStr.c_str(), DEFAULT_VECTOR_FONT_FILENAME, 40);
         walk->SetTextColor(Color::Purple());
         /* -------------------------------- 将组件添加到根视图 ------------------------------- */
         Add(resttitle);
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 cd5d2b696..af57e6a2e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
@@ -31,18 +31,24 @@ namespace OHOS
     {
         int sleep_hour = SleepModel::GetInstance().get_sleep_hour();
         int sleep_min = SleepModel::GetInstance().get_sleep_min();
+
+        // 补零操作
+        std::string hour_str = (sleep_hour < 10) ? "0" + std::to_string(sleep_hour) : std::to_string(sleep_hour);
+        std::string min_str = (sleep_min < 10) ? "0" + std::to_string(sleep_min) : std::to_string(sleep_min);
+
         // 有数据则刷新
         if (sleep_hour != 0 || sleep_min != 0)
         {
-            time_hour->SetText(std::to_string(sleep_hour).c_str());
-            time_minute->SetText(std::to_string(sleep_min).c_str());
+            time_hour->SetText(hour_str.c_str());
+            time_minute->SetText(min_str.c_str());
 
             int value = (float(SleepModel::GetInstance().get_sleep_total()) / float(SleepModel::GetInstance().get_sleep_goal())) * 100;
             circleProgress_->SetValue(value);
             Invalidate();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Updata SleppTime!");
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Updata SleepTime!");
             RootView::GetInstance()->Invalidate();
         }
+
         // 更新目标时间
         int totaltime = SleepModel::GetInstance().get_sleep_goal();
         UpdateLabel(goaltime, totaltime, STR_SLEEPMGOAL);
@@ -108,7 +114,7 @@ namespace OHOS
         InitImageView(upiconimage, 213, 360, 40, 40, "image", upimagePath);
         InitImageView(progress_image, 28, 80, 100, 100, "image", prossimagePath);
         /*初始化目标时间*/
-        InitLabelExt(goaltime, 83, 312, 300, 35, "lablegoal", STR_SLEEPMGOAL, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(goaltime, 83, 330, 300, 35, "lablegoal", STR_SLEEPMGOAL, DEFAULT_VECTOR_FONT_FILENAME, 30);
         goaltime->SetTextColor(Color::Gray());
         /*初始化睡眠时间*/
         time_hour = new UILabel();
-- 
2.17.1