From a02f7592c195a1937b24c4e1d009df1cc2e38f03 Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Fri, 18 Oct 2024 20:15:36 +0800 Subject: [PATCH] =?utf8?q?=E7=94=B5=E8=AF=9D=E9=9F=B3=E9=A2=91=E4=BC=98?= =?utf8?q?=E5=8C=96(1?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/phoneservice/src/PhoneService.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 d6e3f46b8..56bf0bfef 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp @@ -38,6 +38,7 @@ #include "vibrator_service.h" #include "gfx_utils/mem_api.h" #include "ConfigModel.h" +#include "cat1_ctl.h" #ifdef __cplusplus extern "C" { #endif @@ -423,6 +424,11 @@ static void AudioUp(void) static void AudioSetup(void) { + //如果已经建立了cat1 媒体通路,不能再建立,SCO通路 + if(volte_voice_state()) + { + return; + } if (g_audioState < AUDIO_STREAM_START_DN) { AudioDn(); } @@ -643,12 +649,9 @@ static void ScoConnectPro(void) if(OHOS::CallerLogModel::GetInstance()->GetCallSource() == OHOS::CallerLogModel::CallSourceCat1 && OHOS::NotificationManager::GetInstance()->GetWatchCallStatus()) { - + TransCallToMobilePhone(); return; } - - - ScoStatusCb(HFP_SCO_STATE_CONNECTED); if (g_currCallState == HFP_HF_CALL_STATE_ACTIVE && g_scoFlag == HFP_SCO_STATE_CONNECTED) { -- 2.17.1