Merge #1355 into sdk602patch0911 from refs/changes/1355/head

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 <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1355

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 a8ef939..f0948c3 100644 (file)
--- 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) {