From: 1 <1>
Date: Tue, 26 Dec 2023 10:31:23 +0000 (+0800)
Subject: 设备主动设置闹钟
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=7c1736abff552e2312c1805d09eb52d06dc0d2ab;p=mirrors%2FASR3603_Z5.git

设备主动设置闹钟
---

7c1736abff552e2312c1805d09eb52d06dc0d2ab
diff --cc 2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c
index b1f3998a,b1f3998a..9d0d99ad
--- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c
@@@ -605,7 -605,7 +605,7 @@@ const void * lang_text_ch[] = 
      "重复",
      "不重复",
      "每天",
--    "最多5个闹钟",
++    "最多3个闹钟",
  
      /* compass */
      "指南针",
diff --cc 2.sdk/sdk/gui/lv_watch/include/app_adaptor_interface.h
index 7b342e53,7b342e53..41296aaa
--- a/2.sdk/sdk/gui/lv_watch/include/app_adaptor_interface.h
+++ b/2.sdk/sdk/gui/lv_watch/include/app_adaptor_interface.h
@@@ -122,7 -122,7 +122,7 @@@ typedef struc
      uint8_t on_off;                                               // 1: alarm on, 0: alarm off
      uint8_t hour;                                                 // [0, 23]
      uint8_t min;                                                  // [0, 59]
--    uint8_t repeat_bitmap;                                        /* Bit 7: 0 means alarm once, 1 means repeat alarm */
++    uint16_t repeat_bitmap;                                        /* Bit 7: 0 means alarm once, 1 means repeat alarm */
      /* Bit 0 ~ 6 are valid if bit 7 is 1 */
      /* Bit 0: Sunday, bit 1: Monday ... bit 6: Saturday */
  } app_adaptor_alarm_t;
diff --cc 2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm.c
index 249ed8cc,fbd0aca9..74531d3d
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm.c
@@@ -427,7 -422,7 +427,7 @@@ static void alarm_ring(void
  {
      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 */
@@@ -441,7 -436,7 +441,11 @@@
                  }
                  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 
@@@ -455,7 -450,7 +459,12 @@@
                      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;
                      }
                  }
                
@@@ -525,11 -520,11 +534,12 @@@
          // 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
      {
@@@ -599,15 -594,15 +609,11 @@@ static void alarm_set_alarm(app_adaptor
     
      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 */
@@@ -633,7 -628,7 +639,7 @@@
   * 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
diff --cc 2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
index 67fe50ce,0dc7ae62..604294c6
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
@@@ -178,7 -179,7 +178,7 @@@ lv_obj_t * alarm_list_create(lv_obj_t 
      }
      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);
  	
@@@ -296,11 -297,10 +296,11 @@@ static lv_obj_t * alarm_list_add(lv_obj
  
      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);
diff --cc 2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.h
index 1f93d1b6,1f93d1b6..3b442616
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.h
@@@ -5,6 -5,6 +5,7 @@@
  #ifndef ALARM_SET_H
  #define ALARM_SET_H
  
++#define UI_UP_REMIND 1
  #ifdef __cplusplus
  extern "C" {
  #endif