From: 罗正 <1732036298@qq.com>
Date: Fri, 12 Jul 2024 02:35:21 +0000 (+0000)
Subject: Merge #510 into sdk602patch0626 from refs/changes/510/head
X-Git-Tag: release_V1.2.70_20241020_135402~824^2^2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d25d508f44677c63bb92a71211a4a6957c6ca707;p=mirrors%2FFD230.git

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

Code review from 罗正

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

  - 解决applist样式为蜂窝，错误清除按键了监听

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

Signed-off-by: 罗正 <1732036298@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/510
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp
index f31f8f816..fede9a3eb 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp
@@ -217,9 +217,9 @@ void ApplistView::OnStop()
     AppListStyle style = presenter_->GetCurrentStyle();
     if (style == AppListStyle::FOOTBALL_STYLE) {
         FootballStyleOnStop();
+        RootView::GetInstance()->ClearOnKeyActListener();
     } else if (style == AppListStyle::HEXAGONS_STYLE) {
         HexagonsStyleOnStop();
-        RootView::GetInstance()->ClearOnKeyActListener();
     } else {
         ListStyleOnStop();
         RootView::GetInstance()->ClearOnKeyActListener();