Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00
Code Issues Projects Releases Wiki Activity

fix(music): delete timer when deleting related-object (#4558)

Browse Source 
Signed-off-by: YanXiaowei <yanxiaowei@xiaomi.com>
Co-authored-by: YanXiaowei <yanxiaowei@xiaomi.com>
This commit is contained in:
bjsylvia 2023-09-15 01:12:47 +08:00 committed by GitHub
parent 0c1f5510d7
commit 06238e4947
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
demos/music/lv_demo_music_main.c
View File

@ -52,6 +52,7 @@ static lv_obj_t * create_handle(lv_obj_t * parent);
static void spectrum_anim_cb(void * a, int32_t v); static void spectrum_anim_cb(void * a, int32_t v);
static void start_anim_cb(void * a, int32_t v); static void start_anim_cb(void * a, int32_t v);
static void del_counter_timer_cb(lv_event_t * e);
static void spectrum_draw_event_cb(lv_event_t * e); static void spectrum_draw_event_cb(lv_event_t * e);
static lv_obj_t * album_img_create(lv_obj_t * parent); static lv_obj_t * album_img_create(lv_obj_t * parent);
static void album_gesture_event_cb(lv_event_t * e); static void album_gesture_event_cb(lv_event_t * e);
@ -153,6 +154,7 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent)
/*Create the content of the music player*/ /*Create the content of the music player*/
lv_obj_t * cont = create_cont(parent); lv_obj_t * cont = create_cont(parent);
create_wave_images(cont); create_wave_images(cont);
lv_obj_t * title_box = create_title_box(cont); lv_obj_t * title_box = create_title_box(cont);
lv_obj_t * icon_box = create_icon_box(cont); lv_obj_t * icon_box = create_icon_box(cont);
@ -357,7 +359,7 @@ void _lv_demo_music_resume(void)
lv_anim_set_ready_cb(&a, spectrum_end_cb); lv_anim_set_ready_cb(&a, spectrum_end_cb);
lv_anim_start(&a); lv_anim_start(&a);
lv_timer_resume(sec_counter_timer); if(sec_counter_timer) lv_timer_resume(sec_counter_timer);
lv_slider_set_range(slider_obj, 0, _lv_demo_music_get_track_length(track_id)); lv_slider_set_range(slider_obj, 0, _lv_demo_music_get_track_length(track_id));
lv_obj_add_state(play_obj, LV_STATE_CHECKED); lv_obj_add_state(play_obj, LV_STATE_CHECKED);
@ -372,7 +374,7 @@ void _lv_demo_music_pause(void)
lv_anim_del(spectrum_obj, spectrum_anim_cb); lv_anim_del(spectrum_obj, spectrum_anim_cb);
lv_obj_invalidate(spectrum_obj); lv_obj_invalidate(spectrum_obj);
lv_img_set_zoom(album_img_obj, LV_ZOOM_NONE); lv_img_set_zoom(album_img_obj, LV_ZOOM_NONE);
lv_timer_pause(sec_counter_timer); if(sec_counter_timer) lv_timer_pause(sec_counter_timer);
lv_obj_clear_state(play_obj, LV_STATE_CHECKED); lv_obj_clear_state(play_obj, LV_STATE_CHECKED);
} }
@ -621,12 +623,14 @@ static lv_obj_t * create_ctrl_box(lv_obj_t * parent)
lv_obj_set_style_bg_color(slider_obj, lv_color_hex(0x569af8), LV_PART_INDICATOR); lv_obj_set_style_bg_color(slider_obj, lv_color_hex(0x569af8), LV_PART_INDICATOR);
lv_obj_set_style_bg_grad_color(slider_obj, lv_color_hex(0xa666f1), LV_PART_INDICATOR); lv_obj_set_style_bg_grad_color(slider_obj, lv_color_hex(0xa666f1), LV_PART_INDICATOR);
lv_obj_set_style_outline_width(slider_obj, 0, 0); lv_obj_set_style_outline_width(slider_obj, 0, 0);
lv_obj_add_event(slider_obj, del_counter_timer_cb, LV_EVENT_DELETE, NULL);
time_obj = lv_label_create(cont); time_obj = lv_label_create(cont);
lv_obj_set_style_text_font(time_obj, font_small, 0); lv_obj_set_style_text_font(time_obj, font_small, 0);
lv_obj_set_style_text_color(time_obj, lv_color_hex(0x8a86b8), 0); lv_obj_set_style_text_color(time_obj, lv_color_hex(0x8a86b8), 0);
lv_label_set_text(time_obj, "0:00"); lv_label_set_text(time_obj, "0:00");
lv_obj_set_grid_cell(time_obj, LV_GRID_ALIGN_END, 5, 1, LV_GRID_ALIGN_CENTER, 1, 1); lv_obj_set_grid_cell(time_obj, LV_GRID_ALIGN_END, 5, 1, LV_GRID_ALIGN_CENTER, 1, 1);
lv_obj_add_event(time_obj, del_counter_timer_cb, LV_EVENT_DELETE, NULL);
return cont; return cont;
} }
@ -758,6 +762,15 @@ int32_t get_sin(int32_t deg, int32_t a)
} }
static void del_counter_timer_cb(lv_event_t * e)
{
lv_event_code_t code = lv_event_get_code(e);
if(code == LV_EVENT_DELETE && sec_counter_timer) {
lv_timer_del(sec_counter_timer);
sec_counter_timer = NULL;
}
}
static void spectrum_draw_event_cb(lv_event_t * e) static void spectrum_draw_event_cb(lv_event_t * e)
{ {
lv_event_code_t code = lv_event_get_code(e); lv_event_code_t code = lv_event_get_code(e);