youhua

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c b/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c
index c989989..9a38387 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c
@@ -193,8 +193,10 @@ void shutdown_confirm_btn_action(lv_obj_t * btn, lv_event_t event)
         return;
     }
 
+#ifndef __MMI_ZHSX_SUPPORT__
     lv_task_del(lowbattery_task_p);
     lowbattery_task_p = NULL;
+#endif
 #if USE_LV_WATCH_SIMCHECK
     lv_task_del(checksim_task_p);
     checksim_task_p = NULL;

diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.c b/2.sdk/sdk/gui/lv_watch/lv_watch.c
index 2a59036..453b11b 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_watch.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch.c
@@ -23,7 +23,7 @@
  *      TYPEDEFS
  **********************/
 static watch_info_t * watch_info;
-lv_task_t * lowbattery_task_p;
+lv_task_t * lowbattery_task_p = NULL;
 #if USE_LV_WATCH_SIMCHECK
 lv_task_t * checksim_task_p = NULL;
 #endif

diff --git a/2.sdk/sdk/gui/lvgl/src/lv_misc/lv_task.c b/2.sdk/sdk/gui/lvgl/src/lv_misc/lv_task.c
index 98a7c34..7712b72 100644 (file)
--- a/2.sdk/sdk/gui/lvgl/src/lv_misc/lv_task.c
+++ b/2.sdk/sdk/gui/lvgl/src/lv_misc/lv_task.c
@@ -309,6 +309,9 @@ void lv_task_set_cb(lv_task_t * task, lv_task_cb_t task_cb)
  */
 void lv_task_del(lv_task_t * task)
 {
+       if(NULL == task)
+               return;
+       
     LV_TASK_LOCK;
     _lv_ll_remove(&LV_GC_ROOT(_lv_task_ll), task);
     task_list_changed = true;