From 3dbba3a2afdbe6de43d52a705f6faf3f2957c214 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com>
Date: Wed, 28 Aug 2024 02:55:53 +0000
Subject: [PATCH] Merge #807 into sdk602patch0626 from refs/changes/807/head
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

屏蔽KeyInputListener里面的不使用功能

* refs/changes/807/head: (1 commits squashed)

  - 屏蔽KeyInputListener里面的不使用功能

Signed-off-by: Caisking <3449750381@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/807
---
 .../wearable/fd230app/nativeui/key/src/KeyInputListener.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
index 49dab4d82..2ab687bc1 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
@@ -140,14 +140,16 @@ namespace OHOS
             // 短按电源键
             if (longPressFlag == 0 && pressFlag == 1)
             {
+#if 0
                 // 如果当前页面是音量卡片或正在通话中，则执行音量+操作
                 if (currentViewId == VIEW_INCOMING_CALL ||
                     NotificationManager::GetInstance()->GetWatchCallStatus())
                 { // 音量卡片
-                    // 音量+
+                    // 音量
                     CallVolumeDipSwitchControl(VOLUMEUP);
                 }
-                else if (currentViewId != VIEW_MAIN) // 如果当前页面不是主表盘,如果屏幕亮起,则先处理闹钟通知再切换到主表盘页面
+#endif
+                if (currentViewId != VIEW_MAIN) // 如果当前页面不是主表盘,如果屏幕亮起,则先处理闹钟通知再切换到主表盘页面
                 {
                     if (mcu_pms_is_screen_on())
                     {
-- 
2.17.1