From eb0f452fdc6eb60e66de6b258f613edc6061d73d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com> Date: Tue, 24 Sep 2024 09:00:17 +0000 Subject: [PATCH] Merge #1005 into sdk602patch0626 from refs/changes/1005/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 胡传军 * refs/changes/1005/head: (13 commits squashed) - 修复同步实时运动数据存在的BUG - 蓝牙文件取消传输修改 - 电话bug综合修复 - 电话bug综合修复(补) - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626 - 修复电话死机问题 - 修复蓝牙通话死机问题 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626 - 修复天气json数据异常导致的死机问题,更改sos协议,更改语言切换逻辑 - 修复天气json数据异常导致的死机问题(补) - Mp3文件传输重写 - 修复自定义表盘ID不能对应问题 - 修复站立目标设置没生效bug Signed-off-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1005 --- .../fd230app/nativeui/phoneservice/src/PhoneAudio.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp index 7d8de1019..fcc491ae7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp @@ -15,7 +15,7 @@ #include "audio_errors.h" #include "wearable_log.h" #include "audio_manager_c_wrapper.h" - +#include "CallerLogModel.h" #ifdef __cplusplus extern "C" { #endif @@ -137,8 +137,12 @@ bool PhoneAudioSetMicMute(bool isMute) ret = g_amInstance.SetMicrophoneMute(isMute); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[PhoneAudioSetMicMute] end! ret = %d", ret); - AudioStreamOutSetMute(isMute); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[AudioStreamOutSetMute] end! ret = %d", ret); + if(OHOS::CallerLogModel::GetInstance()->GetCallSource() == OHOS::CallerLogModel::CallSourceCat1) + { + AudioStreamOutSetMute(isMute); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[AudioStreamOutSetMute] end! ret = %d", ret); + } + return ret; } -- 2.17.1