heartrate 文件夹更新

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 b720bbf..b3e2503 100644 (file)
--- 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\r
 #define HEART_MODEL_H\r
 \r
-#include <time.h>\r
+#include <ctime>\r
 #include "broadcast_feature.h"\r
 #include "broadcast_service.h"\r
 #include "samgr_lite.h"\r

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 37615cb..11d02cc 100644 (file)
--- 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 {\r
 public:\r
     HeartRateView();\r
-    virtual ~HeartRateView();\r
+    ~HeartRateView() override;\r
     static HeartRateView *GetInstance(void);\r
 \r
     bool InitView(void);\r

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 1b2826c..5716f38 100644 (file)
--- 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);\r
 \r
     Subscriber heartSubscirber = {\r
-        .identity = NULL,\r
-        .args = NULL,\r
+        .identity = nullptr,\r
+        .args = nullptr,\r
         .Notify = Notify,\r
     };\r
 \r
     void HeartDataSubscribeTopic(Topic topic)\r
     {\r
-        BroadcastApi *broadcastApi = NULL;\r
+        BroadcastApi *broadcastApi = nullptr;\r
         IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);\r
-        if (api == NULL)\r
+        if (api == nullptr)\r
         {\r
             return;\r
         }\r
         int result = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi);\r
-        if (result != 0 || broadcastApi == NULL)\r
+        if (result != 0 || broadcastApi == nullptr)\r
         {\r
             return;\r
         }\r
@@ -63,14 +63,14 @@ extern "C"
 \r
     void HearDatatUnsubscribeTopic(Topic topic)\r
     {\r
-        BroadcastApi *broadcastApi = NULL;\r
+        BroadcastApi *broadcastApi = nullptr;\r
         IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);\r
-        if (api == NULL)\r
+        if (api == nullptr)\r
         {\r
             return;\r
         }\r
         int result = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi);\r
-        if (result != 0 || broadcastApi == NULL)\r
+        if (result != 0 || broadcastApi == nullptr)\r
         {\r
             return;\r
         }\r
@@ -82,7 +82,7 @@ extern "C"
     {\r
         UNUSED(args);\r
         UNUSED(topic);\r
-        if (request == NULL)\r
+        if (request == nullptr)\r
         {\r
             return;\r
         }\r
@@ -93,7 +93,7 @@ extern "C"
             if (rets != EOK)\r
             {\r
                 free(heartInfo);\r
-                heartInfo = NULL;\r
+                heartInfo = nullptr;\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "memcpy_s heartRateData fail！ ret = %d", rets);\r
                 return;\r
             }\r
@@ -104,7 +104,7 @@ extern "C"
             {\r
                 uint16_t index_ = HeartModel::GetInstance()->GetIndex();\r
                 HeartDatas *heartInfo = (HeartDatas *)malloc(sizeof(HeartDatas));\r
-                if (heartInfo == NULL)\r
+                if (heartInfo == nullptr)\r
                 {\r
                     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[Notify] malloc fail");\r
                 }\r
@@ -129,7 +129,7 @@ extern "C"
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateData = %d %d", heartInfo->index, preheart);\r
                 OHOS::HeartModel::GetInstance()->HeartRatePros(heartInfo);\r
                 free(heartInfo);\r
-                heartInfo = NULL;\r
+                heartInfo = nullptr;\r
             }\r
         }\r
         if (request->msgId == TOPIC_EVENT_NEXTDAY_UPDATE)\r