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 54c312b03..38361b441 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 @@ -146,7 +146,6 @@ extern "C" { #define SF_ERROR_CODE "THUMB/warning.txt" #define SF_DAILYREPORT_TXT "DailyReport.txt" #define SF_LOG_TXT "log.txt" -#define SF_LOW_POWER_WARN_FILENAME "/THUMB/btalarm.txt" #define UPGRADE_FIRMWARE_NANE (char*)"Mupgrade.bin" diff --git a/code/application/source/sf_app/code/source/paramMng/sf_param_common.c b/code/application/source/sf_app/code/source/paramMng/sf_param_common.c index f707a1343..5bf8a731c 100755 --- a/code/application/source/sf_app/code/source/paramMng/sf_param_common.c +++ b/code/application/source/sf_app/code/source/paramMng/sf_param_common.c @@ -67,6 +67,8 @@ SF_URL_S sfStOtaUrl = {0}; SF_PDT_PARAM_CFG_S StCustomerParam = {0}; SF_PDT_PARAM_STATISTICS_S Ststatistics= {0}; +char ParafilePath[64] = { 0 }; + void sf_sys_check_flag(void) { // Check and limit system flag value @@ -1283,21 +1285,14 @@ SINT32 sf_statistics_param_save(SF_PDT_PARAM_STATISTICS_S* pStatisticsParam) UINT32 CheckSum = 0; SINT32 lenth = 0; - char *file_path = sf_root_path_strcat(SIFAR_STATISTICS_PARAM_PATH); - if(file_path == NULL) - { - free(file_path); - return SF_FAILURE; - } - lenth = sizeof(SF_PDT_PARAM_STATISTICS_S); - fd = open(file_path, O_CREAT|O_RDWR, 0); + fd = open(ParafilePath, O_CREAT|O_RDWR, 0); if(fd < 0) { - fd = open(file_path, O_CREAT|O_RDWR, 0); /*open jpg file*/ + fd = open(ParafilePath, O_CREAT|O_RDWR, 0); /*open jpg file*/ if(fd < 0) { MLOGE("errno = [%d,%s]\n",errno,strerror(errno)); - SF_APPCOMM_CHECK_OPENFILE_RETURN(fd,file_path,SF_FAILURE); + SF_APPCOMM_CHECK_OPENFILE_RETURN(fd,ParafilePath,SF_FAILURE); } } @@ -1311,8 +1306,6 @@ SINT32 sf_statistics_param_save(SF_PDT_PARAM_STATISTICS_S* pStatisticsParam) MLOGE("save param failed!!!\n"); fsync(fd); close(fd); - - free(file_path); system("sync"); MLOGI("save e\n"); return SF_SUCCESS; @@ -1330,17 +1323,11 @@ SINT32 sf_statistics_param_load(SF_PDT_PARAM_STATISTICS_S* pStatisticsParam) static SINT32 loadFalg = 0; SF_PDT_PARAM_CFG_S *pSfCustomerPara = sf_customer_param_get(); - char *file_path = sf_root_path_strcat(SIFAR_STATISTICS_PARAM_PATH); - if(file_path == NULL) - { - free(file_path); - return SF_FAILURE; - } - if(loadFalg) return SF_SUCCESS; loadFalg = 1; + snprintf(ParafilePath, sizeof(ParafilePath), "%s%s", SF_EMMC_ROOT, SIFAR_STATISTICS_PARAM_PATH); lenth = sizeof(SF_PDT_PARAM_STATISTICS_S); memset(pStatisticsParam ,0,lenth); if(pSfCustomerPara->FirstUpdateFlag == SF_TRUE) @@ -1352,21 +1339,17 @@ SINT32 sf_statistics_param_load(SF_PDT_PARAM_STATISTICS_S* pStatisticsParam) MLOGI("FirstUpdateFlag = [%d],First start!!!,reset all param \n",pSfCustomerPara->FirstUpdateFlag); return SF_SUCCESS; } - if(access((char*)file_path, F_OK) == 0) + if(access((char*)ParafilePath, F_OK) == 0) { - fd = open(file_path, O_RDWR); + fd = open(ParafilePath, O_RDWR); if(fd < 0) { - - //SF_MESSAGE_BUF_S stMessageBuf = {0}; - //stMessageBuf.cmdId = 0x0113; - //stMessageBuf.arg1 = 0; - //sf_com_message_send_to_cardv(&stMessageBuf); - //usleep(500000); - fd = open(file_path, O_RDWR); /*open jpg file*/ - if(fd < 0) { - MLOGE("errno = [%d,%s]\n",errno,strerror(errno)); - SF_APPCOMM_CHECK_OPENFILE_RETURN(fd,file_path,SF_FAILURE); - } + memset(ParafilePath ,'\0',sizeof(ParafilePath)); + snprintf(ParafilePath, sizeof(ParafilePath), "%s%s", SF_SD_ROOT, SIFAR_STATISTICS_PARAM_PATH); + fd = open(ParafilePath, O_RDWR); /*open jpg file*/ + if(fd < 0) { + MLOGE("errno = [%d,%s]\n",errno,strerror(errno)); + SF_APPCOMM_CHECK_OPENFILE_RETURN(fd,ParafilePath,SF_FAILURE); + } } read(fd, pStatisticsParam, lenth); @@ -1391,19 +1374,16 @@ SINT32 sf_statistics_param_load(SF_PDT_PARAM_STATISTICS_S* pStatisticsParam) } else { - fd = open(file_path, O_CREAT|O_RDWR, 0); + fd = open(ParafilePath, O_CREAT|O_RDWR, 0); if(fd < 0) { - //SF_MESSAGE_BUF_S stMessageBuf = {0}; - //stMessageBuf.cmdId = 0x0113; - ///stMessageBuf.arg1 = 0; - //sf_com_message_send_to_cardv(&stMessageBuf); - //usleep(500000); - fd = open(file_path, O_CREAT|O_RDWR, 0); /*open jpg file*/ - if(fd < 0) { - MLOGE("errno = [%d,%s]\n",errno,strerror(errno)); - SF_APPCOMM_CHECK_OPENFILE_RETURN(fd,file_path,SF_FAILURE); - } - } + memset(ParafilePath ,'\0',sizeof(ParafilePath)); + snprintf(ParafilePath, sizeof(ParafilePath), "%s%s", SF_SD_ROOT, SIFAR_STATISTICS_PARAM_PATH); + fd = open(ParafilePath, O_CREAT|O_RDWR); + if(fd < 0) { + MLOGE("errno = [%d,%s]\n",errno,strerror(errno)); + SF_APPCOMM_CHECK_OPENFILE_RETURN(fd,ParafilePath,SF_FAILURE); + } + } sf_statistics_param_reset(pStatisticsParam); for(i=0; i<(lenth - 4); i++) @@ -1422,7 +1402,6 @@ SINT32 sf_statistics_param_load(SF_PDT_PARAM_STATISTICS_S* pStatisticsParam) MLOGD("SendPicDayCnt::%d\n", pStatisticsParam->SendPicDayCnt); //if(strlen(pStatisticsParam->WebIP) < 1) // sf_statistics_param_specify(pStatisticsParam); - free(file_path); return SF_SUCCESS; } void sf_all_param_reset(void)