From 2f280fce12071c953463847eebbdd9c5908cd72d Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Tue, 8 Oct 2024 19:45:08 +0800
Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3#922=E7=BB=91=E5=AE=9AiOS?=
 =?utf8?q?=E6=89=8B=E6=9C=BA=EF=BC=8C=E8=93=9D=E7=89=99=E6=9D=A5=E7=94=B5?=
 =?utf8?q?=E6=89=8B=E8=A1=A8=E6=8F=90=E7=A4=BA=E9=9F=B3=E5=88=9A=E5=BC=80?=
 =?utf8?q?=E5=A7=8B=E6=97=B6=E9=BB=98=E8=AE=A4=E9=80=9A=E7=9F=A5=E9=93=83?=
 =?utf8?q?=E5=A3=B0=E7=84=B6=E5=90=8E=E4=B8=AD=E6=96=AD=E6=92=AD=E6=94=BE?=
 =?utf8?q?=E6=89=8B=E6=9C=BA=E6=9D=A5=E7=94=B5=E9=93=83=E5=A3=B0bug=20?=
 =?utf8?q?=E8=A7=A3=E5=86=B3#934=EF=BC=8C=E9=9D=99=E9=9F=B3=E6=A8=A1?=
 =?utf8?q?=E5=BC=8F=EF=BC=8C=E8=93=9D=E7=89=99=E6=9D=A5=E7=94=B5=E6=9C=89?=
 =?utf8?q?=E5=93=8D=E9=93=83bug=20=E8=A7=A3=E5=86=B3925=EF=BC=8C=E5=8B=BF?=
 =?utf8?q?=E6=89=B0=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C=E8=93=9D=E7=89=99?=
 =?utf8?q?=E6=9D=A5=E7=94=B5=E6=9C=89=E9=9C=87=E5=8A=A8=E5=93=8D=E9=93=83b?=
 =?utf8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/phoneservice/src/PhoneService.cpp   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
index c76fb522b..df760d332 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
@@ -37,6 +37,7 @@
 #include "custom_runtime.h"
 #include "vibrator_service.h"
 #include "gfx_utils/mem_api.h"
+#include "ConfigModel.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1408,10 +1409,10 @@ static void CallChangeHeldPro(const hfp_hf_calls_info_t *call)
 static void PlayWatchRing(void)
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[PlayWatchRing] start");
-    if(true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
-    {
-        OHOS::AlarmClockModel::GetInstance()->testPlayerStart("/music/ring/ring.mp3");
-    }
+    // if(true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()) && true != OHOS::ConfigModel::GetInstance()->GetSilentMode())
+    // {
+    //     OHOS::AlarmClockModel::GetInstance()->testPlayerStart("/music/ring/ring.mp3");
+    // }
 }
 
 static void CallAudioHandle(const hfp_hf_calls_info_t *call)
@@ -1421,8 +1422,11 @@ static void CallAudioHandle(const hfp_hf_calls_info_t *call)
     if (state == HFP_HF_CALL_STATE_INCOMING || state == HFP_HF_CALL_STATE_DIALING ||
         state == HFP_HF_CALL_STATE_ALERTING) { // 电话呼入，支持播放手机铃声
         if (call->in_band_ring) {
-            // 播放手机端铃声
-            PostGraphicEvent(AudioDn);
+            if(true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()) && true != OHOS::ConfigModel::GetInstance()->GetSilentMode())
+            {
+                // 播放手机端铃声
+                PostGraphicEvent(AudioDn);
+            }
         } else {
             if (g_scoFlag != HFP_SCO_STATE_CONNECTED) {
                 // 播放手表铃声
-- 
2.17.1