From: hcj <1224667075@qq.com> Date: Wed, 7 Aug 2024 09:19:09 +0000 (+0800) Subject: 修复无法退出BUG X-Git-Tag: release_V1.2.70_20241020_135402~690^2~6 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F659%2F2;p=mirrors%2FFD230.git 修复无法退出BUG --- 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 734d2ef31..da2f6d624 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 @@ -785,13 +785,15 @@ void MsgCenterNotifyCat1CallConnectedProc(const Topic topic, Request* req) { return; } + SetMicMute(false); AlarmClockModel::GetInstance()->AlarmPlayerStop(); NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_ONE); //CallerLogModel::GetInstance()->SetNotifyFlag(true); + cat1_phone_state_change_cb(OPERATE_WATCH_ACTIVE); //NotificationManager::GetInstance()->ShowNotify(CreateCallingView, (uint16_t)topic, true); CallerLogModel::GetInstance()->SetCallSource(CallerLogModel::CallSource::CallSourceCat1); - NotificationManager::GetInstance()->SetWatchCallStatus(false); + NotificationManager::GetInstance()->SetWatchCallStatus(true); } @@ -842,8 +844,13 @@ void MsgCenterNotifyCat1CallEndedProc(const Topic topic, Request* req) unused(req); // just stop the notify AlarmClockModel::GetInstance()->AlarmPlayerStop(); + if(!NotificationManager::GetInstance()->GetWatchCallStatus()) + { + return; + } cat1_phone_state_change_cb(OPERATE_WATCH_FINISH); + SetMicMute(false); // if (CallerLogModel::GetInstance()->GetNotifyFlag() == true) { // NotificationManager::GetInstance()->StopNotify(); // addcalllog();