From 54d546a4d608edc04b388063e2811406ac6e32c4 Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Fri, 17 Jan 2025 17:50:32 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E5=8A=A8=E5=8D=A1?= =?utf8?q?=E7=89=87=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../training_card/src/TraingCardPresenter.cpp | 4 +- .../training_card/src/TraingCardView.cpp | 12 +++++- .../training_card/src/TraingDataAllView.cpp | 6 +++ .../training_card/src/TrainingControlView.cpp | 1 + .../training_card/src/TrainingDataView.cpp | 42 ++++++++++--------- .../training_card/src/TrainingDetailView.cpp | 1 - 6 files changed, 43 insertions(+), 23 deletions(-) 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 51c798220..f7ac60cf6 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 @@ -495,7 +495,9 @@ void TraingCardPresenter::handleEndState() { ControlSensor(ExerciseState::End); uapi_set_screen_on_api(); // 亮屏 #if DATATEST - NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGENDDATA); + // NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGENDDATA); + // 回退 + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); return; #endif // 是否达到训练目标 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 d61e7ca84..ca2ebc08b 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 @@ -20,7 +20,6 @@ #include "traing/include/TraingModel.h" #include "uicomponents/UIComponents.h" - extern "C" { void StartTimer(); void StopAndResetTimer(); @@ -634,6 +633,7 @@ void TraingCardView::DeInit() { endView->RemoveAll(); getView->RemoveAll(); heartView->RemoveAll(); + DetailView->RemoveAll(); /*标签*/ delete endtitle; @@ -644,6 +644,7 @@ void TraingCardView::DeInit() { endnotelabel = nullptr; delete endnote; endnote = nullptr; + delete labeltitle; labeltitle = nullptr; delete labeltag; @@ -652,6 +653,7 @@ void TraingCardView::DeInit() { labelgettag = nullptr; delete labelpre; labelpre = nullptr; + delete hearttitle; hearttitle = nullptr; delete labelnote; @@ -684,6 +686,8 @@ void TraingCardView::DeInit() { dataallview_ = nullptr; delete musicview_; musicview_ = nullptr; + delete DetailView; //删除屏蔽卡片 + DetailView = nullptr; /*弹窗*/ delete endView; @@ -1031,7 +1035,11 @@ void TraingCardView::OnTearDownView() { void TraingCardView::OnStop() { View::OnStop(); - container_ = nullptr; + // if (container_ != nullptr) { + // container_->RemoveAll(); + // delete container_; + // container_ = nullptr; + // } RootView::GetInstance()->RemoveAll(); return; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingDataAllView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingDataAllView.cpp index 1579cf2dd..1c92c91b4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingDataAllView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingDataAllView.cpp @@ -42,6 +42,12 @@ void TraingDataAllView::ClearAll(void) { delete trainingDetailView; trainingDetailView = nullptr; + + delete trainingDataAllView; + trainingDataAllView = nullptr; + + delete traingDataAllPageView; + traingDataAllPageView = nullptr; } UISwipeView *TraingDataAllView::TraingDataAllViewInit(void) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp index 1ddd7d6e4..1ca79f226 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp @@ -93,6 +93,7 @@ UIButton *TrainingControlView::GetButton() { return buttonStop; } void TrainingControlView::DeInit() { RemoveAll(); if (labeltitle != nullptr) { + delete labeltitle; labeltitle = nullptr; } if (labeltimer != nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp index 416024c1b..be8bfeee6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp @@ -13,13 +13,13 @@ #include "common/image_cache_manager.h" #include "components/ui_button.h" #include "components/ui_label_ext.h" +#include "custom_runtime.h" #include "traing/Training_UiConfig.h" #include "traing/include/TraingModel.h" #include "ui_resource_image.h" #include "ui_resource_string.h" #include "uicomponents/UIComponents.h" #include -#include "custom_runtime.h" namespace OHOS { @@ -31,7 +31,6 @@ TrainingDataView::TrainingDataView() { } TrainingDataView::~TrainingDataView() { - RemoveAll(); DeInit(); g_pTrainingDataView = nullptr; } @@ -77,7 +76,6 @@ bool TrainingDataView ::InitPage() { InitLabelExt(sportlabel, 83, 120, 300, 35, "label2", sport_id, DEFAULT_VECTOR_FONT_FILENAME, 30); sportlabel->SetTextColor(Color::Gray()); - //数字统一使用DEFAULT_VECTOR_FONT_FILENAME_EN InitLabel(curtimelabel, 155, 60, 150, 50, "label1", "23:54", DEFAULT_VECTOR_FONT_FILENAME_EN, 40); @@ -85,7 +83,6 @@ bool TrainingDataView ::InitPage() { DEFAULT_VECTOR_FONT_FILENAME_EN, 80); InitLabel(heartlabel, 85, 284, 230, 80, "label4", "--", DEFAULT_VECTOR_FONT_FILENAME_EN, 60); - InitLabel(ubpmlabel, 218, 284, 230, 80, "label5", "bpm", DEFAULT_VECTOR_FONT_FILENAME, 60); ubpmlabel->SetTextColor(Color::Gray()); @@ -98,12 +95,12 @@ bool TrainingDataView ::InitPage() { return true; #if 0 - // 初始化Button - InitButton(buttonNote, 275, 350, 26, 26, BUTTONNOTE); - // Set additional property - buttonNote->SetImageSrc(NOTE_IMAGE, NOTE_IMAGE); - buttonNote->SetOnClickListener(static_cast(TraingCardPresenter::GetInstance())); - Add(buttonNote); + // 初始化Button + InitButton(buttonNote, 275, 350, 26, 26, BUTTONNOTE); + // Set additional property + buttonNote->SetImageSrc(NOTE_IMAGE, NOTE_IMAGE); + buttonNote->SetOnClickListener(static_cast(TraingCardPresenter::GetInstance())); + Add(buttonNote); #endif // 增加上拉卡片 // SetCoverable(true); @@ -113,6 +110,7 @@ bool TrainingDataView ::InitPage() { void TrainingDataView::DeInit() { RemoveAll(); if (curtimelabel != nullptr) { + delete curtimelabel; curtimelabel = nullptr; } if (sportlabel != nullptr) { @@ -131,6 +129,7 @@ void TrainingDataView::DeInit() { delete ubpmlabel; ubpmlabel = nullptr; } + // 删除button if (buttonNote != nullptr) { delete buttonNote; @@ -138,10 +137,6 @@ void TrainingDataView::DeInit() { } // 删除Image - if (image_lowIntensity != nullptr) { - delete image_lowIntensity; - image_lowIntensity = nullptr; - } if (image_iconup != nullptr) { delete image_iconup; image_iconup = nullptr; @@ -150,6 +145,16 @@ void TrainingDataView::DeInit() { delete image_iconpoint; image_iconpoint = nullptr; } + if (image_heart != nullptr) { + delete image_heart; + image_heart = nullptr; + } + if (image_progress != nullptr) { + delete image_progress; + image_progress = nullptr; + } + + //删除进度条圆圈 if (circleProgress != nullptr) { delete circleProgress; circleProgress = nullptr; @@ -173,12 +178,11 @@ void TrainingDataView::UpdataTime() { // 解析时间 int hour = pTM.tm_hour; //需要判断显示的格式 - if (uapi_dev_runtime_get_time_hour_show_model() == 12) - { - if (pTM.tm_hour > 12) - hour = pTM.tm_hour - 12 ; + if (uapi_dev_runtime_get_time_hour_show_model() == 12) { + if (pTM.tm_hour > 12) + hour = pTM.tm_hour - 12; } - + int minute = pTM.tm_min; // 将时间和日期转换为字符串 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 50ffe5ee8..1fce82c6c 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 @@ -25,7 +25,6 @@ TrainingDetailView::TrainingDetailView() { g_pTrainingDetailView = this; } TrainingDetailView::~TrainingDetailView() { - RemoveAll(); DeInit(); g_pTrainingDetailView = nullptr; } -- 2.17.1