From: 胡传军 <1224667075@qq.com>
Date: Fri, 30 Aug 2024 06:40:28 +0000 (+0000)
Subject: Merge #831 into sdk602patch0626 from refs/changes/831/head
X-Git-Tag: release_V1.2.70_20241020_135402~561^2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=f1f6d6f2abee1c56cb345c565e289276d94ec14a;p=mirrors%2FFD230.git

Merge #831 into sdk602patch0626 from refs/changes/831/head

Code review from 胡传军

* refs/changes/831/head: (2 commits squashed)

  - 计算器内存泄漏修复

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/831
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/calculator/src/CalculatorView.cpp b/code/sdk/application/wearable/fd230app/nativeui/calculator/src/CalculatorView.cpp
index 9c84bbd94..95619d6a5 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/calculator/src/CalculatorView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/calculator/src/CalculatorView.cpp
@@ -42,6 +42,11 @@ CalculatorView::~CalculatorView()
         delete image1_;
         image1_=nullptr;
     }
+    if(group)
+    {
+        delete group;
+        group =nullptr;
+    }
 }
 
 CalculatorView *CalculatorView::GetInstance()