From: Caisking <3449750381@qq.com> Date: Fri, 27 Sep 2024 09:05:03 +0000 (+0800) Subject: 修复睡眠Slice析构 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1037%2F1;p=mirrors%2FFD230.git 修复睡眠Slice析构 --- diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index 610d5d5d4..80c57f0fb 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -177,6 +177,7 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelMinTens.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelMinUnits.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelHourMin.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelTimeStr.cpp #exception handling ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/CheckAbnormalView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp index 79ec67755..7e1cd8e61 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp @@ -44,6 +44,11 @@ namespace OHOS delete sleepcontrolView; sleepcontrolView = nullptr; } + if(SleepSwipView) + { + delete SleepSwipView; + SleepSwipView = nullptr; + } } } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlView.cpp index 97b3bfc20..dbaaaf2f3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlView.cpp @@ -44,6 +44,7 @@ namespace OHOS { recordCard[i] = nullptr; } + SleepSwipeViewList->RemoveAll(); delete sleepView; diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp index 1bf6c20d9..400ade332 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp @@ -95,6 +95,21 @@ namespace OHOS delete circleProgress_; circleProgress_ = nullptr; } + if (title != nullptr) + { + delete title; + title = nullptr; + } + if (hour != nullptr) + { + delete hour; + hour = nullptr; + } + if (minute != nullptr) + { + delete minute; + minute = nullptr; + } if (time_hour != nullptr) { delete time_hour;