1.预约发送修改;2.卡相关的宏修改

This commit is contained in:
payton 2024-01-09 16:33:45 +08:00
parent 78eb878d79
commit b77aeffc96
2 changed files with 13 additions and 10 deletions

View File

@ -229,6 +229,7 @@ typedef struct SubImgList
{ {
UINT16 dirKey; UINT16 dirKey;
UINT16 fileKey; UINT16 fileKey;
UINT16 storage;//0:emmc; 1:sd
struct SubImgList *pNext; struct SubImgList *pNext;
} SubImgList_t; } SubImgList_t;

View File

@ -1973,23 +1973,25 @@ void sf_hd_pic_add_to_list(UINT8 *fileName)
UINT16 dirKey = 0; UINT16 dirKey = 0;
UINT16 fileKey = 0; UINT16 fileKey = 0;
UINT8 tempStr[20] = {0}; UINT8 tempStr[20] = {0};
char emmcsdStr[4] = {0};
SubImgList_t *pList = pSubImgListHead; SubImgList_t *pList = pSubImgListHead;
SubImgList_t *qList = pSubImgListHead; SubImgList_t *qList = pSubImgListHead;
char fname[50] = {0}; char fname[50] = {0};
char *dcf_file = sf_get_strg_dev() == MMC_DEV_EMMC ? "SYBX" : "SYEX";
printf("[%s:%d] add to list:%s\n", __FUNCTION__, __LINE__, fileName); printf("[%s:%d] add to list:%s\n", __FUNCTION__, __LINE__, fileName);
SF_STRNCPY(emmcsdStr, fileName, 1);
SF_STRNCPY(tempStr, fileName+1, 3); SF_STRNCPY(tempStr, fileName+1, 3);
dirKey = atoi((const char *)tempStr); dirKey = atoi((const char *)tempStr);
fileKey = atoi((const char *)fileName+4); fileKey = atoi((const char *)fileName+4);
char *strg_path = sf_get_root_path(); if(strstr(emmcsdStr, "E"))
if(strg_path == NULL) {
{ SF_SPRINTF(fname, "mmt/sd/%s/%03dMEDIA/%s%04d.JPG", SF_DCIM_DIR, dirKey, SF_SD_DCF_FILE_NAME, fileKey);
free(strg_path); }
return; else
} {
SF_SPRINTF(fname, "%s%s/%03dMEDIA/%s%04d.JPG", strg_path, SF_DCIM_DIR, dirKey, dcf_file, fileKey); SF_SPRINTF(fname, "mmt/sd2/%s/%03dMEDIA/%s%04d.JPG", SF_DCIM_DIR, dirKey, SF_EMMC_DCF_FILE_NAME, fileKey);
free(strg_path); }
if(sf_file_IsExsit(fname) != SF_TRUE) if(sf_file_IsExsit(fname) != SF_TRUE)
{ {
MLOGE("%s\n", fname); MLOGE("%s\n", fname);
@ -2119,7 +2121,7 @@ void sf_video_add_to_list(UINT8 *fileName)
UINT8 i = 0; UINT8 i = 0;
UINT16 dirKeytmp = 0; UINT16 dirKeytmp = 0;
UINT16 fileKeytmp = 0; UINT16 fileKeytmp = 0;
char *dcf_file = sf_get_strg_dev() == MMC_DEV_EMMC ? "SYBX" : "SYEX"; char *dcf_file = sf_get_strg_dev() == MMC_DEV_EMMC ? SF_EMMC_DCF_FILE_NAME : SF_SD_DCF_FILE_NAME;
printf("add to list:%s\n", fileName); printf("add to list:%s\n", fileName);
char *strg_path = sf_get_root_path(); char *strg_path = sf_get_root_path();