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

gengxin
---

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.c
index 178d7fb1..ab0954d4 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.c
@@ -34,6 +34,15 @@ static void mmi_aigc_default_screen_display(void);
 static void mmi_aigc_record_button_event_cb(lv_obj_t * obj, lv_event_t e);
 
 
+#ifdef __MMI_ZHSX_SUPPORT__
+static bool s_is_ACT_ID_AIGC_MAIN = false;
+
+bool mmi_is_ACT_ID_AIGC_MAIN(void)
+{
+	return s_is_ACT_ID_AIGC_MAIN;
+}
+#endif
+
 static void mmi_aigc_trans_websocket_open(void)
 {
 	if(false == s_aigc_trans_ws_open_flag)
@@ -1014,6 +1023,10 @@ void mmi_aigc_main_prepare_destory(lv_obj_t * activity_obj)
 		gif_close(ext->gif_thinking);
 		ext->gif_thinking = NULL;
 	}
+
+#ifdef __MMI_ZHSX_SUPPORT__
+	s_is_ACT_ID_AIGC_MAIN = false;
+#endif
 }
 
 void mmi_aigc_main_screen_clean(void)
@@ -1963,6 +1976,10 @@ lv_obj_t * mmi_aigc_main_create(lv_obj_t * activity_obj)
         LV_ASSERT_MEM(activity_obj);
     }
 
+#ifdef __MMI_ZHSX_SUPPORT__
+	s_is_ACT_ID_AIGC_MAIN = true;
+#endif
+
     lv_obj_t * obj = lv_watch_obj_create(activity_obj);
 	if(NULL == obj)
 		return NULL;
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.h b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.h
index cd84d779..a2c92b9f 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.h
@@ -151,6 +151,7 @@ char * mmi_aigc_trans_result_text_get(uint32_t * data_len);
 bool mmi_aigc_trans_result_text_store(char * data_buff, uint32_t data_len, bool is_end);
 bool mmi_aigc_chat_result_text_store(char * data_buff, uint32_t data_len);
 void mmi_aigc_create_event_cb(lv_obj_t * btn, lv_event_t e);
+bool mmi_is_ACT_ID_AIGC_MAIN(void);
 
 #endif 
 
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
index 69d09f59..44867dc2 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
@@ -372,23 +372,6 @@ void sms_msg_app_new_sms_info_ind(app_adp_new_sms_info_ind_t *sms_info)
 			#endif
 			)
 		{
-			uint8_t volume = 0;
-			
-		#ifdef __MMI_USER_PROFILE_SUPPORT__
-			volume = mmi_user_profile_current_mode_new_sms_volume_get();
-		#else
-			volume = query_current_volume();
-		#endif
-		#ifdef __MMI_NEW_SMS_SILENT_SUPPORT__
-			if(0 != mmi_new_sms_silent_swtich_get())
-				volume = 0;
-		#endif
-			Hal_NFFS_File_Play_Onetime(AUDIO_SETTING_AUDIO_MSG, volume, NULL, 0);
-
-			if(true == mmi_watch_vibrate_is_permitted())
-			{
-				Hal_Vibrator_Play_Onetime(NULL, 1000);
-			}
 			if(0 == Hal_Pm_Get_State())
 			{
 				printf("sms_msg_list_update -----> onkey_wakeup\n");
@@ -1093,6 +1076,27 @@ static void  del_msg_sure_btn_cb(lv_obj_t * btn,lv_event_t e)
 void sms_msg_list_update(void)
 {
 	printf("%s\n", __FUNCTION__);
+
+#ifdef __MMI_ZHSX_SUPPORT__
+	uint8_t volume = 0;
+	
+#ifdef __MMI_USER_PROFILE_SUPPORT__
+	volume = mmi_user_profile_current_mode_new_sms_volume_get();
+#else
+	volume = query_current_volume();
+#endif
+#ifdef __MMI_NEW_SMS_SILENT_SUPPORT__
+	if(0 != mmi_new_sms_silent_swtich_get())
+		volume = 0;
+#endif
+	Hal_NFFS_File_Play_Onetime(AUDIO_SETTING_AUDIO_MSG, volume, NULL, 0);
+
+	if(true == mmi_watch_vibrate_is_permitted())
+	{
+		Hal_Vibrator_Play_Onetime(NULL, 800);
+	}
+#endif
+
 	if(is_sms_activity())
 	{
 		lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_SMS_MSG);
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 7d70b38a..faa42f1c 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
@@ -19,8 +19,15 @@ bool mmi_active_screen_is_prohibit_interrupted(void)
 	
 	if(true == voip_connect_check_req())
 	{
-		return;
+		return true;
 	}
+
+#ifdef __MMI_CUSTOM_AIGC_SUPPORT__
+	if(true == mmi_is_ACT_ID_AIGC_MAIN())
+	{
+		return true;
+	}
+#endif
 	
     if(true == mmi_is_ACT_ID_SHUTDOWN())
 	{