From 7c23947404aa2c02e88bcf1614efd55414cabb6f Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Tue, 14 Nov 2023 19:21:09 +0800 Subject: [PATCH] Fixed msg screen bug. --- .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 2 +- .../UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c | 13 ++++++++----- .../lib/source/sifar/code/source/common/sf_common.c | 1 - 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c index 66ef4d383..f568fc838 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c @@ -1005,7 +1005,7 @@ void UIFlowPhoto_OnChildScrClose(lv_obj_t* obj, LV_USER_EVENT_NVTMSG_DATA* data) } set_indev_keypad_group(obj); - + // return; switch (gPhotoData.State) { case PHOTO_ST_WARNING_MENU: diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c index ed0713e6d..0524b56e9 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c @@ -40,18 +40,21 @@ 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); - if(string){ - snprintf(buf, BUF_LENGTH, "%s (%ds)\r\n", string->ptr, autoClose/1000); - lv_msgbox_set_text(msgbox, buf); - } autoClose = autoClose - 1000; if (0 == autoClose || autoOffTime <= 10) { lv_task_del(msgbox_timer); msgbox_timer = NULL; - lv_msgbox_start_auto_close(msgbox, 0); + if (msgbox) + { + lv_msgbox_start_auto_close(msgbox, 0); + } return; } + if(string){ + snprintf(buf, BUF_LENGTH, "%s (%ds)\r\n", string->ptr, autoClose/1000); + lv_msgbox_set_text(msgbox, buf); + } } // update_icons(); return; diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index c2e834af7..7543993f1 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -167,7 +167,6 @@ void sf_set_auto_off_time(UINT16 time) UINT16 sf_get_auto_off_time(void) { - printf("=================================KeepAliveTime_s = %d AutoOfftime = %d\n", KeepAliveTime_s, AutoOfftime); return AutoOfftime; } void sf_set_keep_alive_time(unsigned int time_s)