From 7e34d8632c91e74cb646cd73b3efccfe5b7c80ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com> Date: Fri, 8 Nov 2024 07:37:40 +0000 Subject: [PATCH] Merge #1373 into sdk602patch0911 from refs/changes/1373/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 胡传军 * refs/changes/1373/head: (5 commits squashed) - 取消 activity多余的订阅消息 - 取消订阅 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911 - 修改4G电话处理流程，改为postgraphicevent - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911 Signed-off-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: Caisking <3449750381@qq.com> Reviewed-by: 罗正 <1732036298@qq.com> Reviewed-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Reviewed-by: aliyun6865282430 <1624952103@qq.com> Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1373 --- .../nativeui/phoneservice/src/PhoneService.cpp | 4 ++-- .../service/msg_center/src/msg_center_customer.cpp | 9 +++++++-- .../msg_center/src/notify/makephone_notification.cpp | 10 ++++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp index 3fc9c86df..aebaa748b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp @@ -1498,7 +1498,7 @@ static void PlayWatchRing(void) { OHOS::AlarmClockModel::GetInstance()->testPlayerStart(RING_MUSIC); - //g_audioState = AUDIO_ACT_INTERRUPT_WATCH_RING; + //g_audioState = AUDIO_ACT_INTERRUPT_WATCH_RING; } } @@ -1513,7 +1513,7 @@ static void CallAudioHandle(const hfp_hf_calls_info_t *call) if (state == HFP_HF_CALL_STATE_INCOMING || state == HFP_HF_CALL_STATE_DIALING || state == HFP_HF_CALL_STATE_ALERTING) { // 电话呼入，支持播放手机铃声 - if (call->in_band_ring) { + if (call->in_band_ring && state != HFP_HF_CALL_STATE_INCOMING) { { // 播放手机端铃声 PostGraphicEvent(AudioDn); 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 5364d14cb..19d9af34a 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 @@ -439,11 +439,16 @@ void MsgCenterNotifystepProc(const Topic topic, Request* req) if(OHOS::GoalView::GetInstance()) { - OHOS::GoalView::GetInstance()->GoalViewrefresh(); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::GoalView::GoalViewrefresh, OHOS::GoalView::GetInstance() )); + + // OHOS::GoalView::GetInstance()->GoalViewrefresh(); } if(OHOS::GoalotherView::GetInstance()) { - OHOS::GoalotherView::GetInstance()->GoalViewrefresh(); + //OHOS::GoalotherView::GetInstance()->GoalViewrefresh(); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::GoalotherView::GoalViewrefresh, OHOS::GoalotherView::GetInstance() )); } if(OHOS::GoalModel::GetInstance().getstepvalue()>=100) 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 98b255a73..f6edaf9ac 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 @@ -598,9 +598,9 @@ static void WatchFinishHandle(void) DisableCallTimer(CallTimerType::NOTIFY_PHONE_DIAL_DISPLAY); } -void cat1_phone_state_change_cb(uint8_t state) +void using_cat1_phone_state_change_cb(uint8_t state) { - g_callOperate = state; + g_callOperate = state; switch (g_callOperate) { case OPERATE_DIALING: @@ -660,6 +660,12 @@ void cat1_phone_state_change_cb(uint8_t state) CAT1_ChangeStatusScreendisplay(g_callOperate); } +void cat1_phone_state_change_cb(uint8_t state) +{ + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(using_cat1_phone_state_change_cb,state)); +} + // PhoneCallInfo tmp; -- 2.17.1