rtcservice 文件夹更新

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rtcservice/src/RtcService.cpp b/code/sdk/application/wearable/fd230app/nativeui/rtcservice/src/RtcService.cpp
index d96f44d..088111b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rtcservice/src/RtcService.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rtcservice/src/RtcService.cpp
@@ -4,8 +4,8 @@
  * Create: 2021-09-22
  */
 
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 #include "memory_adapter.h"
 #include "ohos_init.h"
 #include "samgr_lite.h"
@@ -37,7 +37,7 @@ static RtcService g_rtcService = {
     .MessageHandle = ServiceMessageHandle,
     .GetTaskConfig = GetServiceTaskConfig,
     .subscirber = {
-        .identity = NULL,
+        .identity = nullptr,
         .args = &g_rtcService,
         .Notify = Notify,
     },
@@ -78,23 +78,11 @@ static BOOL ServiceInitialize(Service *service, Identity identity)
 
 static BOOL ServiceMessageHandle(Service *service, Request *request)
 {
-    AlarmClockQueueMsg *info = NULL;
-
     (void)service;
-    if (request == NULL) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ServiceMessageHandle request is invalid!!");
+    if (request == nullptr) {
         return FALSE;
     }
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ServiceMessageHandle addr = %p", request);
-
-    info = (AlarmClockQueueMsg *)(request->data);
-    if (info == NULL) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ServiceMessageHandle info is invalid!!");
-        return FALSE;
-    }
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ServiceMsgProcess addr = %p %p", request->data, request);
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ServiceMsgProcess type = %lu ", info->eventType);
-    AlmmgrAlarmClockEventProcess(info);
+    SAMGR_FreeRequestMsg(request);
     return TRUE;
 }
 
@@ -108,18 +96,18 @@ static TaskConfig GetServiceTaskConfig(Service *service)
 static void SubscribeTopic(Topic topic)
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Rtc Subscribe Topic=%u!!", topic);
-    BroadcastApi *broadcastApi = NULL;
+    BroadcastApi *broadcastApi = nullptr;
 
     IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
-    if (api == NULL) {
+    if (api == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SubscribeTopic GetFeatureApi %s %s failed!!",
-                    BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
+                      BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
         return;
     }
     int result = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi);
-    if (result != 0 || broadcastApi == NULL) {
+    if (result != 0 || broadcastApi == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SubscribeTopic QueryInterface %s %s failed!!",
-                    BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
+                      BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
         return;
     }
 
@@ -131,18 +119,18 @@ static void SubscribeTopic(Topic topic)
 void UnsubscribeTopic(Topic topic)
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Rtc Unsubscribe Topic=%u!!", topic);
-    BroadcastApi *broadcastApi = NULL;
+    BroadcastApi *broadcastApi = nullptr;
 
     IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
-    if (api == NULL) {
+    if (api == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UnsubscribeTopic GetFeatureApi %s %s failed!!",
-                    BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
+                      BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
         return;
     }
     int result = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi);
-    if (result != 0 || broadcastApi == NULL) {
+    if (result != 0 || broadcastApi == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UnsubscribeTopic QueryInterface %s %s failed!!",
-                    BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
+                      BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
         return;
     }
 
@@ -156,16 +144,18 @@ static void Notify(void *args, const Topic topic, Request* req)
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Rtc Notify:");
     AlarmClockQueueMsg eventMsg;
 
-    if (req == NULL || args == NULL) {
+    if (req == nullptr || args == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Notify para invalid!!");
         return;
     }
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "args=0x%p, topic=%d", args, topic);
 
     (void)memset_s(&eventMsg, sizeof(AlarmClockQueueMsg), 0, sizeof(AlarmClockQueueMsg));
-    if (topic == TOPIC_EVENT_ALARM_RING || topic == TOPIC_EVENT_NEXTDAY_UPDATE) {
+    if (topic == TOPIC_EVENT_ALARM_RING) {
         eventMsg.eventType = EVENT_ALARM_RING;
         AlmmgrAlarmClockEventProcess(&eventMsg);
+    } else if (topic == TOPIC_EVENT_NEXTDAY_UPDATE) {
+        UpdataListAndFirstAlarmToday();
     } else if (topic == TOPIC_EVENT_UTCTIME_UPDATE) {
         UpdataListAndFirstAlarmToday();
     } else {