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

gengxin
---

diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
index 4c69ed72..fd27349f 100644
--- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
+++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
@@ -21,7 +21,7 @@ TASK_HANDLE * s_gui_timing_task_id = NULL;
 
 static void mmi_gui_timing_timer_callback(uint32_t param);
 static void mmi_gui_timing_task_3_second_mission(void * time_param);
-static void mmi_gui_timing_task_9_second_mission(void * time_param);
+static void mmi_gui_timing_task_6_second_mission(void * time_param);
 static void mmi_gui_timing_task_15_second_mission(void * time_param);
 static void mmi_gui_timing_task_1_minute_mission(void * time_param);
 
@@ -75,8 +75,8 @@ static void mmi_gui_timing_task_handle(void * param)
 			mmi_gui_timing_task_3_second_mission(msg_param);
 			break;
 
-		case MMI_GUI_TIMING_MSG_9_SECOND:
-			mmi_gui_timing_task_9_second_mission(msg_param);
+		case MMI_GUI_TIMING_MSG_6_SECOND:
+			mmi_gui_timing_task_6_second_mission(msg_param);
 			break;
 			
         case MMI_GUI_TIMING_MSG_15_SECOND:
@@ -161,7 +161,7 @@ static void mmi_gui_timing_task_3_second_mission(void * time_param)
 
 }
 
-static void mmi_gui_timing_task_9_second_mission(void * time_param)
+static void mmi_gui_timing_task_6_second_mission(void * time_param)
 {
     hal_rtc_t cur_time = {0};
 	
@@ -251,11 +251,11 @@ static void mmi_gui_timing_timer_callback(uint32_t param)
 
 	mmi_gui_timing_task_msg_send(MMI_GUI_TIMING_MSG_3_SECOND, NULL); // 3 seconds
 	
-	if(0 == s_timing_control_timer_counter % 3) // 9 seconds
+	if(0 == s_timing_control_timer_counter % 2) // 6 seconds
 	{
-		hal_rtc_t * p_cur_time_9 = Hal_Mem_Alloc(sizeof(hal_rtc_t));
-		Hal_Mem_Copy(p_cur_time_9, &cur_time, sizeof(hal_rtc_t));
-		mmi_gui_timing_task_msg_send(MMI_GUI_TIMING_MSG_9_SECOND, p_cur_time_9);
+		hal_rtc_t * p_cur_time_6 = Hal_Mem_Alloc(sizeof(hal_rtc_t));
+		Hal_Mem_Copy(p_cur_time_6, &cur_time, sizeof(hal_rtc_t));
+		mmi_gui_timing_task_msg_send(MMI_GUI_TIMING_MSG_6_SECOND, p_cur_time_6);
 	}
 	
 	if(0 == s_timing_control_timer_counter % 5) // 15 seconds
diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.h b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.h
index e1fc01a0..bd38ea09 100644
--- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.h
+++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.h
@@ -36,7 +36,7 @@ typedef enum
 	MMI_GUI_TIMING_MSG_ID_START,
 
     MMI_GUI_TIMING_MSG_3_SECOND,
-	MMI_GUI_TIMING_MSG_9_SECOND,
+	MMI_GUI_TIMING_MSG_6_SECOND,
 	MMI_GUI_TIMING_MSG_15_SECOND,
     MMI_GUI_TIMING_MSG_1_MINUTE,
 	MMI_GUI_TIMING_MSG_2_MINUTE,
diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
index af842440..67e39653 100644
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -981,7 +981,7 @@ enum
     WATCH_TEXT_ID_SOS_SMS_HELP_CONTENT,                 /* "我需要你的帮助!"                      "I NEED YOUR HELP!" */
     WATCH_TEXT_ID_APP_QRCODE_REFRESH,                   /* "确保设备联网\n点击获取APP二维码"        "Click to get qrcode" */
     WATCH_TEXT_ID_BT_OTA_MODE,                          /* "BT ota模式"                     "BT ota mode" */
-    WATCH_TEXT_ID_BT_OTA_MODE_OPEN,                     /* "已进入BT ota模式"                     "enter BT ota mode" */
+    WATCH_TEXT_ID_BT_OTA_MODE_OPEN,                     /* "已打开BT ota模式"                     "enter BT ota mode" */
     //CHENG_MODIFY
     WATCH_TEXT_ID_FALLDWON,                            /*确认是否跌倒*/
     WATCH_TEXT_ID_CONFIRM_DELETE,                        /*确认是否删除*/