Merge #807 into sdk602patch0626 from refs/changes/807/head 809/target/1
author袁清梦 <3449750381@qq.com>
Wed, 28 Aug 2024 02:55:53 +0000 (02:55 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Wed, 28 Aug 2024 02:55:53 +0000 (02:55 +0000)
屏蔽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>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/807
code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp

index 49dab4d..2ab687b 100644 (file)
@@ -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())
                     {