关闭aod表盘错误的宏

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/AmbientClockView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/AmbientClockView.cpp
index 9f5fdd2..5ede0bc 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/AmbientClockView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/AmbientClockView.cpp
@@ -44,25 +44,26 @@ AmbientClockView::~AmbientClockView()
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AmbientClockView::~AmbientClockView");
     if (viewiInitStatus_) {
-        // mainSweepClock_->RemoveAll();
-        // delete secondHand_;
-        // secondHand_ = nullptr;
-        // delete minuteHand_;
-        // minuteHand_ = nullptr;
-        // delete hourHand_;
-        // hourHand_ = nullptr;
-        // delete hand24Hour_;
-        // hand24Hour_ = nullptr;
-        // delete bigCircle_;
-        // bigCircle_ = nullptr;
-        // delete medCircle_;
-        // medCircle_ = nullptr;
-        // delete smallCircle_;
-        // smallCircle_ = nullptr;
-        // Remove(mainSweepClock_);
-        // delete mainSweepClock_;
-        // mainSweepClock_ = nullptr;
-
+#ifdef sdk_clock
+        mainSweepClock_->RemoveAll();
+        delete secondHand_;
+        secondHand_ = nullptr;
+        delete minuteHand_;
+        minuteHand_ = nullptr;
+        delete hourHand_;
+        hourHand_ = nullptr;
+        delete hand24Hour_;
+        hand24Hour_ = nullptr;
+        delete bigCircle_;
+        bigCircle_ = nullptr;
+        delete medCircle_;
+        medCircle_ = nullptr;
+        delete smallCircle_;
+        smallCircle_ = nullptr;
+        Remove(mainSweepClock_);
+        delete mainSweepClock_;
+        mainSweepClock_ = nullptr;
+#endif
         delete timerlabel;
         timerlabel = nullptr;
     }
@@ -70,7 +71,7 @@ AmbientClockView::~AmbientClockView()
 
 bool AmbientClockView::InitCenterCircleView(void)
 {
-    #ifdef FD230_650
+    #ifdef sdk_clock
     bigCircle_ = new Image();
     if (bigCircle_ == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bigCircle new fail");
@@ -103,7 +104,7 @@ bool AmbientClockView::InitCenterCircleView(void)
 
 bool AmbientClockView::InitHandView(void)
 {
-    #ifdef FD230_650
+    #ifdef sdk_clock
     secondHand_ = new Image();
     if (secondHand_ == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "secondHand new fail");