From: hcj <1224667075@qq.com> Date: Sun, 20 Oct 2024 09:45:41 +0000 (+0800) Subject: 电话修改 X-Git-Tag: fd230_release_V1.3.102~193^2~1^2~20 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=9ce6a6f177bd1758e889af300c064e63e4c0362d;p=mirrors%2FFD230.git 电话修改 --- 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); }