From 4ac4de21bab4c4a5d947be0caed4ef55515c2627 Mon Sep 17 00:00:00 2001 From: payton Date: Mon, 15 Jan 2024 14:36:45 +0800 Subject: [PATCH] =?UTF-8?q?1.dp=E5=8F=91=E9=80=81=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardv/SrcCode/PrjCfg_HUNTING_S550.h | 1 + .../sf_app/code/include/sf_param_enum.h | 1 - .../sf_app/code/source/fileMng/sf_file.c | 34 +++---------------- 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h index 597091afc..03d1892fb 100755 --- a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h +++ b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h @@ -981,6 +981,7 @@ #define SF_CAM_UP_FILE_PATH "FW98565A.bin" #define SF_CAMERA_GPS_INFO_FILENAME "/tmp/gps.txt" #define SF_LOW_POWER_WARN_FILENAME "/tmp/btalarm.txt" +#define SF_DAILYREPORT_FILENAME "/tmp/d.txt" #define SF_UBOOT_UPDATA_FW ENABLE diff --git a/code/application/source/sf_app/code/include/sf_param_enum.h b/code/application/source/sf_app/code/include/sf_param_enum.h index 38361b441..3ed5a9ee2 100755 --- a/code/application/source/sf_app/code/include/sf_param_enum.h +++ b/code/application/source/sf_app/code/include/sf_param_enum.h @@ -142,7 +142,6 @@ extern "C" { #define SIFAR_CUSTOMER_PARAM_PATH "/misc/sfSysParm.bin" #define SIFAR_STATISTICS_PARAM_PATH "THUMB/sfStatisticsParm.bin" //#define SF_SEND_LIST_DIR SF_SD_ROOT"THUMB" -#define SF_DAILYREPORT_FILENAME "THUMB/d.txt" #define SF_ERROR_CODE "THUMB/warning.txt" #define SF_DAILYREPORT_TXT "DailyReport.txt" #define SF_LOG_TXT "log.txt" 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 29378ae7e..f34f54452 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 @@ -942,26 +942,6 @@ UINT32 sf_create_dailyreport_file(void) char imageSize = 0; char videoSize = 0; /*Avoid New Card*/ - char *thumb_dir = sf_root_path_strcat(SF_THUMB_DIR); - if(thumb_dir == NULL) - { - free(thumb_dir); - return SF_FAILURE; - } - - if (access(thumb_dir, F_OK) == -1) { - printf("%s directory does not exist. Creating...\n", thumb_dir); - - if (mkdir(thumb_dir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) == -1) { - perror("mkdir() error"); - } else { - printf("%s directory created.\n", thumb_dir); - } - } else { - printf("%s directory exists.\n", thumb_dir); - } - free(thumb_dir); - //sf_create_thumb_dir(); if(SF_CAMID_ON == pPara->CamNameSwitch) { @@ -1287,20 +1267,14 @@ UINT32 sf_create_dailyreport_file(void) printf("szTmp2=%s\n",szTmp2); printf("cfgTmp:%s\n", cfgTmp); - char *dailyrp_file = sf_root_path_strcat(SF_DAILYREPORT_FILENAME); - if(dailyrp_file == NULL) - { - free(dailyrp_file); - return SF_FAILURE; - } - if(sf_file_IsExsit(dailyrp_file) == SF_TRUE){ - sf_file_remove(dailyrp_file); + + if(sf_file_IsExsit(SF_DAILYREPORT_FILENAME) == SF_TRUE){ + sf_file_remove(SF_DAILYREPORT_FILENAME); } - fd = open(dailyrp_file, O_APPEND | O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); + fd = open(SF_DAILYREPORT_FILENAME, O_APPEND | O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); if(fd) { - free(dailyrp_file); szTmpsize=SF_STRLEN(szTmp); //printf("szTmpsize=%d\n",szTmpsize); write(fd, szTmp, szTmpsize);