From 614f46a1f4eb98d0ca866c81fe2e075dd7b2c490 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Tue, 28 May 2024 20:54:32 +0800
Subject: [PATCH] =?utf8?q?heartrate=20=E6=96=87=E4=BB=B6=E5=A4=B9=E6=9B=B4?=
 =?utf8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/heartrate/include/HeartModel.h   |  2 +-
 .../heartrate/include/HeartRateView.h         |  2 +-
 .../nativeui/heartrate/src/HeartModel.cpp     | 24 +++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h
index b720bbf8f..b3e250358 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h
@@ -1,7 +1,7 @@
 #ifndef HEART_MODEL_H
 #define HEART_MODEL_H
 
-#include <time.h>
+#include <ctime>
 #include "broadcast_feature.h"
 #include "broadcast_service.h"
 #include "samgr_lite.h"
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartRateView.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartRateView.h
index 37615cb5d..11d02cc14 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartRateView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartRateView.h
@@ -35,7 +35,7 @@ namespace OHOS {
 class HeartRateView : public UICardPage {
 public:
     HeartRateView();
-    virtual ~HeartRateView();
+    ~HeartRateView() override;
     static HeartRateView *GetInstance(void);
 
     bool InitView(void);
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
index 1b2826cdf..5716f3898 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
@@ -38,21 +38,21 @@ extern "C"
     static void Notify(void *args, const Topic topic, Request *request);
 
     Subscriber heartSubscirber = {
-        .identity = NULL,
-        .args = NULL,
+        .identity = nullptr,
+        .args = nullptr,
         .Notify = Notify,
     };
 
     void HeartDataSubscribeTopic(Topic topic)
     {
-        BroadcastApi *broadcastApi = NULL;
+        BroadcastApi *broadcastApi = nullptr;
         IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
-        if (api == NULL)
+        if (api == nullptr)
         {
             return;
         }
         int result = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi);
-        if (result != 0 || broadcastApi == NULL)
+        if (result != 0 || broadcastApi == nullptr)
         {
             return;
         }
@@ -63,14 +63,14 @@ extern "C"
 
     void HearDatatUnsubscribeTopic(Topic topic)
     {
-        BroadcastApi *broadcastApi = NULL;
+        BroadcastApi *broadcastApi = nullptr;
         IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
-        if (api == NULL)
+        if (api == nullptr)
         {
             return;
         }
         int result = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi);
-        if (result != 0 || broadcastApi == NULL)
+        if (result != 0 || broadcastApi == nullptr)
         {
             return;
         }
@@ -82,7 +82,7 @@ extern "C"
     {
         UNUSED(args);
         UNUSED(topic);
-        if (request == NULL)
+        if (request == nullptr)
         {
             return;
         }
@@ -93,7 +93,7 @@ extern "C"
             if (rets != EOK)
             {
                 free(heartInfo);
-                heartInfo = NULL;
+                heartInfo = nullptr;
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "memcpy_s heartRateData fail！ ret = %d", rets);
                 return;
             }
@@ -104,7 +104,7 @@ extern "C"
             {
                 uint16_t index_ = HeartModel::GetInstance()->GetIndex();
                 HeartDatas *heartInfo = (HeartDatas *)malloc(sizeof(HeartDatas));
-                if (heartInfo == NULL)
+                if (heartInfo == nullptr)
                 {
                     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[Notify] malloc fail");
                 }
@@ -129,7 +129,7 @@ extern "C"
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateData = %d %d", heartInfo->index, preheart);
                 OHOS::HeartModel::GetInstance()->HeartRatePros(heartInfo);
                 free(heartInfo);
-                heartInfo = NULL;
+                heartInfo = nullptr;
             }
         }
         if (request->msgId == TOPIC_EVENT_NEXTDAY_UPDATE)
-- 
2.17.1