From bb8a858d8aa01b7873b6f6d521176ad4221bdff8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com> Date: Wed, 6 Nov 2024 09:53:17 +0000 Subject: [PATCH] Merge #1355 into sdk602patch0911 from refs/changes/1355/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 胡传军 * refs/changes/1355/head: (5 commits squashed) - 蓝牙优化通话 - 蓝牙铃声改为本地铃声，仍需多手机，多场景验证 - 电话来电铃声修改 - next day 修改 - 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: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1355 --- .../fd230app/nativeui/activity/src/ActivityModel.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp index a8ef9398d..f0948c363 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp @@ -129,7 +129,8 @@ static void Notify(void *args, const Topic topic, Request* request) return; } - if (request->msgId == TOPIC_EVENT_STEPDATA_UPDATE) { + if (request->msgId == TOPIC_EVENT_STEPDATA_UPDATE) + { if (request->data == nullptr) { return; } @@ -149,7 +150,7 @@ static void Notify(void *args, const Topic topic, Request* request) GraphicService::GetInstance()->PostGraphicEvent( std::bind(&ActivityModel::SetStepData, ActivityModel::GetInstance(), counter)); RefreshStepControls(counter, TOPIC_EVENT_STEPDATA_UPDATE); - } + #ifdef FD230 if(OHOS::GoalView::GetInstance()) @@ -222,7 +223,7 @@ static void Notify(void *args, const Topic topic, Request* request) } } } - + } #endif if (request->msgId == TOPIC_EVENT_NEXTDAY_UPDATE) { -- 2.17.1