From: Caisking <3449750381@qq.com> Date: Tue, 9 Jul 2024 12:07:28 +0000 (+0800) Subject: 修复部分析构 X-Git-Tag: release_V1.2.70_20241020_135402~833^2~3^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F490%2Fhead;p=mirrors%2FFD230.git 修复部分析构 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleView.cpp index 39c6814a1..967f2d8c5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleView.cpp @@ -26,7 +26,6 @@ namespace OHOS SaveEleView *SaveEleView::GetInstance() { - return g_pSaveEleView; } @@ -235,17 +234,8 @@ namespace OHOS void SaveEleView::DeInit() { - if (container_ != nullptr) - { - container_->RemoveAll(); - delete container_; - container_ = nullptr; - } - if (scrollView1_ != nullptr) - { - delete scrollView1_; - scrollView1_ = nullptr; - } + scrollView1_->RemoveAll(); + container_->RemoveAll(); if (label1_ != nullptr) { delete label1_; @@ -286,6 +276,16 @@ namespace OHOS delete label2_; label2_ = nullptr; } + if (scrollView1_ != nullptr) + { + delete scrollView1_; + scrollView1_ = nullptr; + } + if (container_ != nullptr) + { + delete container_; + container_ = nullptr; + } } UIView *SaveEleView::GetView()