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(widgets): fix timer crash when delete widgets demo (#4522)

Browse Source 
Signed-off-by: YanXiaowei <yanxiaowei@xiaomi.com>
Co-authored-by: YanXiaowei <yanxiaowei@xiaomi.com>
This commit is contained in:
bjsylvia 2023-09-06 03:16:37 +08:00 committed by GitHub
parent 2500da071a
commit 23ebeed652
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demos/widgets/lv_demo_widgets.c
View File

@ -48,6 +48,7 @@ static void calendar_event_cb(lv_event_t * e);
static void slider_event_cb(lv_event_t * e); static void slider_event_cb(lv_event_t * e);
static void chart_event_cb(lv_event_t * e); static void chart_event_cb(lv_event_t * e);
static void shop_chart_event_cb(lv_event_t * e); static void shop_chart_event_cb(lv_event_t * e);
static void meter2_event_cb(lv_event_t * e);
static void meter1_indic1_anim_cb(void * var, int32_t v); static void meter1_indic1_anim_cb(void * var, int32_t v);
static void meter1_indic2_anim_cb(void * var, int32_t v); static void meter1_indic2_anim_cb(void * var, int32_t v);
static void meter1_indic3_anim_cb(void * var, int32_t v); static void meter1_indic3_anim_cb(void * var, int32_t v);
@ -693,7 +694,9 @@ static void analytics_create(lv_obj_t * parent)
lv_meter_set_indicator_start_value(meter2, meter2_indic[2], 70); lv_meter_set_indicator_start_value(meter2, meter2_indic[2], 70);
lv_meter_set_indicator_end_value(meter2, meter2_indic[2], 99); lv_meter_set_indicator_end_value(meter2, meter2_indic[2], 99);
lv_timer_create(meter2_timer_cb, 100, meter2_indic); lv_timer_t * meter2_timer = lv_timer_create(meter2_timer_cb, 100, meter2_indic);
lv_obj_add_event(meter2, meter2_event_cb, LV_EVENT_DELETE, meter2_timer);
meter3 = create_meter_box(parent, "Network Speed", "Low speed", "Normal Speed", "High Speed"); meter3 = create_meter_box(parent, "Network Speed", "Low speed", "Normal Speed", "High Speed");
if(disp_size < DISP_LARGE) lv_obj_add_flag(lv_obj_get_parent(meter3), LV_OBJ_FLAG_FLEX_IN_NEW_TRACK); if(disp_size < DISP_LARGE) lv_obj_add_flag(lv_obj_get_parent(meter3), LV_OBJ_FLAG_FLEX_IN_NEW_TRACK);
@ -1515,6 +1518,15 @@ static void meter1_indic3_anim_cb(void * var, int32_t v)
lv_label_set_text_fmt(label, "Costs: %"LV_PRId32" %%", v); lv_label_set_text_fmt(label, "Costs: %"LV_PRId32" %%", v);
} }
static void meter2_event_cb(lv_event_t * e)
{
lv_event_code_t code = lv_event_get_code(e);
if(code == LV_EVENT_DELETE) {
lv_timer_t * meter2_timer = lv_event_get_user_data(e);
if(meter2_timer) lv_timer_del(meter2_timer);
}
}
static void meter2_timer_cb(lv_timer_t * timer) static void meter2_timer_cb(lv_timer_t * timer)
{ {
lv_meter_indicator_t ** indics = timer->user_data; lv_meter_indicator_t ** indics = timer->user_data;