From: @CHENG <2393524978@qq.com>
Date: Fri, 19 Apr 2024 09:28:21 +0000 (+0800)
Subject: youhua
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=d45831383c888663d23b5881397c4a9500abaacb;p=mirrors%2FASR3603_Z5.git

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 c9899892..9a38387c 100644
--- 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 2a590366..453b11b8 100644
--- 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 98a7c349..7712b72d 100644
--- 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;