解决#922绑定iOS手机，蓝牙来电手表提示音刚开始时默认通知铃声然后中断播放手机来电铃声bug

解决#934，静音模式，蓝牙来电有响铃bug
解决925，勿扰模式下，蓝牙来电有震动响铃bug

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 a20334d..2f02ee0 100644 (file)
--- 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
@@ -1409,10 +1410,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)
@@ -1422,8 +1423,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) {
                 // 播放手表铃声