From: SnickerSun <snickersun@163.com>
Date: Mon, 2 Sep 2024 11:42:23 +0000 (+0800)
Subject: 修复bug#331 隔天计步不清零
X-Git-Tag: release_V1.2.70_20241020_135402~540^2~7^2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F856%2Fhead;p=mirrors%2FFD230.git

修复bug#331 隔天计步不清零
---

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 d9c1f3767..f6dd3e782 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -343,7 +343,7 @@ extern "C"
                 (g_alarmCtrA.info.hour == curTime.tm_hour) &&
                 (g_alarmCtrA.info.minute == curTime.tm_min))
             {
-                g_alarmCtrA.callback();
+                g_alarmCtrA.callback(); 
                 g_alarmCtrA.state = ALARM_STATUS_CREATED;
             }
         }
@@ -351,13 +351,13 @@ extern "C"
         if (g_alarmCtrB.state == ALARM_STATUS_RUNNING)
         {
             if ((g_alarmCtrB.callback != NULL) &&
-                //(g_alarmCtrB.info.week == curTime.tm_wday) &&
+                (g_alarmCtrB.info.week == curTime.tm_wday) &&
                 (g_alarmCtrB.info.hour == curTime.tm_hour) &&
                 (g_alarmCtrB.info.minute == curTime.tm_min) &&
                 (g_alarmCtrB.info.second == curTime.tm_sec))
             {
-                g_alarmCtrB.callback();
                 g_alarmCtrB.state = ALARM_STATUS_CREATED;
+                g_alarmCtrB.callback();//由于只有callback中SetZeroAlarm会设置state为ALARM_STATUS_RUNNING , 所以必须把state=ALARM_STATUS_CREATED提前，或者干脆删除。
             }
         }
         // 整点回调