From: luozheng <1732036298@qq.com>
Date: Tue, 10 Sep 2024 13:10:16 +0000 (+0800)
Subject: 解决#534,解决闹钟设置多个闹钟，只响第一个，后续的没有提示闹钟bug
X-Git-Tag: release_V1.2.70_20241020_135402~485^2^2~22
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=a945433a34f8485d37346cd1b489ac31cef6ee05;p=mirrors%2FFD230.git

解决#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 ce5948f36..a72c47b0f 100644
--- 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 b08252dfb..762d46830 100644
--- 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",
                       curTime.tm_hour, curTime.tm_min, curTime.tm_sec);
 
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_alarmCtrA.state = %d,%02d:%02d", g_alarmCtrA.state,g_alarmCtrA.info.hour ,g_alarmCtrA.info.minute);
         if (g_alarmCtrA.state == ALARM_STATUS_RUNNING)
         {
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Checking Alarm A");
@@ -365,8 +366,8 @@ extern "C"
                 (g_alarmCtrA.info.minute == curTime.tm_min))
             {
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Alarm A triggered");
-                g_alarmCtrA.callback();
                 g_alarmCtrA.state = ALARM_STATUS_CREATED;
+                g_alarmCtrA.callback();
             }
         }