删除不必要的文件

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 44fd89f..ebd6c15 100644 (file)
--- 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
         {\r
             distanceStr = DEFAULT_DASH;\r
         }\r
+        // 达到最高心率进行心率提醒弹窗\r
+        if (sportdata->heart >= 80)\r
+        // ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_TRAINING_HEART_MAX))\r
+        {\r
+            TraingCardView::GetInstance()->SetPopupViewStatus(HeartPopup, true);\r
+        }\r
         // std::string durationStr = std::to_string(sportdata->duration);\r
         std::string heartStr = (sportdata->heart != 0) ? std::to_string(sportdata->heart) : DEFAULT_DASH;\r
         std::string stepsStr = (sportdata->steps != 0) ? std::to_string(sportdata->steps) : DEFAULT_DASH;\r

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

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 a687807..a68a6e3 100644 (file)
--- 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:初始化界面*/