{
printf("%s\n", __FUNCTION__);
bool alarm_changed = false;
-- bool alarm_shutdown_falg = false;
++ uint_8 alarm_shutdown_falg = 0;
if(alarm_recent_index >= 0) {
/* set alarm off */
}
if((alarms[i].repeat_bitmap & 0x0100))
{
-- alarm_shutdown_falg = true;
++ alarm_shutdown_falg = 1;
++ }
++ if((alarms[i].repeat_bitmap & 0x0200))
++ {
++ alarm_shutdown_falg = 2;
}
}
else
alarm_changed = true;
if((alarms[i].repeat_bitmap & 0x0100))
{
-- alarm_shutdown_falg = true;
++ alarm_shutdown_falg = 1;
++ }
++
++ if((alarms[i].repeat_bitmap & 0x0200))
++ {
++ alarm_shutdown_falg = 2;
}
}
// extern TESE;
// goto TEST;
// gui_main();
-- watch_wakeup_lcd(true);
-- shutdown_alarm_create(NULL);
-- timer_shutdwon = Hal_Timer_Start(1000*10,shutdown_timeout, NULL, 1);
--
--
++ if(alarm_shutdown_falg==1)
++ {
++ watch_wakeup_lcd(true);
++ shutdown_alarm_create(NULL);
++ timer_shutdwon = Hal_Timer_Start(1000*10,shutdown_timeout, NULL, 1);
++ }
}
else
{
for(uint8_t i = 2; i < count+2; i++)
{
-- printf("alarm%d\n",alarms[i].repeat_bitmap);
Hal_Mem_Set(&alarms[i],0,sizeof(app_adaptor_alarm_t));
}
for(uint8_t i = 0; i < count; i++)
{
-- printf("alarm%d\n",alarms[i+2].repeat_bitmap);
-- Hal_Mem_Copy(&alarms[i+2], alarm + i, sizeof(app_adaptor_alarm_t));
-- printf("写后alarm%d\n",alarms[i+2].repeat_bitmap);
--
++ Hal_Mem_Copy(&alarms[i+2], alarm + i, sizeof(app_adaptor_alarm_t));
}
/* write to NVM */
* param (in) alarms: app_adaptor_alarm_t *
* return VOID
*/
--static void alarm_set_recent_to_rtc(app_adaptor_alarm_t * alarm)
++static void alarm_set_recent_to_rtc(app_adaptor_alarm_t * alarm)
{
hal_rtc_t rtc_curr; // current rtc time
hal_rtc_t rtc_alarm; // alarm rtc time
}
Hal_Mem_Free(alarm);
--#ifdef __MMI_ZHSX_SUPPORT__
++#if UI_UP_REMIND
lv_obj_set_hidden(btn_add, true);
lv_obj_set_hidden(img_add, true);
lv_page_glue_obj(btn, true);
lv_obj_add_protect(btn, LV_PROTECT_PRESS_LOST);
-#ifdef __MMI_ZHSX_SUPPORT__
- lv_obj_set_event_cb(btn, NULL);
-#else
+ //lv_obj_set_event_cb(btn, alarm_list_edit_btn_action);
- #ifdef __MMI_ZHSX_SUPPORT__
- lv_obj_set_event_cb(btn, NULL);
- #else
++#if UI_UP_REMIND
lv_obj_set_event_cb(btn, alarm_list_edit_btn_action);
++#else
++ lv_obj_set_event_cb(btn, NULL);
#endif
lv_watch_set_free_num(btn, index);
lv_watch_obj_add_element(btn);