From 1668cb7b87155ba71b4c5374b195071a614cbe4c Mon Sep 17 00:00:00 2001
From: SnickerSun <snickersun@163.com>
Date: Mon, 26 Aug 2024 18:37:22 +0800
Subject: [PATCH] =?utf8?q?=E6=8C=87=E5=8D=97=E9=92=88=E5=86=85=E5=AD=98?=
 =?utf8?q?=E6=B3=84=E9=9C=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../compass/src/CompassCalibrationView.cpp    |  2 ++
 .../nativeui/compass/src/MainCompassView.cpp  | 20 ++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassCalibrationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassCalibrationView.cpp
index 73b44caf9..56b56e2dc 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassCalibrationView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassCalibrationView.cpp
@@ -56,6 +56,8 @@ void CompassCalibrationView::ClearAll(void)
             delete labelTwo;
             labelTwo = nullptr;
         }
+        delete scrollView;
+        scrollView = nullptr;
     }
 }
 
diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassView.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassView.cpp
index a3dd2778b..fc7fe9b78 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassView.cpp
@@ -33,15 +33,17 @@ void MainCompassView::ClearAll()
 {
     if (container_ != nullptr) 
     {
-        RootView::GetInstance()->Remove(compassView);
-        RootView::GetInstance()->Remove(compassCalibrationView);
-
-        delete compassView;
-        compassView = nullptr;
-
-        delete compassCalibrationView;
-        compassCalibrationView = nullptr;
-        
+        container_->RemoveAll();
+        if(compassView!=nullptr)
+        {
+            delete compassView;
+            compassView = nullptr;
+        }
+        if(compassCalibrationView!=nullptr)
+        {
+            delete compassCalibrationView;
+            compassCalibrationView = nullptr;
+        }
         delete container_;
         container_ = nullptr;
     }
-- 
2.17.1