From 42887d68560f369c0214ff49a4f2a81ff9af8839 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Mon, 16 Dec 2024 17:32:51 +0800
Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=E9=9F=B3?=
 =?utf8?q?=E9=87=8F=E6=8E=A7=E5=88=B6=EF=BC=9A=E6=9F=A5=E6=89=BE=E6=89=8B?=
 =?utf8?q?=E8=A1=A8=EF=BC=8C=E9=97=B9=E9=92=9F=E9=93=83=E5=A3=B0=EF=BC=8C?=
 =?utf8?q?=E5=80=92=E8=AE=A1=E6=97=B6=EF=BC=8C=E7=9A=84=E5=A3=B0=E9=9F=B3?=
 =?utf8?q?=E7=8E=B0=E5=9C=A8=E5=8F=97=E7=B3=BB=E7=BB=9F=E9=9F=B3=E9=87=8F?=
 =?utf8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../src/SoundAndVibrationVolumeSettingPresenter.cpp            | 3 ++-
 .../audiomanager/frameworks/audiomanager/cpp/audio_manager.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp
index 42fd9536a..aec96c0c9 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-04-19 10:08:31
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-11-05 14:42:59
+ * @LastEditTime: 2024-12-16 15:17:04
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp
  */
 #include "soundandvibration/include/SoundAndVibrationVolumeSettingPresenter.h"
@@ -223,6 +223,7 @@ extern "C"
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemVolumeSet %d", sounding);
         Audio::AudioManager::GetInstance().SetVolume(AUDIO_STREAM_MUSIC, sounding); // 系统音量设置
+        Audio::AudioManager::GetInstance().SetVolume(AUDIO_STREAM_NOTIFICATION_SYSTEM, sounding); // 查找手表，闹钟，倒计时铃声也受系统音量控制
     }
 
     int SystemVolumeGet(void)
diff --git a/code/sdk/middleware/services/media/foundation/audiomanager/frameworks/audiomanager/cpp/audio_manager.cpp b/code/sdk/middleware/services/media/foundation/audiomanager/frameworks/audiomanager/cpp/audio_manager.cpp
index cc70e95c5..0b82ce8c9 100755
--- a/code/sdk/middleware/services/media/foundation/audiomanager/frameworks/audiomanager/cpp/audio_manager.cpp
+++ b/code/sdk/middleware/services/media/foundation/audiomanager/frameworks/audiomanager/cpp/audio_manager.cpp
@@ -45,7 +45,7 @@ bool AudioManager::SetVolume(AudioStreamType streamType, int32_t volume)
     CHK_NULL_RETURN(impl_, false, "impl_ is nullptr");
 
 
-    if(streamType == AUDIO_STREAM_MUSIC || streamType == AUDIO_STREAM_A2DP_MUSIC)
+    if(streamType == AUDIO_STREAM_MUSIC || streamType == AUDIO_STREAM_A2DP_MUSIC || streamType == AUDIO_STREAM_NOTIFICATION_SYSTEM)
     {
         if(volume == 0) 
             volume = 0;
-- 
2.17.1