From: hcj <1224667075@qq.com> Date: Sat, 12 Oct 2024 11:14:13 +0000 (+0800) Subject: 去除电话误设的NOtif优先级,避免误拦截其余NOTIF X-Git-Tag: release_V1.2.70_20241020_135402~59^2~5 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=a915308b8c4af0bf0fe692e45b02671e240a6229;p=mirrors%2FFD230.git 去除电话误设的NOtif优先级,避免误拦截其余NOTIF --- 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 3c0d04a6a..259ccb7d1 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 @@ -916,7 +916,7 @@ void MsgCenterNotifyCatIncomingCallProc(const Topic topic, Request* req) CallerLogModel::GetInstance()->SetoperateNumber(call_data,strlen(call_data)); CallerLogModel::GetInstance()->SetCallSource(CallerLogModel::CallSource::CallSourceCat1); NotificationManager::GetInstance()->SetWatchCallStatus(true); - NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_ONE); + // NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_ONE); cat1_phone_state_change_cb(OPERATE_INCOMING); } @@ -937,7 +937,7 @@ void MsgCenterNotifyCat1CallConnectedProc(const Topic topic, Request* req) SetMicMute(false); AlarmClockModel::GetInstance()->AlarmPlayerStop(); //AlarmViewEventListener::GetInstance()->CancelAlarmRing(); - NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_ONE); + // NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_ONE); cat1_phone_state_change_cb(OPERATE_WATCH_ACTIVE); CallerLogModel::GetInstance()->SetCallSource(CallerLogModel::CallSource::CallSourceCat1); NotificationManager::GetInstance()->SetWatchCallStatus(true); @@ -1547,7 +1547,7 @@ void MsgCenterNotifybleTransmit(const Topic topic, Request* req) { unused(topic); uint8_t* data=(uint8_t*)req->data; - NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_ONE); + if(data[0]==TRANS_FREE) { @@ -1558,6 +1558,7 @@ void MsgCenterNotifybleTransmit(const Topic topic, Request* req) { set_transmittingShow_falg(data[0]); + NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_ONE); NotificationManager::GetInstance()->ShowNotify(showtransmitNotify, (uint16_t)topic, true); }