From 45ff1384805c4ef0f9fef4faecbe247b32376616 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com> Date: Mon, 21 Oct 2024 02:19:39 +0000 Subject: [PATCH] Merge #1227 into sdk602patch0911 from refs/changes/1227/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 胡传军 * refs/changes/1227/head: (7 commits squashed) - 先关闭4G电话对麦克风管理，可能导致音频系统锁死 - 修复电话界面动画问题 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911 - 增加最大数量表盘限制，待测试 ，修改BLE打印日志 - 修改获取全部表盘id接口防止越界 - 电话修改 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911 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/1227 --- .../nativeui/callerlog/src/CallerLogModel.cpp | 11 ++++++++++- .../msg_center/src/notify/makephone_notification.cpp | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp index 565490f98..04b870c17 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp @@ -761,7 +761,7 @@ static void ScoConnectHandle(void) case HFP_HF_CALL_STATE_ACTIVE: if (g_callOperate == OPERATE_PHONE_ACTIVE) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[ScoConnectHandle] OPERATE_PHONE_ACTIVE"); - // TransCallToMobilePhone(); + TransCallToMobilePhone(); return; } CallerLogModel::GetInstance()->SetCallStatus(true); @@ -772,8 +772,17 @@ static void ScoConnectHandle(void) CallerLogModel::GetInstance()->SetMakePhoneStatus(true); break; case HFP_HF_CALL_STATE_DIALING: + + if(OHOS::CallerLogModel::GetInstance()->GetCallDial() == OHOS::CallerLogModel::HFP_PHONE_DIAL) + { + TransCallToMobilePhone(); + return; + } + CallerLogModel::GetInstance()->SetDialingStatus("正在拨号"); CallerLogModel::GetInstance()->SetMakePhoneStatus(true); + + break; case HFP_HF_CALL_STATE_INCOMING: CallerLogModel::GetInstance()->SetMakePhoneStatus(false); diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp index 2ea9ca6bc..cd1ab011d 100755 --- a/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp @@ -103,7 +103,7 @@ void start_SOS_phone_dail(void) #if SOS_TEST_FLAG if(1) #else - if(uapi_cat1_get_power_stat()|| uapi_dev_runtime_get_cat1_simstat()) + if(uapi_cat1_get_power_stat() && uapi_dev_runtime_get_cat1_simstat()) #endif { calldial_event_sendmsg_toUI(OHOS::get_sos_number(0)); @@ -513,7 +513,7 @@ static void IncomingHandle(void) CallerLogModel::GetInstance()->SetMakePhoneStatus(false); InitCallingTimer(); - + DisableCallTimer(CallTimerType::NOTIFY_PHONE_DIAL_DISPLAY); } -- 2.17.1