From: Caisking <3449750381@qq.com>
Date: Mon, 29 Apr 2024 07:06:41 +0000 (+0800)
Subject: 删除不必要的文件
X-Git-Tag: release_V1.2.70_20241020_135402~1025^2~51
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=f74f190ce33dc22676c0634d664274f02942b0f6;p=mirrors%2FFD230.git

删除不必要的文件
---

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 44fd89f69..ebd6c1588 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
@@ -198,6 +198,12 @@ namespace OHOS
         {
             distanceStr = DEFAULT_DASH;
         }
+        // 达到最高心率进行心率提醒弹窗
+        if (sportdata->heart >= 80)
+        // ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_TRAINING_HEART_MAX))
+        {
+            TraingCardView::GetInstance()->SetPopupViewStatus(HeartPopup, true);
+        }
         // std::string durationStr = std::to_string(sportdata->duration);
         std::string heartStr = (sportdata->heart != 0) ? std::to_string(sportdata->heart) : DEFAULT_DASH;
         std::string stepsStr = (sportdata->steps != 0) ? std::to_string(sportdata->steps) : DEFAULT_DASH;
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
index d88771156..d66ea0eab 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
@@ -16,6 +16,7 @@
 
 #include "traing/include/TraingModel.h"
 #include "uicomponents/UIComponents.h"
+#include "config/include/ConfigModel.h"
 #include "custom_utils.h"
 
 extern "C"
@@ -74,8 +75,10 @@ namespace OHOS
         swipe_->HorAdd(ControlView);
         swipe_->HorAdd(DataVIew);
         swipe_->HorAdd(MusicView);
+
         ShowEndView();
         ShowGetTagView();
+        ShowHeartView();
         // swipe_->HorAdd(DetailView);
 
         swipe_->VerAdd(DetailView, UICrossView::VPage::DOWN_PAGE);
@@ -125,6 +128,13 @@ namespace OHOS
             delete getView;
             getView = nullptr;
         }
+        if (heartView != nullptr)
+        {
+            heartView->RemoveAll();
+            delete heartView;
+            heartView = nullptr;
+        }
+
         /*标签*/
         if (endtitle != nullptr)
         {
@@ -161,6 +171,22 @@ namespace OHOS
             delete labelpre;
             labelpre = nullptr;
         }
+        if (hearttitle != nullptr)
+        {
+            delete hearttitle;
+            hearttitle = nullptr;
+        }
+        if (labelnote != nullptr)
+        {
+            delete labelnote;
+            labelnote = nullptr;
+        }
+        /*图片*/
+        if (heartiamge != nullptr)
+        {
+            delete heartiamge;
+            heartiamge = nullptr;
+        }
         /*按键*/
         if (exit != nullptr)
         {
@@ -177,6 +203,11 @@ namespace OHOS
             delete buttonok_;
             buttonok_ = nullptr;
         }
+        if (buttonnote_ != nullptr)
+        {
+            delete buttonnote_;
+            buttonnote_ = nullptr;
+        }
         /*动画*/
         if (imageAnimator != nullptr)
         {
@@ -270,6 +301,34 @@ namespace OHOS
         SetContainerView(swipe_);
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "swipe_ new ok");
     }
+    /*设置弹窗状态*/
+    void TraingCardView::SetPopupViewStatus(PopupType type, bool status)
+    {
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetPopupViewStatus %d", type);
+        UIView *popupView = nullptr;
+        if (type == EndPopup)
+        {
+            popupView = endView;
+        }
+        else if (type == GetTagPopup)
+        {
+            popupView = getView;
+        }
+
+        if (popupView == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PopupView is NULL");
+            return;
+        }
+
+        UIView *cardview = TraingCardView::GetInstance()->GetTraingCrad();
+        if (cardview != nullptr)
+        {
+            cardview->SetVisible(!status);
+        }
+
+        popupView->SetVisible(status);
+    }
     /*结束弹窗界面*/
     void TraingCardView::ShowEndView()
     {
@@ -306,32 +365,82 @@ namespace OHOS
         endView->SetVisible(false); // 界面隐藏
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowEndView end");
     }
-    /*设置弹窗状态*/
-    void TraingCardView::SetPopupViewStatus(PopupType type, bool status)
+    /*目标达成界面*/
+    void TraingCardView::ShowGetTagView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetPopupViewStatus %d", type);
-        UIView *popupView = nullptr;
-        if (type == EndPopup)
-        {
-            popupView = endView;
-        }
-        else if (type == GetTagPopup)
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowGetTagView");
+        getView = new UIScrollView();
+        if (getView == nullptr)
         {
-            popupView = getView;
+            return;
         }
+        getView->SetPosition(0, 0);
+        getView->Resize(VERTICAL_RESOLUTION, HORIZONTAL_RESOLUTION);
+        getView->SetScrollBlankSize(20);
+        getView->SetReboundSize(50);
+        getView->SetDirection(1);
 
-        if (popupView == nullptr)
+        // 初始化Lable
+        InitLabel(labeltitle, 83, 50, 300, 35, "label1", "目标已达成", DEFAULT_VECTOR_FONT_FILENAME, 35);
+        getView->Add(labeltitle);
+        getView->Add(labeltag);
+        InitLabel(labelgettag, 103, 307, 200, 35, "label3", "完成目标", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        getView->Add(labelgettag);
+        InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        getView->Add(labelpre);
+
+        // 初始化按键
+        InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONWINOK, STR_OK, 30);
+        buttonok_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);
+        buttonok_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingCardPresenter::GetInstance()));
+        getView->Add(buttonok_);
+
+        InitImageAnimator();
+        RootView::GetInstance()->Add(getView);
+        getView->SetDraggable(false);
+        getView->SetTouchable(true);
+        getView->SetVisible(false); // 界面隐藏
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowGetTagView end");
+    }
+    /*最高心率提醒弹窗*/
+    void TraingCardView::ShowHeartView()
+    {
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowHeartView");
+        heartView = new UIScrollView();
+        if (heartView == nullptr)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PopupView is NULL");
             return;
         }
-        UIView *cardview = TraingCardView::GetInstance()->GetTraingCrad();
-        if (cardview != nullptr)
-        {
-            cardview->SetVisible(!status);
-        }
+        heartView->SetPosition(0, 0);
+        heartView->Resize(VERTICAL_RESOLUTION, HORIZONTAL_RESOLUTION);
+        heartView->SetScrollBlankSize(20);
+        heartView->SetReboundSize(50);
+        heartView->SetDirection(1);
 
-        popupView->SetVisible(status);
+        // 初始化Lable
+        InitLabel(hearttitle, 83, 50, 300, 35, "label1", "心率提醒", DEFAULT_VECTOR_FONT_FILENAME, 35);
+        heartView->Add(hearttitle);
+
+        int maxheart = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_TRAINING_HEART_MAX);
+        std::string heartStr = "当前心率高于" + std::to_string(maxheart) + "次/分钟";
+        InitLabel(labelnote, 53, 269, 360, 35, "label3", heartStr.c_str(), DEFAULT_VECTOR_FONT_FILENAME, 30);
+        heartView->Add(labelnote);
+
+        InitImageView(heartiamge, 193, 149, 80, 80, "note", WARNING_IMAGE);
+        heartView->Add(heartiamge);
+
+        // 初始化按键
+        InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONWINOK, STR_OK, 30);
+        buttonok_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);
+        buttonok_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingCardPresenter::GetInstance()));
+        heartView->Add(buttonok_);
+
+        InitImageAnimator();
+        RootView::GetInstance()->Add(heartView);
+        heartView->SetDraggable(false);
+        heartView->SetTouchable(true);
+        heartView->SetVisible(false); // 界面隐藏
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowHeartView end");
     }
     /*获取运动量结束弹窗界面刷新*/
     bool TraingCardView::RefreshEndView()
@@ -353,7 +462,6 @@ namespace OHOS
         }
         return momentumFlag;
     }
-
     /*初始化动画以及Taglabel*/
     void TraingCardView::InitImageAnimator()
     {
@@ -402,44 +510,6 @@ namespace OHOS
         getView->Add(imageAnimator);
     }
 
-    /*目标达成展示*/
-    void TraingCardView::ShowGetTagView()
-    {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowGetTagView");
-        getView = new UIScrollView();
-        if (getView == nullptr)
-        {
-            return;
-        }
-        getView->SetPosition(0, 0);
-        getView->Resize(VERTICAL_RESOLUTION, HORIZONTAL_RESOLUTION);
-        getView->SetScrollBlankSize(20);
-        getView->SetReboundSize(50);
-        getView->SetDirection(1);
-
-        // 初始化Lable
-        InitLabel(labeltitle, 83, 50, 300, 35, "label1", "目标已达成", DEFAULT_VECTOR_FONT_FILENAME, 35);
-        getView->Add(labeltitle);
-        getView->Add(labeltag);
-        InitLabel(labelgettag, 103, 307, 200, 35, "label3", "完成目标", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        getView->Add(labelgettag);
-        InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        getView->Add(labelpre);
-
-        // 初始化按键
-        InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONWINOK, STR_OK, 30);
-        buttonok_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);
-        buttonok_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingCardPresenter::GetInstance()));
-        getView->Add(buttonok_);
-
-        InitImageAnimator();
-        RootView::GetInstance()->Add(getView);
-        getView->SetDraggable(false);
-        getView->SetTouchable(true);
-        getView->SetVisible(false); // 界面隐藏
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowGetTagView end");
-    }
-
     /*获取卡片View单例*/
     UICrossView *TraingCardView::GetTraingCrad()
     {
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp
index a68780771..a68a6e341 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp
@@ -32,7 +32,8 @@ namespace OHOS
 
     TrainingDetailView *TrainingDetailView::GetInstance()
     {
-        return g_pTrainingDetailView;
+        static TrainingDetailView instance;
+        return &instance;
     }
 
     /* InitView:初始化界面*/