解决#534,解决闹钟设置多个闹钟，只响第一个，后续的没有提示闹钟bug

修改闹钟弹窗无操作50s后自动关闭

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarmclockmanage/src/AlarmClockManage.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarmclockmanage/src/AlarmClockManage.cpp
index ce5948f..a72c47b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclockmanage/src/AlarmClockManage.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclockmanage/src/AlarmClockManage.cpp
@@ -340,7 +340,7 @@ static int32 DeleteAndUpdataListAlarmToday(uint8 id)
 
     if (node == g_alarmTodayList.end() || id > EVENT_ALARM_CLOCK_MAX) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DeleteAndUpdataListAlarmToday id is invalid, id = %u!!", id);
-        // return STATUS_ALARM_ID_INVALID;
+        return STATUS_ALARM_ID_INVALID;
     }
 
     (void)SetFirstAlarmToday(TYPE_CUR_NODE_NO_SKIP);

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 b08252d..762d468 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -357,6 +357,7 @@ extern "C"
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Scanning alarms - Current time: %02d:%02d:%02d",\r
                       curTime.tm_hour, curTime.tm_min, curTime.tm_sec);\r
 \r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_alarmCtrA.state = %d,%02d:%02d", g_alarmCtrA.state,g_alarmCtrA.info.hour ,g_alarmCtrA.info.minute);\r
         if (g_alarmCtrA.state == ALARM_STATUS_RUNNING)\r
         {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Checking Alarm A");\r
@@ -365,8 +366,8 @@ extern "C"
                 (g_alarmCtrA.info.minute == curTime.tm_min))\r
             {\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Alarm A triggered");\r
-                g_alarmCtrA.callback();\r
                 g_alarmCtrA.state = ALARM_STATUS_CREATED;\r
+                g_alarmCtrA.callback();\r
             }\r
         }\r
 \r