From 9afd7e7a42f90850d78a96d0ef5ed67cb679f202 Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Fri, 5 Jul 2024 11:10:31 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D=E5=BF=83=E7=8E=87=E7=95=8C?= =?utf8?q?=E9=9D=A2=20=E4=BF=AE=E6=94=B9=E6=AD=BB=E6=9C=BA=E5=88=86?= =?utf8?q?=E6=9E=90=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230app/nativeui/heartrate/src/HeartView.cpp | 14 ++++---------- tools/log_parser/excdump.sh | 8 +++++++- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartView.cpp index 3dc6132c5..8f4c43289 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartView.cpp @@ -61,11 +61,7 @@ namespace OHOS HeartView::~HeartView() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartView::~HeartView"); - for (int i = HEARTVIEW; i < MAX_HEARTVIEW; i++) - { - HeartScrollView[i]->RemoveAll(); - } - + HeartScrollView[HEARTVIEW]->RemoveAll(); UIView::OnDragListener *draglistener = HeartScrollView[HEARTVIEW]->GetOnDragListener(); if (draglistener != nullptr) { @@ -90,11 +86,9 @@ namespace OHOS heartcheck = nullptr; heartbandoff = nullptr; heartresult = nullptr; - for (int i = HEARTVIEW; i < MAX_HEARTVIEW; i++) - { - delete HeartScrollView[i]; - HeartScrollView[i] = nullptr; - } + + delete HeartScrollView[HEARTVIEW]; + HeartScrollView[HEARTVIEW] = nullptr; } HeartView *HeartView::GetInstance(void) { diff --git a/tools/log_parser/excdump.sh b/tools/log_parser/excdump.sh index a3735a513..94bb7167e 100644 --- a/tools/log_parser/excdump.sh +++ b/tools/log_parser/excdump.sh @@ -1,4 +1,10 @@ #!/bin/bash +### + # @Date: 2024-07-04 19:24:05 + # @LastEditors: Caisking 3449750381@qq.com + # @LastEditTime: 2024-07-05 10:57:52 + # @FilePath: /FD230/tools/log_parser/excdump.sh +### ROOTPATH=`dirname $0` if [ -z $1 ]; then echo "Usage: $0 [lst file]" @@ -11,7 +17,7 @@ struct="exc_info_save_t" srctarpath=$1 srctar=`basename $srctarpath` srcdir=`dirname $srctarpath` -version=${srctar:4:22} +version=${srctar:4:23} targetdir=$srcdir/bin_$srctar mkdir -p $targetdir tar xf $srctarpath -C $targetdir -- 2.17.1