合并

diff --cc code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
index 3bb082a,62e5091..6571a18
--- 1/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@@ -335,22 -335,8 +335,19 @@@ extern "C
          SetZeroAlarm(); // 重置闹钟\r
      }\r
  \r
 +    static void on_time_CallBackProc(void)\r
 +    {\r
 +        AlarmClockEventData unuse;\r
 +        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "on_time_CallBackProc invoked");\r
 +        AlarmTimerEventPublish(TOPIC_EVENT_ON_TIME, unuse);\r
 +        // GraphicService::GetInstance()->PostGraphicEvent(\r
 +        //     std::bind(AlarmTimerEventPublish, TOPIC_EVENT_ON_TIME, unuse));\r
 +\r
 +        // AlarmTimerEventPublish(TOPIC_EVENT_ON_TIME, unuse);\r
 +    }\r
 +\r
      void AlarmScan(void *arg)\r
      {\r
- \r
-         \r
- \r
          struct tm curTime;\r
          int32_t ret = AlarmGetCurrentTimeInfo(&curTime);\r
          if (ret != ERRCODE_SUCC)\r