From 6e489d41e072ce58cd67917e75c17655ad6ab8d0 Mon Sep 17 00:00:00 2001 From: payton Date: Thu, 11 Jan 2024 20:54:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E5=87=8F=E5=B0=91=E6=89=93=E5=8D=B0=EF=BC=9B2.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8B=94=E6=8E=89sd=E5=8D=A1=E6=9C=89=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/System/SF_SysStrgMng.c | 6 +++++- .../source/cardv/SrcCode/System/SysStrg_Exe.c | 4 ++-- .../cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c | 12 +++++++++--- .../UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c | 13 +++++++++++-- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c index eaf9abd7b..99539fd21 100755 --- a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c +++ b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c @@ -26,6 +26,7 @@ #if HUNTING_CAMERA_MCU == ENABLE #include +#include "sf_sd_common.h" #endif typedef struct @@ -131,7 +132,10 @@ static UINT32 SF_StrgSpaceCheckFull(MMC_DEV_TYPE mmc_dev) /*check disk free size*/ if(mmc_dev == MMC_DEV_SD) { - diskFree = FileSys_GetDiskInfoEx('A', FST_INFO_FREE_SPACE); + if(sf_in_card_exist()) + { + diskFree = FileSys_GetDiskInfoEx('A', FST_INFO_FREE_SPACE); + } } else { diff --git a/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c b/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c index ee0263ffd..89d2e2de7 100644 --- a/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c +++ b/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c @@ -777,7 +777,7 @@ DCF_HANDLE System_Get_DCF_Handle(void) DBG_ERR("dcf_handle err!\n"); return -1; } - DBG_WRN("DCF_GET_HANDLE, %d\n", mmc_dev->dcf_handle); + //DBG_WRN("DCF_GET_HANDLE, %d\n", mmc_dev->dcf_handle); return mmc_dev->dcf_handle; #else return 0; @@ -799,7 +799,7 @@ CHAR System_Get_DCF_Disk_Drive(DCF_HANDLE handle) if(drive == '\0'){ DBG_ERR("invalid act handle(%d)\n", handle); } - DBG_WRN("get disk driver, %c\n", drive); + //DBG_WRN("get disk driver, %c\n", drive); return drive; } diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c index 868346632..a7274cda3 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c @@ -718,12 +718,15 @@ UINT32 PhotoExe_GetFreePicNum(void) #if (FILESIZE_ALIGN_FUNC) reserveSize += FS_ALIGN_RESERVED_SIZE; #endif - uiFreeSpace = FileSys_GetDiskInfo(FST_INFO_FREE_SPACE); + //uiFreeSpace = FileSys_GetDiskInfo(FST_INFO_FREE_SPACE); #if USE_MMC_DEV_CHECK if(mmc_dev->dev_type == MMC_DEV_SD) { - uiFreeSpace = FileSys_GetDiskInfoEx('A', FST_INFO_FREE_SPACE); + if(sf_in_card_exist() == TRUE) + { + uiFreeSpace = FileSys_GetDiskInfoEx('A', FST_INFO_FREE_SPACE); + } } else if(mmc_dev->dev_type == MMC_DEV_EMMC) { @@ -791,7 +794,10 @@ UINT32 PhotoExe_GetTotalPicNum(void) if(mmc_dev->dev_type == MMC_DEV_SD) { - uiSpace = FileSys_GetDiskInfoEx('A', FST_INFO_DISK_SIZE); + if(sf_in_card_exist() == TRUE) + { + uiSpace = FileSys_GetDiskInfoEx('A', FST_INFO_DISK_SIZE); + } } else if(mmc_dev->dev_type == MMC_DEV_EMMC) { 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 ea53fad1f..f74f8892b 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 @@ -5,7 +5,7 @@ #include "UIFlowPhotoParams.h" #include "UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgAPI.h" #include "ImageApp/ImageApp_Photo.h" - +#include "sf_sd_common.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 /////////////////////////////////////////////////////////////////////////////// @@ -48,7 +48,16 @@ CHAR *Get_FreePicNumString(UINT32 uiValue) #if USE_MMC_DEV_CHECK if(mmc_dev->dev_type != MMC_DEV_NO) { - fileCount = DCF_GetDBInfoEx(mmc_dev->dcf_handle, DCF_INFO_TOL_FILE_COUNT); + if(MMC_DEV_SD == mmc_dev->dev_type) + { + if(sf_in_card_exist()) + { + fileCount = DCF_GetDBInfoEx(mmc_dev->dcf_handle, DCF_INFO_TOL_FILE_COUNT); + } + } + else { + fileCount = DCF_GetDBInfoEx(mmc_dev->dcf_handle, DCF_INFO_TOL_FILE_COUNT); + } } #else fileCount = DCF_GetDBInfo(DCF_INFO_TOL_FILE_COUNT);