From: Caisking <3449750381@qq.com>
Date: Wed, 17 Apr 2024 08:41:02 +0000 (+0800)
Subject: 删除训练强度介绍Slice
X-Git-Tag: release_V1.2.70_20241020_135402~1174^2~9
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=d04c91df66ad6cd4e287198e9f0952b0edefbf48;p=mirrors%2FFD230.git

删除训练强度介绍Slice
---

diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt
index 296af741f..bdad07ba9 100644
--- a/code/sdk/application/wearable/fd230app/CMakeLists.txt
+++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt
@@ -486,8 +486,6 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingEnddataPresenter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingWinView.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingWinPresenter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingStrongView.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingStrongPresenter.cpp
 
     #主界面训练卡片
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_card/src/Training_CardView.cpp
diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
index 2b15b1143..40775edee 100644
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
@@ -80,7 +80,6 @@ typedef enum : uint16_t
     VIEW_TRAININGSETSTEP,   // 设置训练步数
     VIEW_TRAININGCRAD,      // 训练控制卡片
     VIEW_TRAININGENDDATA,   // 训练结束详细数据
-    VIEW_TRAININGSTRONG,    // 训练强度介绍
     VIEW_TRAININGWIN,       // 目标达成
     VIEW_TRAINING_RECORD,   // 训练记录
     /* ---------------------------------- 训练列表 ---------------------------------- */
diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
index 9acbadc10..78c260bce 100644
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
@@ -67,7 +67,6 @@ namespace OHOS
         void InitTraingSlice(void);
         void InitTraingNomalSlice(void);
         void InitTraingSetSlice(void);
-        void InitTraingStrongSlice(void);
         void InitTraingSetTimeSlice(void);
         void InitTraingSetCaluliSlice(void);
         void InitTraingSetDistSlice(void);
diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 06c335005..8abf4e203 100644
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -173,8 +173,6 @@
 #include "traing/include/TraingSetSeptView.h"
 #include "traing/include/TraingEnddataPresenter.h"
 #include "traing/include/TraingEnddataView.h"
-#include "traing/include/TraingStrongPresenter.h"
-#include "traing/include/TraingStrongView.h"
 #include "traing/include/TraingWinPresenter.h"
 #include "traing/include/TraingWinView.h"
 /* ---------------------------------- GPS训练 --------------------------------- */
@@ -315,7 +313,6 @@ namespace OHOS
         {VIEW_TRAININGGPS, &NativeLauncher::InitTraingGPSSlice},         // GPS训练
         {VIEW_TRAININGGPSLACK, &NativeLauncher::InitTraingGPSlackSlice}, // GPS缺少
         {VIEW_TRAININGGPSNOTE, &NativeLauncher::InitTraingGPSnoteSlice}, // 提醒连接GPS
-        {VIEW_TRAININGSTRONG, &NativeLauncher::InitTraingStrongSlice},   // 训练强度介绍
         {VIEW_TRAININGGPSLOST, &NativeLauncher::InitTraingGPSlostSlice}, // GPS断联
         {VIEW_TRAININGGPSBACK, &NativeLauncher::InitTraingGPSbackSlice}, // GPS回连
 
@@ -956,11 +953,6 @@ namespace OHOS
         SliceProxy *traingGPSnoteview = new AbilitySliceProxy<TraingGPSnoteView, TraingGPSnotePresenter>;
         NativeAbility::GetInstance().AddSliceProxy(VIEW_TRAININGGPSNOTE, traingGPSnoteview);
     }
-    void NativeLauncher::InitTraingStrongSlice(void)
-    {
-        SliceProxy *traingStrongview = new AbilitySliceProxy<TraingStrongView, TraingStrongPresenter>;
-        NativeAbility::GetInstance().AddSliceProxy(VIEW_TRAININGSTRONG, traingStrongview);
-    }
     void NativeLauncher::InitTraingGPSlostSlice(void)
     {
         SliceProxy *traingGPSlostview = new AbilitySliceProxy<TraingGPSlostView, TraingGPSlostPresenter>;
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
index 629fb9b6d..f37743c69 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
@@ -155,6 +155,7 @@ namespace OHOS
         int steps;                // 训练步数
         int distance;             // 训练距离
         int intensity;            // 训练强度 (0：较低强度 1：中等强度 2：高等强度 3：超高强度)
+        int heart;                // 运动心率
         int avgheart;             // 训练平均心率
         std::string start_date;   // 训练开始日期
         std::string start_time;   // 训练开始时间
@@ -172,6 +173,7 @@ namespace OHOS
             steps = 0;
             distance = 0;
             intensity = 1;
+            heart = 0;
             avgheart = 0;
             start_date = nullptr;
             start_time = nullptr;
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
index 7b2c17f21..55d7feb18 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
@@ -1,3 +1,9 @@
+/***
+ * @Date: 2024-04-15 10:55:58
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-04-17 16:29:01
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
+ */
 #ifndef _TraingSet_VIEW_H
 #define _TraingSet_VIEW_H
 
@@ -41,7 +47,7 @@ namespace OHOS
         void OnStop() override;
         void InitView();
         void DeInit();
-       
+
         void InitList();
         void PreLoad(void);
 
@@ -52,19 +58,17 @@ namespace OHOS
 
         UIViewGroup *container_ = nullptr;
 
-        UILabelExt *label1_ = nullptr;
-        UILabelExt *label2_ = nullptr;
-        UILabelExt *label3_ = nullptr;
-        UILabelExt *label4_ = nullptr;
-        UILabelExt *label5_ = nullptr;
+        UILabelExt *labeltitle = nullptr;
+        UILabelExt *labeltime = nullptr;
+        UILabelExt *labelKcal = nullptr;
 
-        UIImageView *image1_ = nullptr;
-        UIImageView *image2_ = nullptr;
-        UIImageView *image3_ = nullptr;
-        UIImageView *image4_ = nullptr;
+        UIImageView *imagetime = nullptr;
+        UIImageView *imagcal = nullptr;
+        UIImageView *imagicon1 = nullptr;
+        UIImageView *imagico2 = nullptr;
 
-        UIButton *button1_ = nullptr;
-        UIButton *button2_ = nullptr;
+        UIButton *butTime = nullptr;
+        UIButton *butKcal = nullptr;
 
         bool viewiInitStatus{false};
     };
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingStrongPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingStrongPresenter.h
deleted file mode 100644
index d3122e39c..000000000
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingStrongPresenter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
-#ifndef _TraingStrong_PRESENTER_H
-#define _TraingStrong_PRESENTER_H
-
-#include "Presenter.h"
-#include "TraingStrongView.h"
-
-namespace OHOS
-{
-    class TraingStrongView;
-
-    class TraingStrongPresenter : public Presenter<TraingStrongView>,
-                                 public UIView::OnClickListener,
-                                 public UIView::OnDragListener
-    {
-    public:
-        TraingStrongPresenter();
-        virtual ~TraingStrongPresenter();
-
-        void OnStart() override;
-        void OnPause() override;
-        void OnResume() override;
-        void OnStop() override;
-
-        static TraingStrongPresenter *GetInstance();
-
-    private:
-        // 因为继承了OnClickListener，所以有OnClick属性，至于参数,原函数也这样直接继承;
-        bool OnClick(UIView &view, const ClickEvent &event) override;
-        bool OnDrag(UIView &view, const DragEvent &event) override;
-        bool OnDragEnd(UIView& view, const DragEvent& event) override;
-
-    };
-} // namespace OHOS
-
-#endif // SLEEPDETAIL_PRESENTER_H
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingStrongView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingStrongView.h
deleted file mode 100644
index c3f66a355..000000000
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingStrongView.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef _TraingStrong_VIEW_H
-#define _TraingStrong_VIEW_H
-
-#include "BaseView.h"
-#include "View.h"
-#include <ui_scroll_view.h>
-#include "components/ui_view_group.h"
-#include "components/ui_label.h"
-#include "components/ui_label_ext.h"
-#include "components/ui_image_view.h"
-#include "components/ui_button.h"
-#include "components/ui_image_animator.h"
-#include "components/ui_label_button_ext.h"
-#include "components/ui_chart.h"
-#include "components/ui_list.h"
-#include "components/icon_adapter.h"
-#include "wearable_log.h"
-#include "ohos_types.h"
-#include "components/ui_card_page.h"
-#include "traing/include/TraingModel.h"
-#include "traing/Training_UiConfig.h"
-
-#include "TraingStrongPresenter.h"
-namespace OHOS
-{
-#define BUTTONNO "button1"
-#define BUTTONYES "button2"
-
-    class TraingStrongPresenter;
-    class TraingStrongView : public View<TraingStrongPresenter>
-    {
-
-    public:
-        TraingStrongView();
-        virtual ~TraingStrongView();
-        static TraingStrongView *GetInstance(void);
-
-        void OnStart() override;
-        void OnSetUpView() override;
-        void OnTearDownView() override;
-        void OnStop() override;
-        void InitView();
-        void DeInit();
-       
-        void InitList();
-        void PreLoad(void);
-
-        // 通过函数改变
-        void SetLabel();
-        void SetButton();
-
-    private:
-        UIView::OnDragListener *draglistener{nullptr};
-        TraingStrongView(TraingStrongView &&) = delete;
-        TraingStrongView &operator=(TraingStrongView &&) = delete;
-
-        UIViewGroup *container_ = nullptr;
-        UIScrollView *scrollView1_ = nullptr;
-
-        UILabelExt *label1_ = nullptr;
-        UILabelExt *label2_ = nullptr;
-        UILabelExt *label3_ = nullptr;
-        UILabelExt *label4_ = nullptr;
-        UILabelExt *label5_ = nullptr;
-        UILabelExt *label6_ = nullptr;
-
-        UIImageView *image1_ = nullptr;
-        UIImageView *image2_ = nullptr;
-        UIImageView *image3_ = nullptr;
-        UIImageView *image4_ = nullptr;
-        UIImageView *image5_ = nullptr;
-        bool viewiInitStatus{false};
-    };
-} // namespace OHOS
-#endif // TraingStrong_PRESENTER_H
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
index e4b2ef04b..d15c3ab8a 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
@@ -44,110 +44,96 @@ namespace OHOS
         }
 
         //  初始化Button
-        TraingModel::GetInstance()->InitButton(button1_, 43, 120, 380, 100, BUTTONTIME);
-        TraingModel::GetInstance()->InitButton(button2_, 43, 240, 380, 100, BUTTONCALULI);
-        button1_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));
-        button2_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));
-        container_->Add(button1_);
-        container_->Add(button2_);
+        TraingModel::GetInstance()->InitButton(butTime, 43, 120, 380, 100, BUTTONTIME);
+        TraingModel::GetInstance()->InitButton(butKcal, 43, 240, 380, 100, BUTTONCALULI);
+        butTime->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));
+        butKcal->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));
+        container_->Add(butTime);
+        container_->Add(butKcal);
 
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabel(label1_, 173, 52, 120, 35, "label1", "极限运动", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(label2_, 130, 150, 60, 35, "label2", "时长", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(label3_, 270, 155, 69, 23, "label3", "30 分钟", DEFAULT_VECTOR_FONT_FILENAME, 20);
-        TraingModel::GetInstance()->InitLabel(label4_, 130, 270, 60, 35, "label4", "卡路里", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(label5_, 270, 275, 60, 35, "label5", "1000 千卡", DEFAULT_VECTOR_FONT_FILENAME, 20);
-
-        container_->Add(label1_);
-        container_->Add(label2_);
-        container_->Add(label3_);
-        container_->Add(label4_);
-        container_->Add(label5_);
+        UIResourceTextId sportid = TraingModel::GetInstance()->GetSportEvent();
+        TraingModel::GetInstance()->InitLabelExt(labeltitle, 173, 52, 120, 35, "label1", sportid, DEFAULT_VECTOR_FONT_FILENAME, 30);
+
+        TraingModel::GetInstance()->InitLabel(labeltime, 130, 150, 60, 35, "label2", "时长", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        TraingModel::GetInstance()->InitLabel(labelKcal, 130, 270, 60, 35, "label4", "卡路里", DEFAULT_VECTOR_FONT_FILENAME, 30);
+
+        container_->Add(labeltitle);
+        container_->Add(labeltime);
+        container_->Add(labelKcal);
+
 
         // 初始化Image
-        TraingModel::GetInstance()->InitImageView(image1_, 70, 150, 100, 100, "image1", TIME_IMAGE);
-        TraingModel::GetInstance()->InitImageView(image2_, 70, 270, 100, 100, "image2", CALORIES_IMAGE);
-        TraingModel::GetInstance()->InitImageView(image3_, 380, 160, 100, 100, "image3", ICON_IMAGE);
-        TraingModel::GetInstance()->InitImageView(image4_, 380, 280, 100, 100, "image4", ICON_IMAGE);
-        container_->Add(image1_);
-        container_->Add(image2_);
-        container_->Add(image3_);
-        container_->Add(image4_);
+        TraingModel::GetInstance()->InitImageView(imagetime, 70, 150, 100, 100, "image1", TIME_IMAGE);
+        TraingModel::GetInstance()->InitImageView(imagcal, 70, 270, 100, 100, "image2", CALORIES_IMAGE);
+
+        TraingModel::GetInstance()->InitImageView(imagicon1, 380, 160, 100, 100, "image3", ICON_IMAGE);
+        TraingModel::GetInstance()->InitImageView(imagico2, 380, 280, 100, 100, "image4", ICON_IMAGE);
+        container_->Add(imagetime);
+        container_->Add(imagcal);
+        container_->Add(imagicon1);
+        container_->Add(imagico2);
     }
     /* DeInit：删除组件 */
     void TraingSetView::DeInit()
     {
         container_->RemoveAll();
         // 删除Label
-        if (label1_ != nullptr)
-        {
-            container_->Remove(label1_);
-            delete label1_;
-            label1_ = nullptr;
-        }
-        if (label2_ != nullptr)
+        if (labeltitle != nullptr)
         {
-            container_->Remove(label2_);
-            delete label2_;
-            label2_ = nullptr;
+            container_->Remove(labeltitle);
+            delete labeltitle;
+            labeltitle = nullptr;
         }
-        if (label3_ != nullptr)
+        if (labeltime != nullptr)
         {
-            container_->Remove(label3_);
-            delete label3_;
-            label3_ = nullptr;
+            container_->Remove(labeltime);
+            delete labeltime;
+            labeltime = nullptr;
         }
-        if (label4_ != nullptr)
+        if (labelKcal != nullptr)
         {
-            container_->Remove(label4_);
-            delete label4_;
-            label4_ = nullptr;
+            container_->Remove(labelKcal);
+            delete labelKcal;
+            labelKcal = nullptr;
         }
-        if (label5_ != nullptr)
-        {
-            container_->Remove(label5_);
-            delete label5_;
-            label5_ = nullptr;
-        }
-
         // 删除Button
-        if (button1_ != nullptr)
+        if (butTime != nullptr)
         {
-            container_->Remove(button1_);
-            delete button1_;
-            button1_ = nullptr;
+            container_->Remove(butTime);
+            delete butTime;
+            butTime = nullptr;
         }
-        if (button2_ != nullptr)
+        if (butKcal != nullptr)
         {
-            container_->Remove(button2_);
-            delete button2_;
-            button2_ = nullptr;
+            container_->Remove(butKcal);
+            delete butKcal;
+            butKcal = nullptr;
         }
-
         // 删除Image
-        if (image1_ != nullptr)
+        if (imagetime != nullptr)
         {
-            container_->Remove(image1_);
-            delete image1_;
-            image1_ = nullptr;
+            container_->Remove(imagetime);
+            delete imagetime;
+            imagetime = nullptr;
         }
-        if (image2_ != nullptr)
+        if (imagcal != nullptr)
         {
-            container_->Remove(image2_);
-            delete image2_;
-            image2_ = nullptr;
+            container_->Remove(imagcal);
+            delete imagcal;
+            imagcal = nullptr;
         }
-        if (image3_ != nullptr)
+        if (imagicon1 != nullptr)
         {
-            container_->Remove(image3_);
-            delete image3_;
-            image3_ = nullptr;
+            container_->Remove(imagicon1);
+            delete imagicon1;
+            imagicon1 = nullptr;
         }
-        if (image4_ != nullptr)
+        if (imagico2 != nullptr)
         {
-            container_->Remove(image4_);
-            delete image4_;
-            image4_ = nullptr;
+            container_->Remove(imagico2);
+            delete imagico2;
+            imagico2 = nullptr;
         }
 
         // 删除容器
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongPresenter.cpp
deleted file mode 100644
index 352bca480..000000000
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongPresenter.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-
-#include "AppViewIDs.h"
-#include "components/ui_label_ext.h"
-#include"language/font/ui_resource_string.h"
-#include "NativeAbility.h"
-
-#include <iostream>
-#include <chrono>
-#include <thread>
-#include "traing/include/TraingStrongPresenter.h"
-// #include "TraingStrongView.h"
-
-namespace OHOS
-{
-
-    // 当前Presenter属性实例化的内存指针
-    static TraingStrongPresenter *g_pTraingStrongPresenter = nullptr;
-
-    TraingStrongPresenter::TraingStrongPresenter()
-    {
-
-        g_pTraingStrongPresenter = this;
-    }
-
-    TraingStrongPresenter::~TraingStrongPresenter()
-    {
-
-        g_pTraingStrongPresenter = nullptr;
-    }
-
-    TraingStrongPresenter *TraingStrongPresenter::GetInstance()
-    {
-
-        return g_pTraingStrongPresenter;
-    }
-
-    void TraingStrongPresenter::OnStart()
-    {
-
-        Presenter<TraingStrongView>::OnStart();
-    }
-
-    void TraingStrongPresenter::OnPause(void)
-    {
-
-        Presenter<TraingStrongView>::OnPause();
-    }
-
-    void TraingStrongPresenter::OnResume(void)
-    {
-
-        Presenter<TraingStrongView>::OnResume();
-    }
-
-    void TraingStrongPresenter::OnStop(void)
-    {
-
-        Presenter<TraingStrongView>::OnStop();
-    }
-    bool TraingStrongPresenter::OnDrag(UIView &view, const DragEvent &event)
-    {
-        return true;
-    }
-    bool TraingStrongPresenter::OnDragEnd(UIView &view, const DragEvent &event)
-    {
-
-        if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)
-        {
-           // NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGDATA);
-        }
-        UNUSED(view);
-        return true;
-    }
-
-    bool TraingStrongPresenter::OnClick(UIView &view, const ClickEvent &event)
-    {
-        // 根据控件id查找是哪个控件触发了点击回调
-        if (strcmp(view.GetViewId(), "Remind") == 0)
-        {
-            // 模拟心率监测，等待20秒
-            // std::this_thread::sleep_for(std::chrono::seconds(20));
-            // NativeAbility::GetInstance().ChangeSlice(VIEW_TraingStrongREMIND);
-        }
-        return true;
-    }
-}
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp
deleted file mode 100644
index 6b3343e8b..000000000
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-
-#include "traing/include/TraingStrongView.h"
-
-#include "common/image_cache_manager.h"
-#include "components/ui_label_ext.h"
-#include "language/font/ui_resource_string.h"
-#include "UiConfig.h"
-#include "ui_resource_image.h"
-#include <ui_scroll_view.h>
-#include "components/ui_button.h"
-#include "traing/include/TraingModel.h"
-#include "traing/Training_UiConfig.h"
-
-namespace OHOS
-{
-
-    static TraingStrongView *g_pTraingStrongView{nullptr};
-
-    TraingStrongView::TraingStrongView()
-    {
-        g_pTraingStrongView = this;
-    }
-
-    TraingStrongView::~TraingStrongView()
-    {
-        DeInit();
-        g_pTraingStrongView = nullptr;
-    }
-
-    TraingStrongView *TraingStrongView::GetInstance()
-    {
-
-        return g_pTraingStrongView;
-    }
-
-    /* InitView:初始化界面*/
-    void TraingStrongView ::InitView()
-    {
-        if (container_ == nullptr)
-        {
-            container_ = new UIViewGroup();
-            container_->SetPosition(0, 0, 466, 466);
-            container_->SetStyle(STYLE_BACKGROUND_OPA, 0);
-        }
-        // Add ScrollView to App
-        if (scrollView1_ == nullptr)
-        {
-            scrollView1_ = new UIScrollView();
-        }
-        scrollView1_->SetPosition(0, 0);        // widget's left position and top position
-        scrollView1_->Resize(466, 466);         // widget's width and height
-        scrollView1_->SetViewId("scrollView1"); // Set style
-        scrollView1_->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
-        scrollView1_->SetReboundSize(100);
-        scrollView1_->SetScrollBlankSize(52);
-        scrollView1_->SetHorizontalScrollState(false);
-        // Set additional property
-        // Add to rootView
-        container_->Add(scrollView1_);
-        scrollView1_->SetVisible(true);
-
-        // 初始化Lable
-        TraingModel::GetInstance()->InitLabel(label1_, 52, 173, 120, 35, "label1", "训练强度", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(label2_, 133, 33, 60, 35, "label2", "训练强度用于判断是否训练不足或\n者训练太过，到底使心率增加多少\n的运动强度才是最合适的。", DEFAULT_VECTOR_FONT_FILENAME, 26);
-        TraingModel::GetInstance()->InitLabel(label3_, 305, 33, 69, 23, "label3", "该强度区间是对应靶心率（由个人\n基本资料计算得出）强弱的实时状\n态显示，有助于提高训练质量。", DEFAULT_VECTOR_FONT_FILENAME, 26);
-        TraingModel::GetInstance()->InitLabel(label4_, 465, 33, 60, 35, "label4", "训练状态代表的意义：", DEFAULT_VECTOR_FONT_FILENAME, 26);
-        TraingModel::GetInstance()->InitLabel(label5_, 505, 97, 60, 35, "label5", "较低强度-热身运动\n中等强度-燃脂区\n高等强度-提升心肺机能\n超高强度-专业运动员", DEFAULT_VECTOR_FONT_FILENAME, 26);
-        TraingModel::GetInstance()->InitLabel(label6_, 740, 51, 60, 35, "label5", "注：该训练强度并非专业运动评\n估，数据仅供参考。", DEFAULT_VECTOR_FONT_FILENAME, 26);
-        label6_->SetTextColor(Color::GetColorFromRGBA(0xff, 0x8a, 0x36, 0xff));
-        scrollView1_->Add(label1_);
-        scrollView1_->Add(label2_);
-        scrollView1_->Add(label3_);
-        scrollView1_->Add(label4_);
-        scrollView1_->Add(label5_);
-        scrollView1_->Add(label6_);
-
-        // 初始化Image
-        TraingModel::GetInstance()->InitImageView(image1_, 510, 60, 100, 100, "image1", POINT_BLUE_IMAGE);
-        TraingModel::GetInstance()->InitImageView(image2_, 550, 60, 100, 100, "image2", POINT_GREEN_IMAGE);
-        TraingModel::GetInstance()->InitImageView(image3_, 590, 60, 100, 100, "image3", POINT_ORANGE_IMAGE);
-        TraingModel::GetInstance()->InitImageView(image4_, 630, 60, 100, 100, "image4", POINT_YELLOW_IMAGE);
-        scrollView1_->Add(image1_);
-        scrollView1_->Add(image2_);
-        scrollView1_->Add(image3_);
-        scrollView1_->Add(image4_);
-
-        // Add ImageView to App
-        if (image5_ == nullptr)
-        {
-            image5_ = new UIImageView();
-        }
-        image5_->SetPosition(183, 813); // widget's left position and top position
-        image5_->Resize(100, 100);      // widget's width and height
-        image5_->SetViewId("image3");   // Set style
-        // Set additional property
-        // Add to scrollView2
-        scrollView1_->Add(image5_);
-        image5_->SetVisible(true);
-    }
-    /* DeInit：删除组件 */
-    void TraingStrongView::DeInit()
-    {
-        container_->RemoveAll();
-        UIView *view = static_cast<UIViewGroup *>(container_)->GetChildrenHead();
-        while (view != nullptr)
-        {
-            UIView *tempView = view;
-            view = view->GetNextSibling();
-            if (tempView->GetParent())
-            {
-                static_cast<UIViewGroup *>(tempView->GetParent())->Remove(tempView);
-            }
-            delete tempView;
-        }
-        delete container_;
-        container_ = nullptr;
-    }
-
-    void TraingStrongView::PreLoad(void)
-    {
-        if (!viewiInitStatus)
-        {
-            InitView();
-            viewiInitStatus = true;
-        }
-    }
-    void TraingStrongView::OnStart()
-    {
-        container_ = new UIViewGroup();
-        if (container_ == nullptr)
-        {
-            return;
-        }
-        container_->SetPosition(0, 0);
-        container_->SetWidth(Screen::GetInstance().GetWidth());
-        container_->SetHeight(Screen::GetInstance().GetHeight());
-
-        // 创建 draglistener 实例并设置为拖动监听器
-        UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(TraingStrongPresenter::GetInstance());
-        if (draglistener == nullptr)
-        {
-            return;
-        }
-        container_->SetOnDragListener(draglistener);
-
-        container_->SetTouchable(true);
-        container_->SetDraggable(true);
-
-        PreLoad();
-        RootView::GetInstance()->Add(container_);
-    }
-
-    void TraingStrongView::OnSetUpView()
-    {
-
-        View<TraingStrongPresenter>::OnSetUpView();
-        Draw();
-    }
-
-    void TraingStrongView::OnTearDownView()
-    {
-
-        View<TraingStrongPresenter>::OnTearDownView();
-        return;
-    }
-
-    void TraingStrongView::OnStop()
-    {
-        View<TraingStrongPresenter>::OnStop();
-        RootView::GetInstance()->RemoveAll();
-        return;
-    }
-}
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingWinView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingWinView.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
index 6039afc2d..1e6518452 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@ -188,7 +188,7 @@ namespace OHOS
         std::string stepsStr = (sportdata->steps != 0) ? std::to_string(sportdata->steps) : "--";
         std::string calorieStr = (sportdata->calories != 0) ? std::to_string(sportdata->calories) : "--";
 
-        TrainingDataView::GetInstance()->GetHeartLabel()->SetText(hal_gpio_ctrl_id_t.c_str());
+        TrainingDataView::GetInstance()->GetHeartLabel()->SetText(heartStr.c_str());
 
         TrainingDetailView::GetInstance()->GetCalorieLabel()->SetText(calorieStr.c_str());
         TrainingDetailView::GetInstance()->GetMileLabel()->SetText(distanceStr.c_str());
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingWinView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingWinView.cpp
new file mode 100644
index 000000000..e69de29bb