alarmclocktimerconfig 文件夹更新

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
index 2e55775..56ba901 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -4,9 +4,9 @@
  * Create: 2021-09-22\r
  */\r
 \r
-#include <time.h>\r
+#include <ctime>\r
 #include <sys/time.h>\r
-#include <stdio.h>\r
+#include <cstdio>\r
 #include "wearable_log.h"\r
 #include "securec.h"\r
 #include "broadcast_service.h"\r
@@ -24,21 +24,21 @@ extern "C" {
 \r
 static AlarmCtrl g_alarmCtrA;\r
 static AlarmCtrl g_alarmCtrB;\r
-static osTimerId_t g_AlarmHandle = NULL;\r
+static osTimerId_t g_AlarmHandle = nullptr;\r
 \r
 void AlarmTimerEventPublish(uint16 topic, AlarmClockEventData data)\r
 {\r
     int32 ret;\r
     uint32 size = sizeof(AlarmClockEventData);\r
-    Request *request = NULL;\r
-    BroadcastApi *broadcastApi = NULL;\r
-    IUnknown *api = NULL;\r
+    Request *request = nullptr;\r
+    BroadcastApi *broadcastApi = nullptr;\r
+    IUnknown *api = nullptr;\r
 \r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmTimerEventPublish topic=%u!!", topic);\r
 \r
     /* alloc request */\r
     request = SAMGR_AllocRequestMsg(0, PLATFORM_CORE, BROADCAST_SVR_ID, size);\r
-    if (request == NULL) {\r
+    if (request == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SAMGR_AllocRequestMsg failed");\r
         return;\r
     }\r
@@ -53,13 +53,13 @@ void AlarmTimerEventPublish(uint16 topic, AlarmClockEventData data)
 \r
     /* public request */\r
     api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);\r
-    if (api == NULL) {\r
+    if (api == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetFeatureApi failed");\r
         SAMGR_FreeRequestMsg(request);\r
         return;\r
     }\r
     ret = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi);\r
-    if (ret != 0 || broadcastApi == NULL) {\r
+    if (ret != 0 || broadcastApi == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "QueryInterface failed");\r
         SAMGR_FreeRequestMsg(request);\r
         return;\r
@@ -97,7 +97,7 @@ void AlarmScan(void *arg)
     }\r
 \r
     if (g_alarmCtrA.state == ALARM_STATUS_RUNNING) {\r
-        if ((g_alarmCtrA.callback != NULL) &&\r
+        if ((g_alarmCtrA.callback != nullptr) &&\r
             (g_alarmCtrA.info.hour == curTime.tm_hour) &&\r
             (g_alarmCtrA.info.minute == curTime.tm_min)) {\r
             g_alarmCtrA.callback();\r
@@ -106,7 +106,7 @@ void AlarmScan(void *arg)
     }\r
 \r
     if (g_alarmCtrB.state == ALARM_STATUS_RUNNING) {\r
-        if ((g_alarmCtrB.callback != NULL) &&\r
+        if ((g_alarmCtrB.callback != nullptr) &&\r
             (g_alarmCtrB.info.week == curTime.tm_wday) &&\r
             (g_alarmCtrB.info.hour == curTime.tm_hour) &&\r
             (g_alarmCtrB.info.minute == curTime.tm_min)) {\r
@@ -118,7 +118,7 @@ void AlarmScan(void *arg)
 \r
 static int32_t AlarmCreate(AlarmCtrl *alarmCtrl, AlarmCallBack callback)\r
 {\r
-    if (alarmCtrl == NULL) {\r
+    if (alarmCtrl == nullptr) {\r
         return ERRCODE_FAIL;\r
     }\r
     if (alarmCtrl->state == ALARM_STATUS_UNUSED) {\r
@@ -135,8 +135,8 @@ int32_t AlarmTimerInit(void)
 \r
     g_alarmCtrA.state = ALARM_STATUS_UNUSED;\r
     g_alarmCtrB.state = ALARM_STATUS_UNUSED;\r
-    g_AlarmHandle = osTimerNew(AlarmScan, osTimerPeriodic, NULL, NULL);\r
-    if (g_AlarmHandle == NULL) {\r
+    g_AlarmHandle = osTimerNew(AlarmScan, osTimerPeriodic, nullptr, nullptr);\r
+    if (g_AlarmHandle == nullptr) {\r
         return ERRCODE_FAIL;\r
     }\r
     timerStatus = osTimerStart(g_AlarmHandle, ALARM_INTERVAL_MS);\r
@@ -185,10 +185,10 @@ int32_t SetZeroAlarm(void)
 \r
 int32_t AlarmGetCurrentTimeInfo(struct tm *timeInfo)\r
 {\r
-    if (timeInfo == NULL) {\r
+    if (timeInfo == nullptr) {\r
         return ERRCODE_FAIL;\r
     }\r
-    time_t sec = time(NULL);\r
+    time_t sec = time(nullptr);\r
     localtime_r(&sec, timeInfo);\r
     return ERRCODE_SUCC;\r
 }\r