From 57abe79ca6a89bd12a3fb9a60fcd536b143150ab Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Sat, 14 Sep 2024 21:58:53 +0800
Subject: [PATCH] =?utf8?q?=E5=BF=83=E7=8E=87=EF=BC=9A=E4=BD=BF=E7=94=A8?=
 =?utf8?q?=E5=9B=BE=E7=89=87icon=E6=9B=BF=E6=8D=A2=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../heartrate/include/HeartChartView.h        |  1 +
 .../nativeui/heartrate/src/HeartChartView.cpp | 61 +++++++++++--------
 .../nativeui/main/include/MainViewSample.h    |  2 +-
 .../nativeui/main/src/MainViewSample.cpp      |  2 +-
 4 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartChartView.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartChartView.h
index 4430a2323..ae4c9691b 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartChartView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartChartView.h
@@ -85,6 +85,7 @@ private:
   UILabelExt *lastheart_{nullptr};
   UILabelExt *minheart_{nullptr};
   UILabelExt *maxheart_{nullptr};
+  
   UILabelExt *maxheart_dynamic_{nullptr};
   UILabelExt *maxheart_dynamic_3_{nullptr};
   UILabelExt *maxheart_dynamic_2_{nullptr};
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
index aaf879613..7b2663177 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
@@ -162,42 +162,51 @@ HeartChartView::HeartChartView() {
 HeartChartView::~HeartChartView() {
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartChartView::~HeartChartView");
 
-  imageAnimator->Stop();
-  heartchart->ClearDataSerial();
-  delete heartSerial;
-  heartSerial = nullptr;
+  /*
+    UIViewGroup *tmpGroup = dynamic_cast<UIViewGroup *>(container_);
+    UIViewGroup::RemoveAndDeleteAllRecursively(tmpGroup);
+  */
 
-  UIViewGroup *tmpGroup = dynamic_cast<UIViewGroup *>(container_);
-  UIViewGroup::RemoveAndDeleteAllRecursively(tmpGroup);
-
-#if 0
   delete displayheart_;
   displayheart_ = nullptr;
   delete maxheart_;
   maxheart_ = nullptr;
   delete minheart_;
   minheart_ = nullptr;
-  delete UHeartText;
-  UHeartText = nullptr;
-  delete RestHeartText;
-  RestHeartText = nullptr;
-  delete TopimageView;
-  TopimageView = nullptr;
-  delete BottomimageView;
-  BottomimageView = nullptr;
-  delete CoordinateimageView;
-  CoordinateimageView = nullptr;
-  delete HeartIconView;
-  HeartIconView = nullptr;
-  delete imageAnimator;
-  imageAnimator = nullptr;
+  delete uheart_;
+  uheart_ = nullptr;
+  delete lastheart_;
+  lastheart_ = nullptr;
+  delete maxheart_dynamic_;
+  maxheart_dynamic_ = nullptr;
+  delete maxheart_dynamic_3_;
+  maxheart_dynamic_3_ = nullptr;
+  delete maxheart_dynamic_2_;
+  maxheart_dynamic_2_ = nullptr;
+  delete maxheart_dynamic_1_;
+  maxheart_dynamic_1_ = nullptr;
+  delete minheart_dynamic_;
+  minheart_dynamic_ = nullptr;
+
+  delete maxRateIconView_;
+  maxRateIconView_ = nullptr;
+  delete minRateIconView_;
+  minRateIconView_ = nullptr;
+  delete chartBackgroundView_;
+  chartBackgroundView_ = nullptr;
+  delete heartIconView_;
+  heartIconView_ = nullptr;
+
+  // imageAnimator->Stop();
+  // delete imageAnimator;
+  // imageAnimator = nullptr;
 
   heartchart->ClearDataSerial();
   delete heartSerial;
   heartSerial = nullptr;
   delete heartchart;
   heartchart = nullptr;
-#endif
+
   g_pHeartCheckView = this;
 }
 HeartChartView *HeartChartView::GetInstance(void) { return g_pHeartCheckView; }
@@ -471,7 +480,7 @@ void HeartChartView::InitChartImageView() {
   container_->Add(chartBackgroundView_);
   container_->Add(minRateIconView_);
   container_->Add(maxRateIconView_);
-#if 0
+
   if (heartIconView_ == nullptr) {
     heartIconView_ = new UIImageView();
   }
@@ -482,7 +491,7 @@ void HeartChartView::InitChartImageView() {
 
   container_->Add(heartIconView_);
   heartIconView_->SetVisible(true);
-
+#if 0
   if (lineView_ == nullptr) {
     lineView_ = new UIImageView();
   }
@@ -550,7 +559,7 @@ UIViewGroup *HeartChartView::GetchartGroup() {
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
                   "HeartChartView::InitHeartView fail");
   }
-  HeartImageAnimator();
+  // HeartImageAnimator(); 暂时屏蔽
   InitChartView();
   UpdateChartConfig();
   SetDataChart();
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
index 1884e7dda..904ec7d3c 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
@@ -108,7 +108,7 @@ namespace OHOS
         PlayersView *playersView{nullptr};
         CompassControlView *compassControlView{nullptr};
 
-        HeartRateView *heartRateView{nullptr};
+        HeartRateCardView *heartRateView{nullptr};
         BloodCardView *bloodView{nullptr};
         SleepCardView *sleepView{nullptr};
         Training_CardView *traingView{nullptr};
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
index cb5f59948..52bd08867 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@ -540,7 +540,7 @@ namespace OHOS
     UICardPage *MainViewSample::InitHeartRatePage(void)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitHeartRatePage");
-        heartRateView = new HeartRateView();
+        heartRateView = new HeartRateCardView();
         if (heartRateView == nullptr)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateView new fail");
-- 
2.17.1