From 4315de96f40d21e9e7391e9af891395d7679dd04 Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Tue, 8 Oct 2024 15:42:13 +0800 Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0ota=E4=BC=A0=E8=BE=93=E6=97=B6?= =?utf8?q?=E8=87=AA=E5=8A=A8=E6=8B=92=E6=8E=A5=E6=9D=A5=E7=94=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../service/msg_center/include/notify/transmitting.h | 1 + .../service/msg_center/src/msg_center_customer.cpp | 2 +- .../msg_center/src/notify/makephone_notification.cpp | 2 +- .../service/msg_center/src/notify/transmitting.cpp | 8 +++++++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/code/sdk/application/wearable/service/msg_center/include/notify/transmitting.h b/code/sdk/application/wearable/service/msg_center/include/notify/transmitting.h index 7cf3b5bf8..d5371ae8c 100644 --- a/code/sdk/application/wearable/service/msg_center/include/notify/transmitting.h +++ b/code/sdk/application/wearable/service/msg_center/include/notify/transmitting.h @@ -19,6 +19,7 @@ extern "C" { #endif UIViewGroup* transmittingShow(void); + bool transmittingISShow(void); void set_transmittingShow_falg(uint8_t falg); void Freetransmitting(void); diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp index de9b71212..f02c16271 100644 --- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp @@ -938,7 +938,7 @@ void MsgCenterNotifyCatIncomingCallProc(const Topic topic, Request* req) } if((NotificationManager::GetInstance()->GetWatchCallStatus() && - (CallerLogModel::GetInstance()->GetCallSource()==CallerLogModel::CallSourcePhone)) || uapi_dev_runtime_get_train_status()) + (CallerLogModel::GetInstance()->GetCallSource()==CallerLogModel::CallSourcePhone)) || uapi_dev_runtime_get_train_status() || transmittingISShow()) { CallerLogModel::GetInstance()->tempSetoperateNumberCAT1(call_data,req->len); 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 66ba68590..98ce8703c 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 @@ -556,7 +556,7 @@ static void WatchFinishHandle(void) { addcalllog(); } - else if(uapi_dev_runtime_get_train_status()) + else if(uapi_dev_runtime_get_train_status() || transmittingISShow()) { addcalllog(); StatusReset(); diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp index 990561e83..71bc38beb 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp @@ -853,7 +853,13 @@ namespace OHOS } - + bool transmittingISShow(void) + { + if(UIViewGroup_transmitting) + return true; + else + return false; + } UIViewGroup *transmittingShow() { -- 2.17.1