From e3ac18d3ec7870d0e67c248bc251906e81eeaf63 Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Tue, 27 May 2025 11:09:50 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E9=9C=87=E5=8A=A8=E6=96=B9?= =?utf8?q?=E5=BC=8F=E5=BE=85=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/callerlog/include/CallerLogModel.h | 2 ++ .../nativeui/callerlog/src/CallerLogModel.cpp | 4 ++-- .../msg_center/src/notify/makephone_notification.cpp | 11 ++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h index 6aa7511e0..0e99ab478 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h @@ -48,6 +48,8 @@ void CAT1_ChangeStatusScreendisplay(int lastStatus); void InitCallingTimer(); void calllognameupdate(void); +void InitshakeTimer(); +void DisshakeTimer(); void Call_headset_state_updata(int data); namespace OHOS { 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 6ecaa78c5..da417ba95 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp @@ -99,7 +99,7 @@ static void SetPriorityNumber() } -static void DisshakeTimer() + void DisshakeTimer() { if (g_shake != nullptr) { osStatus_t ret = osTimerDelete(g_shake); @@ -330,7 +330,7 @@ void InitCallingTimer() } } -static void InitshakeTimer() +void InitshakeTimer() { if (g_shake != nullptr) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CallerLogModel::CallerTimer already exists!!"); 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 e7dc57d39..dc25cb0b4 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 @@ -743,7 +743,7 @@ void using_cat1_phone_state_change_cb(uint8_t state) { g_callOperate = state; DisableCallTimer(CallTimerType::NOTIFY_PHONE_DIAL_DISPLAY); - + DisshakeTimer(); switch (g_callOperate) { case OPERATE_DIALING: @@ -765,11 +765,12 @@ void using_cat1_phone_state_change_cb(uint8_t state) IncomingHandle(); calllog_info_init(0); - if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get())) - { - ui_api_vibrate_once_func(); + // if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get())) + // { + // ui_api_vibrate_once_func(); - } + // } + InitshakeTimer(); call_stat=2; uapi_save_runtime_log(RUNTIME_LOG_PHONE_CAT1_INCOMING); -- 2.17.1