From: @CHENG <2393524978@qq.com> Date: Wed, 17 Jan 2024 09:01:10 +0000 (+0800) Subject: xiuzheng X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=72933fc9bc48806d59f1aeb369e0e329f9395d97;p=mirrors%2FASR3603_Z5.git xiuzheng --- diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm.c b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm.c index 74531d3d..a1422863 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm.c @@ -9,7 +9,7 @@ #include #include "lv_watch.h" -#if 1 +#if USE_LV_WATCH_ALARM /********************* * DEFINES @@ -279,14 +279,13 @@ void alarm_shutdown(hal_rtc_t * poweron_time) void alarm_set_alarm_by_ui(app_adaptor_alarm_t * alarm, uint8_t count) { alarm_set_alarm(alarm, count); - mmi_protocol_fzd_action_UP_REMIND(alarm,NV_ALARM_MAX_ALARM_NUM_t); + //indicate alarm to APP if(alarm_ind_func) { alarm_ind_func(alarm, count); } } - void alarm_set_alarm_by_ui_shutdwon(app_adaptor_alarm_t * alarm, uint8_t count) { alarm_set_shutdwon_alarm(alarm, count); @@ -338,6 +337,7 @@ static void alarm_prepare_destory(lv_obj_t * activity_obj) /* stop playing tone */ Hal_Tone_Play_End(); + Hal_Vibrator_Play_End(); lv_alarm_obj_ext_t * ext = alarm_get_ext(); if(ext) { @@ -410,7 +410,19 @@ void alarm_audio_ctrl_callback(AUDIO_CTRL_PRIORITY priority) if(activity_obj != NULL) return; /* play tone start */ - Hal_NFFS_File_Play_Repeat(AUDIO_ALARM, query_current_volume()); + uint8_t volume = 0; + #ifdef __MMI_USER_PROFILE_SUPPORT__ + volume = mmi_user_profile_current_mode_alarm_volume_get(); + #else + volume = query_current_volume(); + #endif + Hal_NFFS_File_Play_Repeat(AUDIO_ALARM, volume); + + // vibrate + if(true == mmi_watch_vibrate_is_permitted()) + { + Hal_Vibrator_Play_Repeat(); + } watch_wakeup_lcd(true); /* display alarm animation */ @@ -546,13 +558,23 @@ static void alarm_ring(void) if(AUDIO_CTRL_PRIORITY_3 == Hal_Audio_Manage_Start_Req(AUDIO_CTRL_PRIORITY_3,alarm_audio_ctrl_callback)) { /* play tone start */ - Hal_NFFS_File_Play_Repeat(AUDIO_ALARM, query_current_volume()); + uint8_t volume = 0; + #ifdef __MMI_USER_PROFILE_SUPPORT__ + volume = mmi_user_profile_current_mode_alarm_volume_get(); + #else + volume = query_current_volume(); + #endif + Hal_NFFS_File_Play_Repeat(AUDIO_ALARM, volume); + + // vibrate + if(true == mmi_watch_vibrate_is_permitted()) + { + Hal_Vibrator_Play_Repeat(); + } watch_wakeup_lcd(true); /* display alarm animation */ alarm_create(NULL); - //shutdown_create(NULL,0); - // shutdown_create_btn_action(NULL,LV_EVENT_CLICKED); } #if USE_LV_WATCH_ALARM_SET //recreate alarm list if alarm changed diff --git 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 index 6ed96010..2d234f16 100644 --- 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 @@ -187,7 +187,7 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj) } Hal_Mem_Free(alarm); -#if UI_UP_REMIND +#ifdef __MMI_ZHSX_SUPPORT__ lv_obj_set_hidden(btn_add, true); lv_obj_set_hidden(img_add, true); @@ -312,8 +312,10 @@ static lv_obj_t * alarm_list_add(lv_obj_t * list, app_adaptor_alarm_t * alarm, u //lv_obj_set_event_cb(btn, alarm_list_edit_btn_action); #if UI_UP_REMIND lv_obj_set_event_cb(btn, alarm_list_edit_btn_action); +#elif defined(__MMI_ZHSX_SUPPORT__) + lv_obj_set_event_cb(btn, NULL); #else - lv_obj_set_event_cb(btn, NULL); + lv_obj_set_event_cb(btn, alarm_list_edit_btn_action); #endif lv_watch_set_free_num(btn, index); lv_watch_obj_add_element(btn); @@ -446,6 +448,7 @@ static void alarm_list_switch_action(lv_obj_t * obj, lv_event_t e) app_adaptor_alarm_t *alarm = alarm_get_alarm(); alarm[index].on_off = on_off; alarm_set_alarm_by_ui(alarm, NV_ALARM_MAX_ALARM_NUM_t); + mmi_protocol_fzd_action_UP_REMIND(alarm,NV_ALARM_MAX_ALARM_NUM_t); Hal_Mem_Free(alarm); } @@ -703,6 +706,7 @@ static void alarm_ok_btn_action(lv_obj_t * obj, lv_event_t e) alarm[alarm_curr.index].hour = alarm_curr.hour; alarm[alarm_curr.index].min = alarm_curr.min; alarm_set_alarm_by_ui(alarm, NV_ALARM_MAX_ALARM_NUM_t); + mmi_protocol_fzd_action_UP_REMIND(alarm,NV_ALARM_MAX_ALARM_NUM_t); Hal_Mem_Free(alarm); } @@ -741,6 +745,7 @@ static void alarm_ok_btn_action(lv_obj_t * obj, lv_event_t e) } alarm_set_alarm_by_ui(alarm, NV_ALARM_MAX_ALARM_NUM_t); + mmi_protocol_fzd_action_UP_REMIND(alarm,NV_ALARM_MAX_ALARM_NUM_t); Hal_Mem_Free(alarm); } @@ -1025,6 +1030,7 @@ static void alarm_edit_del_btn_action(lv_obj_t * obj, lv_event_t e) app_adaptor_alarm_t *alarm = alarm_get_alarm(); Hal_Mem_Set(&alarm[alarm_curr.index], 0, sizeof(app_adaptor_alarm_t)); alarm_set_alarm_by_ui(alarm, NV_ALARM_MAX_ALARM_NUM_t); + mmi_protocol_fzd_action_UP_REMIND(alarm,NV_ALARM_MAX_ALARM_NUM_t); Hal_Mem_Free(alarm); //del 'alarm edit' UI diff --git 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 index 3b442616..c2c200f2 100644 --- 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,7 +5,7 @@ #ifndef ALARM_SET_H #define ALARM_SET_H -#define UI_UP_REMIND 1 +//#define UI_UP_REMIND 1 #ifdef __cplusplus extern "C" { #endif