Merge branch 'branch_s550_gui' into branch_s550_fast

code/application/source/cardv/SrcCode/System/SysMain_Exe.c

@@ -417,11 +417,19 @@ BOOL System_GetShutdownBegin(void)
 {
 	return g_IsShutdownBegin;
 }
-
+#define DO_NOT_SHOW_POWER_OFF 0
+#define SHOW_POWER_OFF 1
 INT32 System_OnShutdown(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
 {
+	UINT32 displayShow = SHOW_POWER_OFF;
+	if ( paramNum >= 2)
+	{
+	DBG_DUMP("^MOn Shutdown begin paramNum:%d paramArray[0]:%d paramArray[1]:%d\r\n",paramNum, paramArray[0], paramArray[1]);
+		displayShow = paramArray[1];
+	}
+	if (paramNum >= 1 /*&& paramArray[0] == 0*/) 
+	{ //power-off begin
 	DBG_DUMP("^MOn Shutdown begin paramNum:%d paramArray:%d\r\n",paramNum, paramArray[0]);
-	if (paramNum == 1 /*&& paramArray[0] == 0*/) { //power-off begin
 		g_IsShutdownBegin=TRUE;
 
 #if (DISPLAY_FUNC == ENABLE)
@@ -468,7 +476,7 @@ INT32 System_OnShutdown(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
 		} else {
 #if (POWEROFFLOGO_FUNCTION == ENABLE)
             #if HUNTING_CAMERA_MCU == ENABLE
-            if(sf_get_mode_flag())
+            if(sf_get_mode_flag() && SHOW_POWER_OFF == displayShow)
             #endif
             {
                 GxDisplay_Set(LAYER_OSD1, LAYER_STATE_ENABLE, 0); //turn off OSD1

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr

@@ -1289,7 +1289,7 @@
                 "height": 30,
                 "width": 90,
                 "x": 38,
-                "y": 10
+                "y": 5
             },
             "hidden": false,
             "locked": false,
@@ -1346,7 +1346,7 @@
                 "height": 40,
                 "width": 38,
                 "x": 0,
-                "y": 0
+                "y": -5
             },
             "hidden": true,
             "locked": false,
@@ -1886,7 +1886,7 @@
             "event callback": "",
             "font type": "Font_Type0",
             "geometry": {
-                "height": 3,
+                "height": 2,
                 "width": 320,
                 "x": 0,
                 "y": 119
@@ -1906,7 +1906,7 @@
                     },
                     "Text": {
                         "text_color": "0xff0000",
-                        "text_font": "montserrat 16 4bpp",
+                        "text_font": "SF-UI-Text-Medium 16 1bpp",
                         "text_opa": 0,
                         "text_sel_bg_color": "0x00b495",
                         "text_sel_color": "0x3c3c3c"

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr

@@ -2402,7 +2402,7 @@
             "event callback": "",
             "font type": "Font_Type0",
             "geometry": {
-                "height": 3,
+                "height": 2,
                 "width": 320,
                 "x": 0,
                 "y": 119

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowClose/UIFlowCloseEventCallback.c

@@ -1,3 +1,4 @@
+#include "UIFlowLVGL/UIFlowClose/UIFlowCloseEventCallback.h"
 #include "UIFlowLVGL/UIFlowLVGL.h"
 #include "PrjInc.h"
 #include "ImageApp/ImageApp_Photo.h"
@@ -9,6 +10,7 @@
 #define UPDATE_TIMEER_MS 200
 static lv_task_t* update_timer = NULL;
 static lv_group_t* gp = NULL;
+static DISPLAY_FINAL_E gPowerOff = DISPLAY_FINAL_END;
 static void set_indev_keypad_group(lv_obj_t* obj)
 {
 	if(gp == NULL){
@@ -37,7 +39,8 @@ static void task_update_timer_cb(lv_task_t* task)
     closing_index ++;
 	if (time_ms == 0)
 	{
-        Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_APO);
+		printf("task_update_timer_cb gPowerOff = %d\n", gPowerOff);
+        Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 2, APP_POWER_OFF_APO, gPowerOff);
 		if(update_timer){
 			lv_task_del(update_timer);
 			update_timer = NULL;
@@ -45,8 +48,9 @@ static void task_update_timer_cb(lv_task_t* task)
 		}
 	}
 }
-void OpenClosingScreen(void)
+void OpenClosingScreen(const DISPLAY_FINAL_E powerOff)
 {
+	gPowerOff = powerOff;
 	lv_plugin_scr_open(UIFlowClose, NULL);
 }
 

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowClose/UIFlowCloseEventCallback.h

@@ -3,5 +3,10 @@
 #include "UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmAPI.h"
 #include "UIFlowLVGL/UIFlowLVGL.h"
 #include "Resource/Plugin/lvgl_plugin.h"
-void OpenClosingScreen(void);
+typedef enum {		 
+    DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF = 0,
+	DISPLAY_FINAL_SHOW_POWER_OFF,
+    DISPLAY_FINAL_END
+} DISPLAY_FINAL_E;
+void OpenClosingScreen(const DISPLAY_FINAL_E powerOff);
 #endif /*UIFLOW_CLOSE_EVENT_CALLBACK_H*/

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c

@@ -531,7 +531,7 @@ static void UIFlowMenuCommonConfirm_MessageBox_ValueChanged(lv_obj_t* obj, uint3
 			BKG_PostEvent(gBKGEvt);
 		} else if (gBKGEvt == NVTEVT_BKW_ENTER_WORK_MODE)
 		{
-			OpenClosingScreen();
+			OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF);
 			// BKG_PostEvent(gBKGEvt);
 			// UIFlowMenuCommonConfirm_CloseScr();
 		} else if (gBKGEvt) {

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c

@@ -513,7 +513,8 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
   gMatrixIndex = 0;
   SendTimeIndex_0 = 0;
   SendTimeIndex_1 = 0;
-  gSendType = sendType;
+  #define OPTION_3 3
+  gSendType = sendType == OPTION_3 ? FOUR_TIME_DAY : sendType;
   gPageNum = FIRST_PAGE;
   unsigned short settingIndex = gPageNum * 2;
   SendTimeMatrixObj_1 = NULL;

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c

@@ -1285,7 +1285,7 @@ lv_obj_t* UIFlowMovie_create(){
 	lv_plugin_label_allocate_ext_attr(label_rec_time);
 	lv_plugin_label_set_font_type(label_rec_time, LV_PLUGIN_LANGUAGE_FONT_TYPE_0);
 	lv_label_set_long_mode(label_rec_time, LV_LABEL_LONG_CROP);
-	lv_obj_set_pos(label_rec_time, 38, 10);
+	lv_obj_set_pos(label_rec_time, 38, 5);
 	lv_obj_set_size(label_rec_time, 90, 30);
 	lv_obj_add_style(label_rec_time, 0, &label_rec_time_s0);
 
@@ -1333,7 +1333,7 @@ lv_obj_t* UIFlowMovie_create(){
 	lv_obj_set_hidden(image_rec_ellipse, true);
 	lv_obj_set_click(image_rec_ellipse, false);
 	lv_obj_set_drag(image_rec_ellipse, false);
-	lv_obj_set_pos(image_rec_ellipse, 0, 0);
+	lv_obj_set_pos(image_rec_ellipse, 0, -5);
 	lv_obj_set_size(image_rec_ellipse, 38, 40);
 	lv_img_set_src(image_rec_ellipse, &sy_luzhi);
 	lv_obj_add_style(image_rec_ellipse, 0, &image_rec_ellipse_s0);
@@ -1840,7 +1840,7 @@ lv_obj_t* UIFlowMovie_create(){
 	STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_DEFAULT, color);
 	STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_DEFAULT, color);
 	lv_style_set_text_opa(&label_line_s0,LV_STATE_DEFAULT,0);
-	lv_style_set_text_font(&label_line_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16);
+	lv_style_set_text_font(&label_line_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp);
 	STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_DEFAULT, color);
 	STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_DEFAULT, color);
 	STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_CHECKED, color);
@@ -1889,7 +1889,7 @@ lv_obj_t* UIFlowMovie_create(){
 	lv_label_set_align(label_line, LV_LABEL_ALIGN_CENTER);
 	lv_label_set_long_mode(label_line, LV_LABEL_LONG_SROLL);
 	lv_obj_set_pos(label_line, 0, 119);
-	lv_obj_set_size(label_line, 320, 3);
+	lv_obj_set_size(label_line, 320, 2);
 	lv_obj_add_style(label_line, 0, &label_line_s0);
 
 	label_line_scr_uiflowmovie = label_line;

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c

@@ -2374,7 +2374,7 @@ lv_obj_t* UIFlowPhoto_create(){
 	lv_label_set_align(label_line, LV_LABEL_ALIGN_CENTER);
 	lv_label_set_long_mode(label_line, LV_LABEL_LONG_SROLL);
 	lv_obj_set_pos(label_line, 0, 119);
-	lv_obj_set_size(label_line, 320, 3);
+	lv_obj_set_size(label_line, 320, 2);
 	lv_obj_add_style(label_line, 0, &label_line_s0);
 
 	label_line_scr_uiflowphoto = label_line;

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c

@@ -47,9 +47,9 @@ static CHAR    g_cSelftimerCntStr[8]   = {0};
 static lv_group_t* gp = NULL;
 static lv_task_t* task_selftimer = NULL;
 static lv_task_t* update_icons_timer = NULL;
-#define GO_TO_WORK_MODE_TIME 57
+#define GO_TO_WORK_MODE_TIME 59
 #define PASSWORD_GO_TO_WORK_MODE_TIME_S 62
-#define MENU_GO_TO_WORK_MODE_TIME_S 27
+#define MENU_GO_TO_WORK_MODE_TIME_S 29
 static unsigned int ShutDownTime = GO_TO_WORK_MODE_TIME;
 static lv_task_t* task_qview = NULL;
 
@@ -1624,7 +1624,7 @@ static void task_update_icons_timer_cb(lv_task_t* task)
 		}
 		else
 		{
-			OpenClosingScreen();
+			OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF);
 		}
 	}
 	return;
@@ -1914,7 +1914,6 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
 	case LV_USER_KEY_RIGHT:
 	{
         //SF_WIFI_STATUS_E status = sf_get_wifi_status();
-		ShutDownTime = MENU_GO_TO_WORK_MODE_TIME_S;
 		if(TRUE == sf_get_send_statu())
 		{
 			printf("\r\n[%s] line:%d %d running\n", __FUNCTION__, __LINE__,key);
@@ -1986,7 +1985,7 @@ void UIFlowPhtot_KeyLongPress(lv_obj_t* obj, uint32_t key)
 		if (3 * 1000 <= KeyLeftPressingTimeMs)
 		{
             // Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_APO);
-			OpenClosingScreen();
+			OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF);
 			KeyLeftPressingTimeMs = 0;
 		}
 		break;

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c

@@ -41,26 +41,46 @@ static void task_msgbox_timer_cb(lv_task_t* task)
 		UINT16 autoOffTime = sf_get_auto_off_time();
 		const lv_plugin_string_t* string = lv_plugin_get_string(msgID);
 
-		autoClose = autoClose - 1000;
 		if (0 == autoClose || autoOffTime <= 10)
 		{
 			lv_task_del(msgbox_timer);
 			msgbox_timer = NULL;
 			if (msgbox)
 			{
-	            lv_msgbox_start_auto_close(msgbox, 0);
+				printf("msg box close delay 1000.\n");
+	            lv_msgbox_start_auto_close(msgbox, 1000);
 			}
 			if (0 == autoClose)
 			{
-				OpenClosingScreen();
+				// OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF);
+				#define DO_NOT_SHOW_POWER_OFF 0
+        		Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 2, APP_POWER_OFF_APO, DO_NOT_SHOW_POWER_OFF);
 			}
 			return;
 		}
+		autoClose = autoClose - 1000;
 		if(string){
 			snprintf(buf, BUF_LENGTH, "%s\n\n%ds\r\n", string->ptr, autoClose/1000);
 			// lv_msgbox_set_text(msgbox, buf);
 		    lv_label_set_text_fmt(label_msg_scr_uiflowwrnmsg, "%s", buf);
 		}
+		if (0 == autoClose || autoOffTime <= 10)
+		{
+			// lv_task_del(msgbox_timer);
+			// msgbox_timer = NULL;
+			// if (msgbox)
+			// {
+			// 	printf("msg box close delay 1000.\n");
+	        //     lv_msgbox_start_auto_close(msgbox, 1000);
+			// }
+			// if (0 == autoClose)
+			// {
+			// 	// OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF);
+			// 	#define DO_NOT_SHOW_POWER_OFF 0
+        	// 	Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 2, APP_POWER_OFF_APO, DO_NOT_SHOW_POWER_OFF);
+			// }
+			return;
+		}
 	}
 	// update_icons();
 	return;
@@ -109,6 +129,9 @@ void UIFlowWrnMsgAPI_Open_StringID(lv_plugin_res_id id, uint16_t auto_close_time
 	{
 	     lv_plugin_msgbox_set_text(msgbox, id);
 	}
+	if(auto_close_time_ms){
+		lv_msgbox_start_auto_close(msgbox, auto_close_time_ms);
+	}
 
 	// if(LV_PLUGIN_STRING_ID_STRING_UPGRADING == msgID)
 	// {
@@ -128,6 +151,9 @@ void UIFlowWrnMsgAPI_Open_StringID(lv_plugin_res_id id, uint16_t auto_close_time
 		{
 			snprintf(buf, BUF_LENGTH, "%s\n\n%ds\r\n", tmpstr1->ptr, autoClose/1000);
 			lv_label_set_text_fmt(label_msg_scr_uiflowwrnmsg, "%s", buf);
+			if(auto_close_time_ms){
+				lv_msgbox_start_auto_close(msgbox, auto_close_time_ms + 1000 * 2);
+			}
 		} else if (LV_PLUGIN_STRING_ID_STRING_UPGRADING == msgID)
 		{
 			lv_label_set_text_fmt(label_msg_scr_uiflowwrnmsg, "Upgrading...\nCamera will automatically restart after upgrade complete");
@@ -161,9 +187,9 @@ void UIFlowWrnMsgAPI_Open_StringID(lv_plugin_res_id id, uint16_t auto_close_time
 	}
 
 
-	if(auto_close_time_ms){
+	// if(auto_close_time_ms){
-		lv_msgbox_start_auto_close(msgbox, auto_close_time_ms);
+	// 	lv_msgbox_start_auto_close(msgbox, auto_close_time_ms);
-	}
+	// }
 
 	set_indev_keypad_group(msgbox);
     if(msgbox_timer == NULL){
@@ -282,15 +308,19 @@ void message_box_wrnmsg_OnKeyMenu(lv_obj_t* msgbox)
 
 void message_box_wrnmsg_OnKey(lv_obj_t* msgbox, uint32_t key)
 {
+	// static uint32_t key22 = LV_KEY_END;
+	// key22 = key;
+	// lv_event_send(lv_obj_get_parent(UIFlowWrnMsg), LV_USER_EVENT_KEY_RELEASE, &key22);
+	return;
 	switch(key)
 	{
 	case LV_USER_KEY_MENU:
-		message_box_wrnmsg_OnKeyMenu(msgbox);
+		// message_box_wrnmsg_OnKeyMenu(msgbox);
 		break;
 	//#NT#2023/11/14#Eric - begin
 	//#NT#Support IVOT_N12144_CO-148_A
 	case LV_KEY_ENTER:
-		UIFlowWrnMsg_CloseScr(NVTEVT_NULL);
+		// UIFlowWrnMsg_CloseScr(NVTEVT_NULL);
 		break;
 	//#NT#2023/11/14#Eric - end
 	default:

code/lib/source/sifar/code/source/common/sf_common.c

@@ -290,16 +290,17 @@ void sf_mode_detect(void)
                 //LCD_BACKLIGHT_OFF;			
                 sf_sys_status_led_set(SF_LED_SYS_STATE_POWER_OFF);
                 printf("[power off] %s(%d) AutoOfftime:%d\n", __FUNCTION__, __LINE__, AutoOfftime);
+                #define DO_NOT_SHOW_POWER_OFF 0
                 if(AutoOfftime >= KeepAliveTime_s)
                 {
-                    Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_APO); //shutdown start
+                    Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 2, APP_POWER_OFF_APO, DO_NOT_SHOW_POWER_OFF); //shutdown start
                 }
                 else
                 {
                     #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
                     Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_NORMAL); //shutdown start
                     #elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_)
-                    Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_APO); //shutdown start
+                    Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 2, APP_POWER_OFF_APO, DO_NOT_SHOW_POWER_OFF); //shutdown start
                     #endif
                 }
                 sf_set_power_off_flag(1);