From 2ebbd47d4b3cac11d1bdc20740a11e70f87e205c Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Fri, 17 Nov 2023 15:41:47 +0800 Subject: [PATCH] Fixed bug about images message. --- .../UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c | 7 +++++-- .../UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c | 5 ++++- 2 files changed, 9 insertions(+), 3 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 c71b47459..cd30a63b4 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 @@ -496,8 +496,11 @@ static void update_camera_message(void) } else { - UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); - lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum)); + if (FALSE == sf_get_cap_statu()) + { + UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); + lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum)); + } } } else diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c index 51ca4c145..8972c6a19 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c @@ -6,6 +6,7 @@ #include "UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgAPI.h" #include "ImageApp/ImageApp_Photo.h" +#include "DCF.h" #define THIS_DBGLVL 2 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER /////////////////////////////////////////////////////////////////////////////// #define __MODULE__ UIFlowPhotoFunc @@ -22,7 +23,9 @@ extern void UIFlowPhoto_update_selftimer_cnt(UINT32 time); CHAR *Get_FreePicNumString(UINT32 uiValue) { - snprintf(g_cFreePicNumStr, sizeof(g_cFreePicNumStr), "%05ld/%05ld", uiValue, PhotoExe_GetTotalPicNum()); + unsigned long fileCount = 0; + fileCount = DCF_GetDBInfo(DCF_INFO_TOL_FILE_COUNT); + snprintf(g_cFreePicNumStr, sizeof(g_cFreePicNumStr), "%05ld/%05ld", fileCount, uiValue); return g_cFreePicNumStr; }