From: hcj <1224667075@qq.com>
Date: Fri, 30 Aug 2024 11:49:08 +0000 (+0800)
Subject: 保留通话按键调节音量功能，加大条件限制
X-Git-Tag: release_V1.2.70_20241020_135402~553
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ed031bc1a2c1b8c9c972e10419bc40b8098ef48b;p=mirrors%2FFD230.git

保留通话按键调节音量功能，加大条件限制
---

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 23472dc97..e50434dea 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
@@ -139,15 +139,17 @@ namespace OHOS
             // 短按电源键
             if (longPressFlag == 0 && pressFlag == 1)
             {
-#if 0
+#if 1
                 // 如果当前页面是音量卡片或正在通话中，则执行音量+操作
-                if (currentViewId == VIEW_INCOMING_CALL ||
-                    NotificationManager::GetInstance()->GetWatchCallStatus())
+                if (currentViewId == VIEW_INCOMING_CALL )
+#else
+                || NotificationManager::GetInstance()->GetWatchCallStatus())
+#endif
                 { // 音量卡片
                     // 音量
                     CallVolumeDipSwitchControl(VOLUMEUP);
                 }
-#endif
+
                 if (currentViewId != VIEW_MAIN) // 如果当前页面不是主表盘,如果屏幕亮起,则先处理闹钟通知再切换到主表盘页面
                 {
                     if (mcu_pms_is_screen_on())
@@ -194,15 +196,17 @@ namespace OHOS
             // 检查是否是短按功能键
             if (longPressFlag == 0 && pressFlag == 1)
             {
-#if 0
-                // 如果当前页面是音量卡片或正在通话中，则执行音量减操作
-                if (currentViewId == VIEW_INCOMING_CALL ||
-                    NotificationManager::GetInstance()->GetWatchCallStatus())
+#if 1
+                // 如果当前页面是音量卡片或正在通话中，则执行音量+操作
+                if (currentViewId == VIEW_INCOMING_CALL )
+#else
+                || NotificationManager::GetInstance()->GetWatchCallStatus())
+#endif
                 { // 音量卡片
                     // 音量-
                     CallVolumeDipSwitchControl(VOLUMEDOWN);
                 }
-#endif
+
                 if (currentViewId != VIEW_MAIN) // 如果当前页面不是主表盘,如果屏幕亮起，则先处理闹钟通知再切换到主表盘页面。
                 {
                     if (mcu_pms_is_screen_on())