Merge #1005 into sdk602patch0626 from refs/changes/1005/head
author胡传军 <1224667075@qq.com>
Tue, 24 Sep 2024 09:00:17 +0000 (09:00 +0000)
committerSnickerSun <snickersun@163.com>
Thu, 10 Oct 2024 06:24:22 +0000 (14:24 +0800)
Code review from 胡传军

* refs/changes/1005/head: (13 commits squashed)

  - 修复同步实时运动数据存在的BUG

  - 蓝牙文件取消传输修改

  - 电话bug综合修复

  - 电话bug综合修复(补)

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

  - 修复电话死机问题

  - 修复蓝牙通话死机问题

  - Merge branch &#39;sdk602patch0626&#39; 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 <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1005
code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp

index 7d8de10..fcc491a 100644 (file)
@@ -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;
 }