payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc

Browse Source
This commit is contained in:
payton 2024-01-29 16:13:02 +08:00
commit 2a2652c0f6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c
View File

@ -312,7 +312,7 @@ void Option_play_Selection_Key(lv_obj_t* obj, uint32_t key)
} }
case LV_USER_KEY_LEFT: case LV_USER_KEY_LEFT:
{ {
/*
if (OPTION_PAGE_SELECT_FUNCTION == gOptionPage) if (OPTION_PAGE_SELECT_FUNCTION == gOptionPage)
{ {
hidde_Selection_page(); hidde_Selection_page();
@ -322,7 +322,7 @@ void Option_play_Selection_Key(lv_obj_t* obj, uint32_t key)
gOptionPage = OPTION_PAGE_SELECT_FUNCTION; gOptionPage = OPTION_PAGE_SELECT_FUNCTION;
show_Selection_page(obj); show_Selection_page(obj);
} }
*/
break; break;
} }
case LV_USER_KEY_RIGHT: case LV_USER_KEY_RIGHT:

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

@ -49,7 +49,7 @@ static void task_msgbox_timer_cb(lv_task_t* task)
} }
if (0 == autoClose || autoOffTime <= 10) if (0 == autoClose || autoOffTime <= 10)
{ {
printf("[task_msgbox_timer_cb][*x]auto close\n"); printf("[%s:%d]auto close.\n", __FUNCTION__, __LINE__);
lv_task_del(msgbox_timer); lv_task_del(msgbox_timer);
msgbox_timer = NULL; msgbox_timer = NULL;
@ -57,11 +57,12 @@ static void task_msgbox_timer_cb(lv_task_t* task)
{ {
if (0 != autoClose) if (0 != autoClose)
{ {
printf("msg box close delay 1000.\n"); printf("[%s:%d]msg box close.\n", __FUNCTION__, __LINE__);
lv_msgbox_start_auto_close(msgbox, 1000); lv_msgbox_start_auto_close(msgbox, 0);
} }
else else
{ {
printf("[%s:%d]msg box close delay 5s.\n", __FUNCTION__, __LINE__);
lv_msgbox_start_auto_close(msgbox, 5000); lv_msgbox_start_auto_close(msgbox, 5000);
} }
} }