From: Caisking Date: Thu, 12 Mar 2026 09:10:15 +0000 (+0800) Subject: 优化心率UI X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=9d700e425739ea9edd41d662464ed24696059cc2;p=mirrors%2FFD230.git 优化心率UI --- diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/include/HeartChartView.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/include/HeartChartView.h index b9b2d27bb..3309e9d27 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/include/HeartChartView.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/include/HeartChartView.h @@ -92,6 +92,7 @@ private: UILabelExt *minheart_dynamic_{nullptr}; UIScrollView *scrollView{nullptr}; + bool viewInitStatus_{false}; }; } // namespace OHOS diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartChartView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartChartView.cpp index 52ac29a4c..f8e14e4a6 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartChartView.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartChartView.cpp @@ -163,88 +163,52 @@ HeartChartView::HeartChartView() { } HeartChartView::~HeartChartView() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartChartView::~HeartChartView"); - if (scrollView) { - scrollView->RemoveAll(); - - if (displayheart_) { - delete displayheart_; - displayheart_ = nullptr; - } - if (maxheart_) { - delete maxheart_; - maxheart_ = nullptr; - } - if (minheart_) { - delete minheart_; - minheart_ = nullptr; - } - if (uheart_) { - delete uheart_; - uheart_ = nullptr; - } - if (lastheart_) { - delete lastheart_; - lastheart_ = nullptr; - } - if (maxheart_dynamic_) { - delete maxheart_dynamic_; - maxheart_dynamic_ = nullptr; - } - if (maxheart_dynamic_3_) { - delete maxheart_dynamic_3_; - maxheart_dynamic_3_ = nullptr; - } - if (maxheart_dynamic_2_) { - delete maxheart_dynamic_2_; - maxheart_dynamic_2_ = nullptr; - } - if (maxheart_dynamic_1_) { - delete maxheart_dynamic_1_; - maxheart_dynamic_1_ = nullptr; - } - if (minheart_dynamic_) { - delete minheart_dynamic_; - minheart_dynamic_ = nullptr; - } - - if (maxRateIconView_) { - delete maxRateIconView_; - maxRateIconView_ = nullptr; - } - if (minRateIconView_) { - delete minRateIconView_; - minRateIconView_ = nullptr; - } - if (chartBackgroundView_) { - delete chartBackgroundView_; - chartBackgroundView_ = nullptr; - } - if (heartIconView_) { - delete heartIconView_; - heartIconView_ = nullptr; - } - - if (imageAnimator) { - imageAnimator->Stop(); - delete imageAnimator; - imageAnimator = nullptr; - } - - if (heartSerial) { - heartchart->ClearDataSerial(); - delete heartSerial; - heartSerial = nullptr; - } + g_pHeartCheckView = nullptr; // 提前置空,防止析构期间被其他线程使用 + if (!viewInitStatus_ || scrollView == nullptr) { + return; + } + scrollView->RemoveAll(); + + // 释放 Label + if (displayheart_) { delete displayheart_; displayheart_ = nullptr; } + if (maxheart_) { delete maxheart_; maxheart_ = nullptr; } + if (minheart_) { delete minheart_; minheart_ = nullptr; } + if (uheart_) { delete uheart_; uheart_ = nullptr; } + if (lastheart_) { delete lastheart_; lastheart_ = nullptr; } + if (maxheart_dynamic_) { delete maxheart_dynamic_; maxheart_dynamic_ = nullptr; } + if (maxheart_dynamic_3_) { delete maxheart_dynamic_3_; maxheart_dynamic_3_ = nullptr; } + if (maxheart_dynamic_2_) { delete maxheart_dynamic_2_; maxheart_dynamic_2_ = nullptr; } + if (maxheart_dynamic_1_) { delete maxheart_dynamic_1_; maxheart_dynamic_1_ = nullptr; } + if (minheart_dynamic_) { delete minheart_dynamic_; minheart_dynamic_ = nullptr; } + + // 释放 ImageView + if (maxRateIconView_) { delete maxRateIconView_; maxRateIconView_ = nullptr; } + if (minRateIconView_) { delete minRateIconView_; minRateIconView_ = nullptr; } + if (chartBackgroundView_) { delete chartBackgroundView_; chartBackgroundView_ = nullptr; } + if (heartIconView_) { delete heartIconView_; heartIconView_ = nullptr; } + + // 先 Stop 再释放 Animator + if (imageAnimator) { + imageAnimator->Stop(); + delete imageAnimator; + imageAnimator = nullptr; + } + // Chart 与 Serial:先 ClearDataSerial 解除引用,再 delete + if (heartSerial) { if (heartchart) { - delete heartchart; - heartchart = nullptr; + heartchart->ClearDataSerial(); } - - delete scrollView; - scrollView = nullptr; + delete heartSerial; + heartSerial = nullptr; + } + if (heartchart) { + delete heartchart; + heartchart = nullptr; } - g_pHeartCheckView = nullptr; + + delete scrollView; + scrollView = nullptr; } HeartChartView *HeartChartView::GetInstance(void) { return g_pHeartCheckView; } @@ -616,6 +580,7 @@ bool HeartChartView::HeartViewInit() { InitChartLabel(); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartChartViewInit is ok"); + viewInitStatus_ = true; return true; } UIScrollView *HeartChartView::GetchartGroup() { diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartNoteView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartNoteView.cpp index 501c5927a..21b663ad4 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartNoteView.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartNoteView.cpp @@ -98,7 +98,7 @@ UIScrollView *HeartNoteView::CreateHeartNoteView(void) { InitButtonExt(ReButton, 238, 320, 170, 90, CLICK_HEART_RESTART, STR_RECHECK, 30); - ReButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff0D6EFF); // 设置按键颜色 + ReButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff0d62ff); // 品牌蓝 UIView::OnClickListener *buttonClickre = static_cast( HeartChartPresenter::GetInstance());