From aa1d6f7edda8a3f9b970d45a514cb0d0083974bc Mon Sep 17 00:00:00 2001 From: Sun Xiaojun Date: Wed, 28 May 2025 16:07:20 +0800 Subject: [PATCH 1/3] use SetRingToneVolume replace stopRingTone Signed-off-by: Sun Xiaojun --- .../src/call_voice_assistant_manager.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/services/call_voice_assistant/src/call_voice_assistant_manager.cpp b/services/call_voice_assistant/src/call_voice_assistant_manager.cpp index 2442bfef..539fb1b9 100644 --- a/services/call_voice_assistant/src/call_voice_assistant_manager.cpp +++ b/services/call_voice_assistant/src/call_voice_assistant_manager.cpp @@ -233,8 +233,10 @@ void CallVoiceAssistantManager::OnStartService(const std::string& isDial, const void CallVoiceAssistantManager::OnStopService() { + TELEPHONY_LOGI("OnStopService enter"); DisconnectAbility(); UnRegisterListenSwitchState(); + DelayedSingleton::GetInstance()->StopRingtone(); VoiceAssistantRingSubscriber::Release(); PublishCommonEvent(false, std::string("on_stop_service")); Release(); @@ -352,7 +354,8 @@ void CallVoiceAssistantManager::UpdateContactInfo(const ContactInfo& info, int32 void CallVoiceAssistantManager::MuteRinger() { callVoiceAssistantQueue.submit([=]() { - TELEPHONY_LOGI("stop broadcast event"); + TELEPHONY_LOGI("stop broadcast event and SetRingToneVolume"); + DelayedSingleton::GetInstance()->SetRingToneVolume(0.0f); VoiceAssistantRingSubscriber::Release(); isplay = SWITCH_TURN_OFF; if (nowCallId == FAIL_CODE) { @@ -594,7 +597,8 @@ void CallVoiceAssistantManager::CallStatusDialing(const int32_t& callId, const i void CallVoiceAssistantManager::CallStatusActive(const int32_t& callId, const int32_t& accountId) { - TELEPHONY_LOGI("call_status_active, [%{public}d][%{public}d]", accountId, callId); + TELEPHONY_LOGI("call_status_active and SetRingToneVolume, [%{public}d][%{public}d]", accountId, callId); + DelayedSingleton::GetInstance()->SetRingToneVolume(0.0f); VoiceAssistantRingSubscriber::Release(); PublishCommonEvent(false, std::string("call_status_active")); mRemoteObject = nullptr; @@ -671,8 +675,7 @@ bool VoiceAssistantRingSubscriber::Initial() void VoiceAssistantRingSubscriber::Release() { if (subscriber_ != nullptr) { - TELEPHONY_LOGI("stop play system ring"); - DelayedSingleton::GetInstance()->StopRingtone(); + TELEPHONY_LOGI("UnSubscribeCommonEvent"); EventFwk::CommonEventManager::UnSubscribeCommonEvent(subscriber_); subscriber_ = nullptr; } -- Gitee From c27869cb4b40cef8c21db3af7dab73f07df9a462 Mon Sep 17 00:00:00 2001 From: Sun Xiaojun Date: Wed, 28 May 2025 19:00:55 +0800 Subject: [PATCH 2/3] use SetRingToneVolume replace stopRingTone Signed-off-by: Sun Xiaojun --- .../call_voice_assistant/src/call_voice_assistant_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/call_voice_assistant/src/call_voice_assistant_manager.cpp b/services/call_voice_assistant/src/call_voice_assistant_manager.cpp index 539fb1b9..1c2f96b5 100644 --- a/services/call_voice_assistant/src/call_voice_assistant_manager.cpp +++ b/services/call_voice_assistant/src/call_voice_assistant_manager.cpp @@ -597,7 +597,7 @@ void CallVoiceAssistantManager::CallStatusDialing(const int32_t& callId, const i void CallVoiceAssistantManager::CallStatusActive(const int32_t& callId, const int32_t& accountId) { - TELEPHONY_LOGI("call_status_active and SetRingToneVolume, [%{public}d][%{public}d]", accountId, callId); + TELEPHONY_LOGI("muteRiner before playSoundTone, [%{public}d][%{public}d]", accountId, callId); DelayedSingleton::GetInstance()->SetRingToneVolume(0.0f); VoiceAssistantRingSubscriber::Release(); PublishCommonEvent(false, std::string("call_status_active")); -- Gitee From 4dd8451b4b66961c8586909e814a9220e03734b5 Mon Sep 17 00:00:00 2001 From: Sun Xiaojun Date: Wed, 28 May 2025 19:01:42 +0800 Subject: [PATCH 3/3] use SetRingToneVolume replace stopRingTone Signed-off-by: Sun Xiaojun --- .../call_voice_assistant/src/call_voice_assistant_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/call_voice_assistant/src/call_voice_assistant_manager.cpp b/services/call_voice_assistant/src/call_voice_assistant_manager.cpp index 1c2f96b5..0c6292ef 100644 --- a/services/call_voice_assistant/src/call_voice_assistant_manager.cpp +++ b/services/call_voice_assistant/src/call_voice_assistant_manager.cpp @@ -597,7 +597,7 @@ void CallVoiceAssistantManager::CallStatusDialing(const int32_t& callId, const i void CallVoiceAssistantManager::CallStatusActive(const int32_t& callId, const int32_t& accountId) { - TELEPHONY_LOGI("muteRiner before playSoundTone, [%{public}d][%{public}d]", accountId, callId); + TELEPHONY_LOGI("muteRinger before playSoundTone, [%{public}d][%{public}d]", accountId, callId); DelayedSingleton::GetInstance()->SetRingToneVolume(0.0f); VoiceAssistantRingSubscriber::Release(); PublishCommonEvent(false, std::string("call_status_active")); -- Gitee