From: CCC <2393524978@qq.com>
Date: Mon, 4 Dec 2023 07:56:58 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=a52bcc249d75ec3462da8e078d8ba06d8197182e;p=mirrors%2FASR3603_Z5.git

gengxin
---

diff --git a/2.sdk/sdk/gui/lv_watch/CMakeLists.txt b/2.sdk/sdk/gui/lv_watch/CMakeLists.txt
index 2967c728..94846404 100644
--- a/2.sdk/sdk/gui/lv_watch/CMakeLists.txt
+++ b/2.sdk/sdk/gui/lv_watch/CMakeLists.txt
@@ -215,7 +215,7 @@ set(lv_watch_sources
 	lv_apps/health_measure/health_temperature.c
 	lv_apps/setting/setting_main_menu_switch.c
 	lv_apps/tool/tool.c
-	lv_apps/alarm_remind/alarm_remind.c
+	lv_apps/mmi_remind/mmi_remind.c
 	lv_apps/custom_function/custom_function.c
 )
 
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm_remind/alarm_remind.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_remind/mmi_remind.c
similarity index 100%
rename from 2.sdk/sdk/gui/lv_watch/lv_apps/alarm_remind/alarm_remind.c
rename to 2.sdk/sdk/gui/lv_watch/lv_apps/mmi_remind/mmi_remind.c
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm_remind/alarm_remind.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_remind/mmi_remind.h
similarity index 100%
rename from 2.sdk/sdk/gui/lv_watch/lv_apps/alarm_remind/alarm_remind.h
rename to 2.sdk/sdk/gui/lv_watch/lv_apps/mmi_remind/mmi_remind.h
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 2a28b0f7..89faf3a1 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
@@ -181,6 +181,9 @@ void shutdown_confirm_btn_action(lv_obj_t * btn, lv_event_t event)
     lv_task_del(checksim_task_p);
     checksim_task_p = NULL;
 #endif
+#ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
+	mmi_watch_do_not_disturb_task_clean();
+#endif
 
 	printf("shutdown start1\n");
     if(NULL != btn) {
diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.h b/2.sdk/sdk/gui/lv_watch/lv_watch.h
index 42ea038a..9a976e49 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_watch.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch.h
@@ -182,15 +182,13 @@ extern "C" {
 #include "lv_apps/health_measure/health_spo2.h"
 #include "lv_apps/health_measure/health_temperature.h"
 #include "lv_apps/tool/tool.h"
-#include "lv_apps/alarm_remind/alarm_remind.h"
+#include "lv_apps/mmi_remind/mmi_remind.h"
 #include "lv_apps/custom_function/custom_function.h"
 
 #endif
 
 
 
-//simware end
-
 /*********************
  *      DEFINES
  *********************/
diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
index b9863af3..cf207221 100644
--- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
@@ -18,6 +18,11 @@ bool mmi_active_screen_is_prohibit_interrupted(void)
 		return true;
 	}
 
+    if(NULL != lv_watch_get_activity_obj(ACT_ID_ANYOBJ))
+	{
+		return true;
+	}
+	
     if(NULL != lv_watch_get_activity_obj(ACT_ID_SHUTDOWN))
 	{
 		return true;
@@ -940,6 +945,15 @@ void mmi_watch_do_not_disturb_mission_check(void)
 {
 	s_do_not_disturb_check_task = lv_task_create(mmi_watch_do_not_disturb_check_task_cb, 1000 * 5, LV_TASK_PRIO_MID, NULL);
 }
+
+void mmi_watch_do_not_disturb_task_clean(void)
+{
+	if(NULL != s_do_not_disturb_check_task)
+	{
+		lv_task_del(s_do_not_disturb_check_task);
+		s_do_not_disturb_check_task = NULL;
+	}
+}
 #endif
 
 
diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h
index b1bca970..f50833d2 100644
--- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h
+++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h
@@ -89,6 +89,7 @@ void mmi_watch_do_not_disturb_data_set(nv_watch_do_not_disturb_t * data);
 bool mmi_watch_is_in_do_not_disturb_time(void);
 void mmi_ui_msg_update_do_not_disturb(uint8_t flag);
 void mmi_watch_do_not_disturb_mission_check(void);
+void mmi_watch_do_not_disturb_task_clean(void);
 #endif
 
 #ifdef __MMI_SLEEP_FUNCTION_SUPPORT__