From: Caisking Date: Wed, 23 Jul 2025 09:49:10 +0000 (+0800) Subject: 关闭aod表盘错误的宏 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~214^2~3 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=9998ff51db1e853303f69c74e55d63ea4d69f38e;p=mirrors%2FFD230.git 关闭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 9f5fdd285..5ede0bcc6 100644 --- 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");