From a061e9e79c0492fac309b2c45117359264c5855e Mon Sep 17 00:00:00 2001 From: payton Date: Sat, 20 Jan 2024 15:27:28 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=9B=86=E4=B8=AD=E5=8F=91=E9=80=81=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sf_app/code/source/fileMng/sf_file.c | 62 ++++++++++--------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/code/application/source/sf_app/code/source/fileMng/sf_file.c b/code/application/source/sf_app/code/source/fileMng/sf_file.c index 1d8ac5127..f1c1a525c 100755 --- a/code/application/source/sf_app/code/source/fileMng/sf_file.c +++ b/code/application/source/sf_app/code/source/fileMng/sf_file.c @@ -1728,6 +1728,7 @@ BOOL sf_check_auto_thumb_file(VOID) printf("%s:%d s\n", __FUNCTION__, __LINE__); UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); SF_SRCFILE_ATTR_S* fileCfg = sf_file_thumb_cfg_get(); + SendFileTotal = 0; if(0 == puiPara->SendType){ snprintf(sendListName, sizeof(sendListName), "%s%s", SF_EMMC_ROOT, SF_THUMB_SEND_AUTO); if((access(sendListName, F_OK) == 0)) @@ -1754,37 +1755,16 @@ BOOL sf_check_auto_thumb_file(VOID) } } - if(1 == SDSendFalg) - { - if(SUCCESS == sf_get_send_file_list(&SendFileList[0][0], &SendFileTotal)){ - if (fileCfg) { - ret = TRUE; - fileCfg->filecnt = SendFileTotal; - for(fileIndex = 0; fileIndex < SendFileTotal; fileIndex++) - { - if((SF_CAM_MODE_PHOTO_VIDEO == (SendFileList[fileIndex][0] - '0')) || (SF_CAM_MODE_VIDEO2 == (SendFileList[fileIndex][0] - '0'))){ - fileCfg->stfileattr[fileIndex].enFileTye = SF_FILE_TYPE_PIC_VIDEO; - }else if(SF_CAM_MODE_PHOTO == (SendFileList[fileIndex][0] - '0')){ - fileCfg->stfileattr[fileIndex].enFileTye = SF_FILE_TYPE_PIC_SMALL; - } - snprintf(fileCfg->stfileattr[fileIndex].thumbfileName, sizeof(fileCfg->stfileattr[fileIndex].thumbfileName), "%s", &SendFileList[fileIndex][1]); - snprintf(fileCfg->stfileattr[fileIndex].thumbfilePath, sizeof(fileCfg->stfileattr[fileIndex].thumbfilePath), "%s%s%s", SF_SD_ROOT, SF_SEND_LIST_DIR, - &SendFileList[fileIndex][1]); - printf("%s:%d thumbfileSize:%d thumbfileName:%s thumbfilePath:%s\n", __FUNCTION__, __LINE__, - fileCfg->stfileattr[fileIndex].thumbfileSize,fileCfg->stfileattr[fileIndex].thumbfileName,fileCfg->stfileattr[fileIndex].thumbfilePath); - } - } - } - } + UINT8 EmmcfileIndex = 0; if(1 == EmmcSendFalg) { if(SUCCESS == sf_get_send_file_list_emmc(&SendFileList[0][0], &EmmcfileIndex)){ if (fileCfg) { ret = TRUE; - SendFileTotal = (fileCfg->filecnt + EmmcfileIndex) >= 200 ? 200: (fileCfg->filecnt + EmmcfileIndex); - fileCfg->filecnt = SendFileTotal; - for(fileIndex = 0; fileIndex < SendFileTotal; fileIndex++) + fileCfg->filecnt = EmmcfileIndex; + SendFileTotal = EmmcfileIndex; + for(fileIndex = 0; fileIndex < EmmcfileIndex; fileIndex++) { if((SF_CAM_MODE_PHOTO_VIDEO == (SendFileList[fileIndex][0] - '0')) || (SF_CAM_MODE_VIDEO2 == (SendFileList[fileIndex][0] - '0'))){ fileCfg->stfileattr[fileIndex].enFileTye = SF_FILE_TYPE_PIC_VIDEO; @@ -1794,14 +1774,40 @@ BOOL sf_check_auto_thumb_file(VOID) snprintf(fileCfg->stfileattr[fileIndex].thumbfileName, sizeof(fileCfg->stfileattr[fileIndex].thumbfileName), "%s", &SendFileList[fileIndex][1]); snprintf(fileCfg->stfileattr[fileIndex].thumbfilePath, sizeof(fileCfg->stfileattr[fileIndex].thumbfilePath), "%s%s%s", SF_EMMC_ROOT, SF_SEND_LIST_DIR, &SendFileList[fileIndex][1]); - printf("%s:%d thumbfileSize:%d thumbfileName:%s thumbfilePath:%s\n", __FUNCTION__, __LINE__, + printf("%s:%d ID:%d thumbfileSize:%d thumbfileName:%s thumbfilePath:%s\n", __FUNCTION__, __LINE__, fileIndex, fileCfg->stfileattr[fileIndex].thumbfileSize,fileCfg->stfileattr[fileIndex].thumbfileName,fileCfg->stfileattr[fileIndex].thumbfilePath); } } } } - - printf("%s:%d e \n", __FUNCTION__, __LINE__); + UINT8 SdfileIndex = 0; + UINT8 SdfileCnt = 0; + + if(1 == SDSendFalg) + { + if(SUCCESS == sf_get_send_file_list(&SendFileList[0][0], &SdfileIndex)){ + if (fileCfg) { + ret = TRUE; + SendFileTotal = (fileCfg->filecnt + SdfileIndex) >= 200 ? 200: (fileCfg->filecnt + SdfileIndex); + fileCfg->filecnt = SendFileTotal; + for(; fileIndex < SendFileTotal; fileIndex++) + { + if((SF_CAM_MODE_PHOTO_VIDEO == (SendFileList[SdfileCnt][0] - '0')) || (SF_CAM_MODE_VIDEO2 == (SendFileList[SdfileCnt][0] - '0'))){ + fileCfg->stfileattr[fileIndex].enFileTye = SF_FILE_TYPE_PIC_VIDEO; + }else if(SF_CAM_MODE_PHOTO == (SendFileList[SdfileCnt][0] - '0')){ + fileCfg->stfileattr[fileIndex].enFileTye = SF_FILE_TYPE_PIC_SMALL; + } + snprintf(fileCfg->stfileattr[fileIndex].thumbfileName, sizeof(fileCfg->stfileattr[fileIndex].thumbfileName), "%s", &SendFileList[SdfileCnt][1]); + snprintf(fileCfg->stfileattr[fileIndex].thumbfilePath, sizeof(fileCfg->stfileattr[fileIndex].thumbfilePath), "%s%s%s", SF_SD_ROOT, SF_SEND_LIST_DIR, + &SendFileList[SdfileCnt][1]); + SdfileCnt++; + printf("%s:%d ID:%d thumbfileSize:%d thumbfileName:%s thumbfilePath:%s\n", __FUNCTION__, __LINE__, fileIndex, + fileCfg->stfileattr[fileIndex].thumbfileSize,fileCfg->stfileattr[fileIndex].thumbfileName,fileCfg->stfileattr[fileIndex].thumbfilePath); + } + } + } + } + printf("%s:%d e SendFileTotal:%d SdfileIndex:%d SdfileCnt:%d EmmcfileIndex:%d\n", __FUNCTION__, __LINE__, SendFileTotal, SdfileIndex, SdfileCnt, EmmcfileIndex); return ret; }