From: Caisking <3449750381@qq.com>
Date: Fri, 27 Sep 2024 07:48:37 +0000 (+0800)
Subject: 修复血氧Slice的析构
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=e8efe1418e31165e1dbba9a3ebe99670c2fa7517;p=mirrors%2FFD230.git

修复血氧Slice的析构
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodDetectionView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodDetectionView.h
index 639175408..476ec64f8 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodDetectionView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodDetectionView.h
@@ -56,7 +56,6 @@ namespace OHOS
         UIImageAnimatorView *imageAnimator{nullptr};
         UILabelExt *titleLabel{nullptr};
         UILabel *Spo2Text{nullptr};
-        UIScrollView *BloodDetectionScrollView{nullptr};
         UILabelButtonExt *testButton{nullptr};
 
         uint32_t spo2_;
diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionView.cpp
index 233048140..778290a9c 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionView.cpp
@@ -54,22 +54,30 @@ namespace OHOS
     BloodDetectionView::~BloodDetectionView()
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BloodDetectionView::~BloodDetectionView");
-        // container_->RemoveAll();
-
-        delete titleLabel;
-        titleLabel = nullptr;
-
-        delete testButton;
-        testButton = nullptr;
-
-        imageAnimator->Stop();
-        delete imageAnimator;
-        imageAnimator = nullptr;
-
-        delete Spo2Text;
-        Spo2Text = nullptr;
-
-        g_pBloodCheckView = this;
+        if(container_)
+            container_->RemoveAll();
+        if(titleLabel)
+        {
+            delete titleLabel;
+            titleLabel = nullptr;
+        }
+        if(testButton)
+        {
+            delete testButton;
+            testButton = nullptr;
+        }
+        if(imageAnimator)
+        {
+            imageAnimator->Stop();
+            delete imageAnimator;
+            imageAnimator = nullptr;   
+        }
+        if(Spo2Text)
+        {
+            delete Spo2Text;
+            Spo2Text = nullptr;  
+        }
+        g_pBloodCheckView = nullptr;
     }
     BloodDetectionView *BloodDetectionView::GetInstance(void)
     {
diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp
index 97fe087c0..4d9615a81 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp
@@ -165,6 +165,10 @@ namespace OHOS
      */
     void BloodResultView::DeInit()
     {
+        if(container_)
+        {
+            container_->RemoveAll();
+        }
         if (background != nullptr)
         {
             delete background;
@@ -185,6 +189,11 @@ namespace OHOS
             delete titleLabel;
             titleLabel = nullptr;
         }
+        if(checkButton!=nullptr)
+        {
+            delete checkButton;
+            checkButton = nullptr;
+        }
     }
 
     void BloodResultView::OnStart()