From: Caisking <3449750381@qq.com>
Date: Mon, 18 Mar 2024 03:53:13 +0000 (+0800)
Subject: 修复部分资源缺少问题
X-Git-Tag: release_V1.2.70_20241020_135402~1274^2~6^2~2
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=c5e5d856b57fe6cfdc415d522af6014d6382f6bf;p=mirrors%2FFD230.git

修复部分资源缺少问题
---

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index 80e31f20c..cbbeccd84 100644
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -46,9 +46,9 @@ namespace OHOS
     static constexpr const char *COMPASS_IAMGES = APP_RES_PATH "/compass/compass.bin";
     static constexpr const char *DROPDOWN_IAMGES = APP_RES_PATH "/dropdown/dropdown.bin";
     static constexpr const char *HEART_IAMGES = APP_RES_PATH "/heart/heart.bin";
-    static constexpr const char *BLOOD_IAMGES = APP_RES_PATH "/Blood/BloodOxygen.bin";
-    static constexpr const char *TRAINING_IAMGES = APP_RES_PATH "/Training/Training.bin";
-    static constexpr const char *MESSAGE_IAMGES = APP_RES_PATH "/Message/Message.bin";
+    static constexpr const char *BLOOD_IAMGES = APP_RES_PATH "/maincard/BloodOxygen.bin";
+    static constexpr const char *TRAINING_IAMGES = APP_RES_PATH "/maincard/Training.bin";
+    static constexpr const char *MESSAGE_IAMGES = APP_RES_PATH "/maincard/Message.bin";
     /* ----------------------------------- 打电话图片 ---------------------------------- */
     static constexpr const char *PNG_AGREEING_IMAGE_PATH = APP_RES_PATH "/AGREEING.bin";
     static constexpr const char *PNG_DISSGREE_IMAGE_PATH = APP_RES_PATH "/DISSGREE.bin";
diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
index 254aed53e..41965af6d 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
@@ -25,7 +25,7 @@ namespace OHOS
         {VIEW_COMPASS, PNG_APPLIST_COMPASS_IMAGE, PNG_APPLIST_COMPASS_IMAGE, "指南针", nullptr},
         {VIEW_INDOORWALK, PNG_APPLIST_WALK_IMAGE, PNG_APPLIST_WALK_IMAGE, "室内步行", nullptr},
         {VIEW_WEATHER, PNG_APPLIST_WEATHER_IMAGE, PNG_APPLIST_WEATHER_IMAGE, "天气", nullptr},
-        {VIEW_HEART, PNG_APPLIST_HEART_IMAGE, PNG_APPLIST_HEART_IMAGE, "心率检测", nullptr},
+        // {VIEW_HEART, PNG_APPLIST_HEART_IMAGE, PNG_APPLIST_HEART_IMAGE, "心率检测", nullptr},
         {VIEW_RECORD, PNG_APPLIST_RECORD_IMAGE, PNG_APPLIST_RECORD_IMAGE, "录音", nullptr},
         {VIEW_SETTING, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_SETTING_IMAGE, "设置", nullptr},
         {VIEW_DIALUPDATE, PNG_APPLIST_UI_SAMPLE_IMAGE, PNG_APPLIST_UI_SAMPLE_IMAGE, "表盘切换", nullptr},
diff --git a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdateModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdateModel.cpp
index 7224e00fb..60183a0af 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdateModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdateModel.cpp
@@ -99,9 +99,7 @@ void printf_dial(void)
 namespace OHOS
 {
     DialUpdateModel::DialUpdateModel() {}
-
     DialUpdateModel::~DialUpdateModel() {}
-
     DialUpdateModel *DialUpdateModel::GetInstance()
     {
         static DialUpdateModel instance;
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h
index a6f1174b3..64dd9fdc7 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h
@@ -159,8 +159,8 @@ extern "C"
             bool initstatus = true;
             bool wearstatus;
             uint8_t wear_;
-            uint64 timestamp_ms;
-            uint8_t wear_error;
+            uint8_t valid_counter_ = 0;//有效数计数器
+            uint8_t wear_counter_ = 0;//佩戴错误计数器
         };
     }
 
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartCheckView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartCheckView.cpp
index d310eac87..eaabed248 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartCheckView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartCheckView.cpp
@@ -119,8 +119,8 @@ namespace OHOS
             return nullptr;
         }
         imageAnimator->SetImageAnimatorSrc(g_imageAnimatorInfo_Time, CHECKIMAGEANIMATORVIEW_SIZE, CHECKIMAGEANIMATORVIEW_SPEED);
-        imageAnimator->SetRepeatTimes(30);
-        imageAnimator->SetRepeat(false);
+        //imageAnimator->SetRepeatTimes(30);
+        imageAnimator->SetRepeat(true);
         imageAnimator->Start();
         HeartCheckScrollView->Add(imageAnimator);
         /* -------------------------------------------------------------------------- */
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
index 4b0f1ace8..810752dc4 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
@@ -195,8 +195,9 @@ namespace OHOS
         CheckView = false;
         ResultView = false;
         CheckStatus = false;
+        wearStatus = true;
         // 初始化血氧值
-        HeartRateData *data = new HeartRateData;
+        HeartRateData *data;
         data = HeartService::GetInstance()->ReadHeartRateData();
         Heart_ = data->Heart;
         TIME_ = data->timestamp;
@@ -470,28 +471,20 @@ namespace OHOS
         }
     }
     /* ---------------------------------- 状态检测 ---------------------------------- */
-    /**
-     * @brief 设置佩戴状态
-     */
+
     void HeartModel::Heart_Start()
     {
-        //进行初始化操作
-        timestamp_ms=0;
-
+        // 进行初始化操作
+        SetCheckStatus(true);
     }
-    /**
-     * @brief 设置结束状态
-     */
+
     void HeartModel::Heart_Stop()
     {
-        
+        valid_counter_ = 0;
+        wear_counter_ = 0;
+        SetCheckStatus(false);
     }
 
-    /**
-     * @brief 设置佩戴状态
-     *
-     * @param wear 佩戴状态值
-     */
     void HeartModel::SetWearStatus(uint8_t wear)
     {
         // 设置佩戴状态
@@ -502,9 +495,9 @@ namespace OHOS
         if (wear_ != 1)
         {
             // 佩戴错误计时器计数
-            wear_error++;
+            wear_counter_++;
             // 计数达到10次，停止检测
-            if (wear_error >= 10)
+            if (wear_counter_ >= 10)
             {
                 wearStatus = false;
             }
@@ -512,132 +505,104 @@ namespace OHOS
         wearStatus = true;
     }
 
-    /**
-     * @brief 获取佩戴状态
-     *
-     * @return 佩戴状态
-     */
-    bool HeartModel::GetWearStatus(void) { return wearStatus; }
-
-    /**
-     * @brief 设置心率带视图状态
-     *
-     * @param bandoffViewStatus 心率带视图状态值
-     */
-    void HeartModel::SetHeartBandoffViewStatus(bool bandoffViewStatus) { BandoffView = bandoffViewStatus; }
-
-    /**
-     * @brief 获取心率带视图状态
-     *
-     * @return 心率带视图状态
-     */
-    bool HeartModel::GetHeartBandoffViewStatus() { return BandoffView; }
-
-    /**
-     * @brief 获取心率视图状态
-     *
-     * @return 心率视图状态
-     */
-    bool HeartModel::GetHeartViewStatus() { return HeartView; }
-
-    /**
-     * @brief 设置心率视图状态
-     *
-     * @param heartViewStatus 心率视图状态值
-     */
-    void HeartModel::SetHeartViewStatus(bool heartViewStatus) { HeartView = heartViewStatus; }
-
-    /**
-     * @brief 获取心率检测视图状态
-     *
-     * @return 心率检测视图状态
-     */
-    bool HeartModel::GetHeartCheckViewStatus() { return CheckView; }
-
-    /**
-     * @brief 设置心率检测视图状态
-     *
-     * @param checkViewStatus 心率检测视图状态值
-     */
-    void HeartModel::SetHeartCheckViewStatus(bool checkViewStatus) { CheckView = checkViewStatus; }
-
-    /**
-     * @brief 获取心率结果视图状态
-     *
-     * @return 心率结果视图状态
-     */
-    bool HeartModel::GetHeartResultViewStaus() { return ResultView; }
-
-    /**
-     * @brief 设置心率结果视图状态
-     *
-     * @param resultViewStatus 心率结果视图状态值
-     */
-    void HeartModel::SetHeartResultViewStatus(bool resultViewStatus) { ResultView = resultViewStatus; }
-
-    /**
-     * @brief 获取检测状态
-     *
-     * @return 检测状态
-     */
-    bool HeartModel::GetCheckStatus() { return CheckStatus; }
-
-    /**
-     * @brief 设置检测状态
-     *
-     * @param checkStatus 检测状态值
-     */
-    void HeartModel::SetCheckStatus(bool checkStatus) { CheckStatus = checkStatus; }
-
-    /**
-     * @brief 获取心率数据
-     *
-     * @return 心率数据
-     */
-    uint16_t HeartModel::GetHeartdata() { return Heart_; }
-
-    /**
-     * @brief 获取显示的心率数据
-     *
-     * @return 显示的心率数据
-     */
-    uint16_t HeartModel::GetShowHeartdata() { return Show_Heart_; }
-
-    /**
-     * @brief 更新心率数据
-     *
-     * @param heart 心率值
-     */
+    bool HeartModel::GetWearStatus()
+    {
+        return wearStatus;
+    }
+
+    void HeartModel::SetHeartBandoffViewStatus(bool bandoffViewStatus)
+    {
+        BandoffView = bandoffViewStatus;
+    }
+
+    bool HeartModel::GetHeartBandoffViewStatus()
+    {
+        return BandoffView;
+    }
+
+    void HeartModel::SetHeartViewStatus(bool heartViewStatus)
+    {
+        HeartView = heartViewStatus;
+    }
+
+    bool HeartModel::GetHeartViewStatus()
+    {
+        return HeartView;
+    }
+
+    void HeartModel::SetHeartCheckViewStatus(bool checkViewStatus)
+    {
+        CheckView = checkViewStatus;
+    }
+
+    bool HeartModel::GetHeartCheckViewStatus()
+    {
+        return CheckView;
+    }
+
+    void HeartModel::SetHeartResultViewStatus(bool resultViewStatus)
+    {
+        ResultView = resultViewStatus;
+    }
+
+    bool HeartModel::GetHeartResultViewStaus()
+    {
+        return ResultView;
+    }
+
+    void HeartModel::SetCheckStatus(bool checkStatus)
+    {
+        CheckStatus = checkStatus;
+    }
+
+    bool HeartModel::GetCheckStatus()
+    {
+        return CheckStatus;
+    }
+
+    uint16_t HeartModel::GetHeartdata()
+    {
+        return Heart_;
+    }
+
+    uint16_t HeartModel::GetShowHeartdata()
+    {
+        return Show_Heart_;
+    }
+
+    uint64_t HeartModel::GetCheckTime()
+    {
+        return TIME_;
+    }
+
+    void HeartModel::SetCheckTime(uint64_t time)
+    {
+        TIME_ = time;
+    }
+
     void HeartModel::UpHeartdata(uint16_t heart)
     {
         Show_Heart_ = heart;
         if (Show_Heart_ != 0)
         {
             Heart_ = heart;
+            valid_counter_++; // 增加有效计数器
+        }
+        else
+        {
+            valid_counter_ = 0; // 清零有效计数器
         }
-    }
 
-    /**
-     * @brief 获取检测时间
-     *
-     * @return 检测时间
-     */
-    uint64_t HeartModel::GetCheckTime()
-    {
-        if (initstatus)
+        if (valid_counter_ >= 10)
         {
-            // 获取当前时间
-            TIME_ = HeartPresenter::GetInstance()->GetCurrentTime();
-            initstatus = false;
+            // 结束本次测试，将最后一次有效数作为本次测量结果
+            Heart_Stop();
+            HeartRateData *data;
+            data->Heart = heart;
+            data->timestamp = HeartPresenter::GetInstance()->GetCurrentTime();
+            SetCheckTime(data->timestamp);
+            HeartService::GetInstance()->UpdateHeartRateData(*data);
         }
-        return TIME_;
     }
 
-    /**
-     * @brief 设置检测时间
-     *
-     * @param time 检测时间值
-     */
-    void HeartModel::SetCheckTime(uint64_t time) { TIME_ = time; }
-
 }
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartPresenter.cpp
index bbfa4b00c..4aa3216d2 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartPresenter.cpp
@@ -47,7 +47,7 @@ namespace OHOS
 
     std::string HeartPresenter::GetTDOA(uint16_t new_time, uint16_t old_time)
     {
-        if (new_time == old_time)
+        if (new_time == old_time || old_time > new_time)
         {
             return "刚刚";
         }
@@ -165,8 +165,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HEARTCHECKVIEW->HEARTVIEW");
             HeartView::GetInstance()->ChangeView(HEARTCHECKVIEW, HEARTVIEW);
             HeartModel::GetInstance()->SetHeartCheckViewStatus(false);
-            HeartModel::GetInstance()->SetCheckStatus(false); // 关闭检测
-            return true;
+            HeartModel::GetInstance()->Heart_Stop();
         }
         // 从检测失败界面回到检测界面
         if (strcmp(view.GetViewId(), "ReCheck") == 0)
@@ -174,7 +173,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HEARTRESULT->HEARTCHECKVIEW");
             HeartView::GetInstance()->ChangeView(HEARTRESULT, HEARTCHECKVIEW);
             HeartCheckView::GetInstance()->GetImageAnimator()->Start(); // 播放检测界面动画
-            HeartModel::GetInstance()->SetCheckStatus(true);            // 开始检测
+            HeartModel::GetInstance()->Heart_Start();                   // 开始检测
             return true;
         }
         // 从检测失败界面回到主界面
@@ -182,7 +181,7 @@ namespace OHOS
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HEARTRESULT->HEARTVIEW");
             HeartView::GetInstance()->ChangeView(HEARTRESULT, HEARTVIEW);
-            HeartModel::GetInstance()->SetCheckStatus(false); // 关闭检测
+            HeartModel::GetInstance()->Heart_Stop();
             return true;
         }
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartPresenter::OnClick");
@@ -210,11 +209,11 @@ namespace OHOS
         // 当检测状态为开始检测，开始检测
         if (HeartModel::GetInstance()->GetCheckStatus() == true)
         {
-            HeartCheckView::GetInstance()->UpShowHeartText(); // 更新
+            HeartCheckView::GetInstance()->UpShowHeartText(); // 更新检测界面
             if (startheart == true)
             {
                 uint8_t md = PPG_SERVICE_CMD_TYPE_DO_PPG_TEST;
-                //send_ppg_cmd_msg(md);
+                send_ppg_cmd_msg(md);
                 startheart = false;
             }
         }
@@ -222,14 +221,27 @@ namespace OHOS
         // 当检测状态为结束检测，结束检测
         if (HeartModel::GetInstance()->GetCheckStatus() == false)
         {
-            HeartView::GetInstance()->UpHeartText(); // 更新主界面
+            if (HeartCheckView::GetInstance()->GetImageAnimator()->GetState() == true)
+            {
+                HeartCheckView::GetInstance()->GetImageAnimator()->Stop();
+            }
             if (startheart == false)
             {
                 uint8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST;
-                //send_ppg_cmd_msg(md);
+                send_ppg_cmd_msg(md);
                 startheart = true;
             }
         }
+
+        // 监测佩戴状态
+        if (HeartModel::GetInstance()->GetWearStatus() == false)
+        {
+            HeartModel::GetInstance()->Heart_Stop();
+            if (HeartCheckView::GetInstance()->GetImageAnimator()->GetState() == true)
+            {
+                HeartCheckView::GetInstance()->GetImageAnimator()->Stop();
+            }
+        }
     }
 
     void HeartPresenter::ReturnInterface()
@@ -246,7 +258,7 @@ namespace OHOS
                 HeartModel::GetInstance()->SetHeartCheckViewStatus(true);
                 // 播放检测界面动画
                 HeartCheckView::GetInstance()->GetImageAnimator()->Start();
-                HeartModel::GetInstance()->SetCheckStatus(true); // 开始检测
+                HeartModel::GetInstance()->Heart_Start(); // 开始检测
             }
         }
 
@@ -266,16 +278,15 @@ namespace OHOS
                 else
                 {
                     HeartView::GetInstance()->ChangeView(HEARTCHECKVIEW, HEARTVIEW);
+                    HeartView::GetInstance()->UpHeartText();
                 }
                 HeartModel::GetInstance()->SetHeartCheckViewStatus(false);
-                HeartModel::GetInstance()->SetCheckStatus(false); // 关闭检测
+                HeartModel::GetInstance()->Heart_Stop();
             }
-            uint16_t time = GetCurrentTime();
-            HeartModel::GetInstance()->SetCheckTime(time); // 更新时间
         }
         if (HeartModel::GetInstance()->GetHeartResultViewStaus() == true)
         {
-            HeartModel::GetInstance()->SetCheckStatus(false); // 关闭检测
+            HeartModel::GetInstance()->Heart_Stop();
         }
     }
     void HeartPresenter::Notify(void)
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartView.cpp
index f13f09e70..1480c11c2 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartView.cpp
@@ -7,12 +7,12 @@
 
 #include "heartrate/include/HeartView.h"
 #include "heartrate/include/HeartPresenter.h"
-#include "HeartModel.h"
+#include "heartrate/include/HeartModel.h"
 #include "displaybrightness/include/DisplayBrightnessModel.h"
 #include "power_display_service.h"
-#include "HeartBandoffView.h"
-#include "HeartCheckView.h"
-#include "HeartRateView.h"
+#include "heartrate/include/HeartBandoffView.h"
+#include "heartrate/include/HeartCheckView.h"
+#include "heartrate/include/HeartRateView.h"
 
 namespace OHOS
 {
@@ -82,15 +82,22 @@ namespace OHOS
     {
         // 更新血氧数据
         uint16_t heart_ = HeartModel::GetInstance()->GetHeartdata();
+        std::string heartStr;
+        std::string TimeStr;
         if (heart_ != 0) // 判断是否为默认数据
         {
-            std::string heartStr = std::to_string(heart_);
-            percent->SetText(heartStr.c_str());
+            heartStr = std::to_string(heart_);
+            // 更新时间
+            uint16_t time = HeartPresenter::GetInstance()->GetCurrentTime();
+            uint16_t check_time = HeartModel::GetInstance()->GetCheckTime();
+            TimeStr = HeartPresenter::GetInstance()->GetTDOA(time, check_time) + "检测";
         }
-        // 更新时间
-        uint16_t time = HeartPresenter::GetInstance()->GetCurrentTime();
-        uint16_t check_time = HeartModel::GetInstance()->GetCheckTime();
-        std::string TimeStr = HeartPresenter::GetInstance()->GetTDOA(time, check_time) + "检测";
+        else
+        {
+            heartStr = "--";
+            TimeStr = "暂无检测记录";
+        }
+        percent->SetText(heartStr.c_str());
         timeLabel->SetText(TimeStr.c_str());
     }
 
@@ -108,9 +115,6 @@ namespace OHOS
         percent->Resize(300, 250);                  // widget's width and height
         percent->SetViewId("label2");               // Set style
         percent->SetStyle(STYLE_TEXT_FONT, PERCENT_FONT_SIZE);
-        uint16_t heart_ = HeartModel::GetInstance()->GetHeartdata();
-        std::string heartStr = std::to_string(heart_);
-        percent->SetText(heartStr.c_str());
         percent->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
         percent->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         percent->SetRollSpeed(0);
@@ -127,12 +131,6 @@ namespace OHOS
         timeLabel->SetViewId("label1");                   // Set style
         timeLabel->SetStyle(STYLE_TEXT_FONT, TIMELABEL_FONT_SIZE);
         /* -------------------------------------------------------------------------- */
-        // 更新时间
-        uint16_t on_time = HeartPresenter::GetInstance()->GetCurrentTime();
-        uint16_t check_time = HeartModel::GetInstance()->GetCheckTime();
-        std::string TimeStr = HeartPresenter::GetInstance()->GetTDOA(on_time, check_time);
-        timeLabel->SetText(TimeStr.c_str());
-        /* -------------------------------------------------------------------------- */
         timeLabel->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
         timeLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         timeLabel->SetRollSpeed(0);
@@ -153,6 +151,27 @@ namespace OHOS
         titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         titleLabel->SetRollSpeed(0);
         titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, TITLE_FONT_SIZE);
+        /* -------------------------------------------------------------------------- */
+        uint16_t heart_ = HeartModel::GetInstance()->GetHeartdata();
+        std::string heartStr;
+        std::string TimeStr;
+        if (heart_ != 0) // 判断是否为默认数据
+        {
+            heartStr = std::to_string(heart_);
+            // 更新时间
+            uint16_t time = HeartPresenter::GetInstance()->GetCurrentTime();
+            uint16_t check_time = HeartModel::GetInstance()->GetCheckTime();
+            TimeStr = HeartPresenter::GetInstance()->GetTDOA(time, check_time) + "检测";
+        }
+        else
+        {
+            heartStr = "--";
+            TimeStr = "暂无检测记录";
+        }
+        percent->SetText(heartStr.c_str());
+
+        timeLabel->SetText(TimeStr.c_str());
+
         /* -------------------------------------------------------------------------- */
         return true;
     }
@@ -362,7 +381,6 @@ namespace OHOS
         HeartScrollView[showView]->SetVisible(true);
         Draw();
     }
-    /* -------------------------------------------------------------------------- */
     bool HeartView::SetOnDragListener()
     {
         UIView::OnDragListener *dragListener = (UIView::OnDragListener *)OHOS::HeartPresenter::GetInstance();
@@ -377,6 +395,7 @@ namespace OHOS
         return true;
     }
 
+    /* -------------------------------------------------------------------------- */
     void HeartView::OnStart()
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartView::OnStart");
@@ -398,12 +417,15 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HEARTVIEW:: OnSetUpView  has nullptr");
             return;
         }
+
         HeartScrollView[HEARTVIEW]->Add(imageViewMain);
         HeartScrollView[HEARTVIEW]->Add(percent);
         HeartScrollView[HEARTVIEW]->Add(timeLabel);
         HeartScrollView[HEARTVIEW]->Add(titleLabel);
         HeartScrollView[HEARTVIEW]->Add(testButton);
+
         RootView::GetInstance()->Add(HeartScrollView[HEARTVIEW]);
+
         Draw();
     }
 
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
index cf134e5c6..a05b1ab7f 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -312,7 +312,7 @@ namespace OHOS
         }
         else if (view_->GetHorCurrentPage() == BloodOxygen)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView");
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView");
             // BloodCardView::GetInstance()->UpSPO2data();
         }
     }
diff --git a/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp b/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
index 0681054cc..8b593c13c 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
@@ -199,7 +199,7 @@ namespace OHOS
         LoadAppMultiImages(DROPDOWN_IAMGES, DROPDOWN_BLUETOOTHCONNECTED, DROPDOWN_SETTING);
         LoadAppMultiImages(HEART_IAMGES, HEART_HEARTRATECOOR, HEART_HEARTRATE_TOP);
         LoadAppMultiImages(BLOOD_IAMGES, BLOODOXYGEN_BACKGOUND, BLOODOXYGEN_BACKGOUND);
-        //LoadAppMultiImages(TRAINING_IAMGES, TRAINING_BOUTTONGROUND, TRAINING_WALKING_BIG);
+        LoadAppMultiImages(TRAINING_IAMGES, TRAINING_BOUTTONGROUND, TRAINING_WALKING_BIG);
         LoadAppMultiImages(MESSAGE_IAMGES, MESSAGE_MESSAGE, MESSAGE_WECHAT);
     }
 }
diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index e488e3ced..5f33e6548 100755
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@ -260,24 +260,12 @@ void MsgCenterNotifyCardhProc(const Topic topic, Request* req)
 {
     unused(topic);
     unused(req);
-    // if (topic == TOPIC_EVENT_SPO2_UPDATE && req != nullptr && req->data != nullptr)
-    // {
-    //     u_int8_t sp02 = *((u_int8_t*)(req->data)); // 进行类型转换
-    //     DialModelSPO2::GetInstance()->UpdateSPO2(sp02);
-    //     BloodOxygenModel::GetInstance()->UpSPO2data(sp02);
-    // }
 }
 
 void MsgCenterNotifyleaklighthProc(const Topic topic, Request* req)
 {
     unused(topic);
     unused(req);
-    // if (topic == TOPIC_EVENT_SPO2_UPDATE && req != nullptr && req->data != nullptr)
-    // {
-    //     u_int8_t sp02 = *((u_int8_t*)(req->data)); // 进行类型转换
-    //     DialModelSPO2::GetInstance()->UpdateSPO2(sp02);
-    //     BloodOxygenModel::GetInstance()->UpSPO2data(sp02);
-    // }
 }
 
 //穿戴状态
@@ -288,7 +276,7 @@ void MsgCenterNotifyWearStateProc(const Topic topic, Request* req)
     if ( topic == TOPIC_EVENT_WEARSTATE_UPDATE)
     {
         int32_t wear = *((int32_t*)(req->data)); // 进行类型转换
-        
+
         BloodOxygenModel::GetInstance()->SetWearStatus(wear);
         HeartModel::GetInstance()->SetWearStatus(wear);
     }
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Blood/BloodOxygen.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/BloodOxygen.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Blood/BloodOxygen.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/BloodOxygen.bin
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/Message.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Message.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/message/Message.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Message.bin
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/Training.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Training.bin
similarity index 99%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/Training.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Training.bin
index 63c845a13..d7b3459af 100644
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/Training.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Training.bin differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/ConfigModel.json b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/ConfigModel.json
new file mode 100644
index 000000000..957f11962
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/ConfigModel.json
@@ -0,0 +1,8 @@
+{
+    "RaiseToBrightnessCheckBoxButtonState": false,
+    "ScreenBrightnessValue": 255,
+    "ScreenDurationRadioButtonSlectValue": 1,
+    "TradionalBlueToothToggleButtonState": false,
+    "HeartRateOrBloodOxygenQuickAccessSwitch": 0,
+    "Dial_Id":0
+}
\ No newline at end of file