From 46494fadb0dc5b4ebc7c5ddedce92312ece5511f Mon Sep 17 00:00:00 2001 From: payton Date: Tue, 16 Jan 2024 14:20:37 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=91=E9=80=81=E7=BB=9F=E8=AE=A1=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sf_app/code/include/sf_param_struct.h | 16 +++- .../source/sf_app/code/source/4gMng/sf_ftp.c | 73 +++++++++++++++++-- .../sf_app/code/source/fileMng/sf_file.c | 37 +++++----- .../code/source/paramMng/sf_param_common.c | 15 ++++ 4 files changed, 115 insertions(+), 26 deletions(-) diff --git a/code/application/source/sf_app/code/include/sf_param_struct.h b/code/application/source/sf_app/code/include/sf_param_struct.h index 0a539ed0e..e9f0132d7 100755 --- a/code/application/source/sf_app/code/include/sf_param_struct.h +++ b/code/application/source/sf_app/code/include/sf_param_struct.h @@ -234,7 +234,21 @@ typedef struct sfPDT_PARAM_STATISTICS_S SF_SUBSCRIBE_FILE_ATTR_S stSubscribe; SF_OSS_S stOssCfg; SF_PARA_TIME_S httpTime; - + UINT32 TotalPicsSent; + UINT32 TotalPicsSuccess; + UINT32 TotalPicsFailed; + UINT32 TotalPicsTimeout; + UINT32 TotalTransmissionTime; + UINT32 ThumbnailTransmissionTime; + UINT32 ThumbnailPicsSent; + UINT32 ThumbnailPicsFailed; + UINT32 HDTransmissionTime; + UINT32 HDPicsSent; + UINT32 HDPicsFailed; + UINT32 VideoTransmissionTime; + UINT32 VideoSent; + UINT32 VideoFaild; + UINT32 picSendCount; UINT32 sendThumbnailCount; UINT32 picSendSucessCount; diff --git a/code/application/source/sf_app/code/source/4gMng/sf_ftp.c b/code/application/source/sf_app/code/source/4gMng/sf_ftp.c index 59f060b68..1f30153e7 100755 --- a/code/application/source/sf_app/code/source/4gMng/sf_ftp.c +++ b/code/application/source/sf_app/code/source/4gMng/sf_ftp.c @@ -890,6 +890,8 @@ SINT32 sf_pic_send_ftp(void) UINT8 csqlevel = 0; int timeout = 120000; //SINT64 sendStartTime = 0; + UINT8 sendAlreadyFlag = 0; + UINT8 timeoutCnt = 0; SF_SRCFILE_ATTR_S *pThumbFileCfg = sf_file_thumb_cfg_get(); MLOGD("start\n"); @@ -963,13 +965,17 @@ SINT32 sf_pic_send_ftp(void) if(SF_SUCCESS == ret) { ret = sf_ftp_send(ftpFileName[pic], filePath[pic], timeout); - + pSifarPara->TotalPicsSent++; if(SF_SUCCESS != ret) { pSifarPara->picSendFailCount++; pSifarPara->sendThumbnailFailCount++; //TIMEOUT //pSifarPara->picSendTimeoutCount++; + if(!sf_get_pic()) + { + timeoutCnt++; + } printf("%s:%d err ftpFileName:%s filePath:%s picSendFailCount:%d sendThumbnailFailCount:%d\n", __FUNCTION__, __LINE__, ftpFileName[pic], filePath[pic],pSifarPara->picSendFailCount, pSifarPara->sendThumbnailFailCount); SF_SPRINTF(logStr, "%x,", ret); sf_log_error_code(logStr); @@ -977,6 +983,10 @@ SINT32 sf_pic_send_ftp(void) else { if(!sf_get_mode_flag()){ pSifarPara->picSendMax++; + if(!sf_get_pic()) + { + sendAlreadyFlag++; + } } pSifarPara->picSendSucessCount++; if((pPara->SendMaxNum == 0) || (pSifarPara->picSendMax < pPara->SendMaxNum)){ @@ -999,7 +1009,11 @@ SINT32 sf_pic_send_ftp(void) } } // sendEndTime = clock(); - + //pSifarPara->TotalPicsSent++; + pSifarPara->TotalPicsSuccess += sendAlreadyFlag; + pSifarPara->TotalPicsFailed += timeoutCnt; + pSifarPara->ThumbnailPicsSent += sendAlreadyFlag; + pSifarPara->ThumbnailPicsFailed += timeoutCnt; //pSifarPara->picSendTimeCount +=sendEndTime - sendStartTime; //pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime; @@ -1180,6 +1194,22 @@ SINT32 sf_ftp_dailyreport_send(void) sf_log_error_code(logStr); }else { DailyReportFtpSendSucess = 1; + + pSifarPara->TotalPicsSent = 0; + pSifarPara->TotalPicsSuccess = 0; + pSifarPara->TotalPicsFailed = 0; + pSifarPara->TotalPicsTimeout = 0; + pSifarPara->TotalTransmissionTime = 0; + pSifarPara->ThumbnailTransmissionTime = 0; + pSifarPara->ThumbnailPicsSent = 0; + pSifarPara->ThumbnailPicsFailed = 0; + pSifarPara->HDTransmissionTime = 0; + pSifarPara->HDPicsSent = 0; + pSifarPara->HDPicsFailed = 0; + pSifarPara->VideoTransmissionTime = 0; + pSifarPara->VideoSent = 0; + pSifarPara->VideoFaild = 0; + pSifarPara->picSendCount = 0; pSifarPara->sendThumbnailCount = 0; pSifarPara->picSendSucessCount = 0; @@ -1355,6 +1385,9 @@ SINT32 sf_send_file_to_ftp(UINT8 mode) //sendEndTime = clock(); time(&sendEndTime); double elapsed_time = sf_sys_s_time_get(sendEndTime); + pSifarPara->TotalTransmissionTime += elapsed_time; + pSifarPara->ThumbnailTransmissionTime += elapsed_time; + pSifarPara->picSendTimeCount +=elapsed_time; pSifarPara->sendThumbnailTimeCount += elapsed_time; MLOGD("SendTime:%d s picSendTimeCount:%d s sendThumbnailTimeCount:%d s\n", elapsed_time, pSifarPara->picSendTimeCount,pSifarPara->sendThumbnailTimeCount); @@ -1745,6 +1778,9 @@ SF_CONCENTRATED_END: time(&sendEndTime); double elapsed_time = sf_sys_s_time_get(sendEndTime); + pSifarPara->TotalTransmissionTime += elapsed_time; + pSifarPara->ThumbnailTransmissionTime += elapsed_time; + pSifarPara->picSendTimeCount +=elapsed_time; pSifarPara->sendThumbnailTimeCount += elapsed_time; MLOGD("SendTime:%d s picSendTimeCount:%d s sendThumbnailTimeCount:%d s\n", elapsed_time, pSifarPara->picSendTimeCount,pSifarPara->sendThumbnailTimeCount); @@ -1766,11 +1802,18 @@ SF_CONCENTRATED_END: if(SendFileTotal) { SLOGI("Concentrated Send end.\n"); + pSifarPara->TotalPicsSent += (sendAlreadyFlag + timeoutCnt); + pSifarPara->TotalPicsSuccess += sendAlreadyFlag; + pSifarPara->TotalPicsFailed += timeoutCnt; + pSifarPara->TotalPicsTimeout += timeoutCnt; + pSifarPara->ThumbnailPicsSent += (piccount+1); + pSifarPara->ThumbnailPicsFailed += timeoutCnt; + pSifarPara->picSendCount += (piccount+1); pSifarPara->sendThumbnailCount += (piccount+1); pSifarPara->picSendSucessCount += sendAlreadyFlag; - pSifarPara->picSendFailCount += ((piccount + 1) - sendAlreadyFlag); - pSifarPara->sendThumbnailFailCount += ((piccount + 1) - sendAlreadyFlag); + pSifarPara->picSendFailCount += ((piccount + 1) - (sendAlreadyFlag + 1)); + pSifarPara->sendThumbnailFailCount += ((piccount + 1) - (sendAlreadyFlag + 1)); pSifarPara->picSendTimeoutCount += timeoutCnt; } //printf("[%s:%d]ret1:[0x%08X],ret2:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret1, ret2); @@ -1893,6 +1936,8 @@ SINT32 sf_hd_ftp_send(void) sendFailFlag++; time(&sendEndTime); elapsed_time = sf_sys_s_time_get(sendEndTime); + pSifarPara->TotalTransmissionTime += elapsed_time; + pSifarPara->picSendTimeCount +=elapsed_time; pSifarPara->sendThumbnailTimeCount += elapsed_time; MLOGD("SendTime:%d s picSendTimeCount:%d s sendThumbnailTimeCount:%d s\n", elapsed_time, pSifarPara->picSendTimeCount,pSifarPara->sendThumbnailTimeCount); @@ -1939,6 +1984,9 @@ SF_HD_END: time(&sendEndTime); elapsed_time = sf_sys_s_time_get(sendEndTime); + pSifarPara->TotalTransmissionTime += elapsed_time; + pSifarPara->HDTransmissionTime += elapsed_time; + pSifarPara->picSendTimeCount +=elapsed_time; MLOGD("SendTime:%d s picSendTimeCount:%d s sendThumbnailTimeCount:%d s\n", elapsed_time, pSifarPara->picSendTimeCount,pSifarPara->sendThumbnailTimeCount); time(&sendStartTime); @@ -1959,12 +2007,19 @@ SF_HD_END: if(SendFileTotal) { SLOGI("Concentrated Send end.\n"); + pSifarPara->TotalPicsSent += (sendAlreadyFlag + timeoutCnt); + pSifarPara->TotalPicsTimeout += timeoutCnt; + pSifarPara->HDPicsSent += (piccount+1); + pSifarPara->HDPicsFailed += timeoutCnt; + + pSifarPara->picSendCount += (piccount+1); pSifarPara->sendThumbnailCount += (piccount+1); pSifarPara->picSendSucessCount += sendAlreadyFlag; - pSifarPara->picSendFailCount += ((SendFileTotal + 1) - sendAlreadyFlag); + pSifarPara->picSendFailCount += ((SendFileTotal + 1) - (sendAlreadyFlag + 1)); //pSifarPara->sendThumbnailFailCount += ((piccount + 1) - sendAlreadyFlag); pSifarPara->picSendTimeoutCount += timeoutCnt; + MLOGD("[%s:%d]TotalPicsSent:%d\n\n", pSifarPara->TotalPicsSent); } //printf("[%s:%d]ret1:[0x%08X],ret2:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret1, ret2); MLOGD(" end ret1:[0x%08X],ret2:[0x%08X]\n", ret1, ret2); @@ -2178,6 +2233,7 @@ SF_VIDEO_END: time(&sendEndTime); elapsed_time = sf_sys_s_time_get(sendEndTime); + pSifarPara->VideoTransmissionTime += elapsed_time; pSifarPara->videoSendTimeCount +=elapsed_time; MLOGD("SendTime:%d s videoSendTimeCount:%d s sendThumbnailTimeCount:%d s\n", elapsed_time, pSifarPara->videoSendTimeCount,pSifarPara->sendThumbnailTimeCount); time(&sendStartTime); @@ -2193,8 +2249,13 @@ SF_VIDEO_END: if(SendFileTotal) { SLOGI("Send end.\n"); + pSifarPara->TotalPicsSent += (sendAlreadyFlag + timeoutCnt); + pSifarPara->TotalPicsTimeout += timeoutCnt; + pSifarPara->VideoSent += (sendAlreadyFlag + timeoutCnt); + pSifarPara->VideoFaild += (timeoutCnt); + pSifarPara->videoSendSucessCount += sendAlreadyFlag; - pSifarPara->videoSendFailCount += ((SendFileTotal + 1) - sendAlreadyFlag); + pSifarPara->videoSendFailCount += ((SendFileTotal + 1) - (sendAlreadyFlag + 1)); pSifarPara->picSendTimeoutCount += timeoutCnt; } 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 f34f54452..36d962269 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 @@ -1032,7 +1032,7 @@ UINT32 sf_create_dailyreport_file(void) pPara->SimIccid, \ pSifarPara->TirgNum, \ pSifarPara->NewFlieCount, \ - pSifarPara->picSendCount + pSifarPara->videoSendCount); + pSifarPara->TotalPicsSent); sf_versionGet(localver,localfea); temp = sf_battery_type_get(); @@ -1065,13 +1065,13 @@ UINT32 sf_create_dailyreport_file(void) "Thumbnail Transmission Time:%ld\r\n" "Thumbnail Pics Sent:%ld\r\n" "Thumbnail Pics Failed:%ld\r\n", \ - pSifarPara->picSendSucessCount + (pSifarPara->videoSendCount - pSifarPara->videoSendFailCount), \ - pSifarPara->picSendFailCount + pSifarPara->videoSendFailCount, \ - pSifarPara->picSendTimeoutCount, \ - pSifarPara->picSendTimeCount + pSifarPara->videoSendTimeCount, \ - pSifarPara->sendThumbnailTimeCount, \ - pSifarPara->sendThumbnailCount, \ - pSifarPara->sendThumbnailFailCount); + pSifarPara->TotalPicsSuccess, \ + pSifarPara->TotalPicsFailed, \ + pSifarPara->TotalPicsTimeout, \ + pSifarPara->TotalTransmissionTime, \ + pSifarPara->ThumbnailTransmissionTime, \ + pSifarPara->ThumbnailPicsSent, \ + pSifarPara->ThumbnailPicsFailed); sprintf((char *)szTmp2, "HD Transmission Time:%ld\r\n" "HD Pics Sent:%ld\r\n" @@ -1083,12 +1083,12 @@ UINT32 sf_create_dailyreport_file(void) "FW Ver:%s\r\n" "Mod:%s\r\n" "Power Type:%s\r\n", \ - pSifarPara->picSendTimeCount - pSifarPara->sendThumbnailTimeCount, \ - pSifarPara->picSendCount - pSifarPara->sendThumbnailCount, - pSifarPara->picSendFailCount - pSifarPara->sendThumbnailFailCount,\ - pSifarPara->videoSendTimeCount, \ - pSifarPara->videoSendCount, \ - pSifarPara->videoSendFailCount, \ + pSifarPara->HDTransmissionTime, \ + pSifarPara->HDPicsSent, + pSifarPara->HDPicsFailed,\ + pSifarPara->VideoTransmissionTime, \ + pSifarPara->VideoSent, \ + pSifarPara->VideoFaild, \ localfea, \ localver, \ pPara->ModuleSubver, \ @@ -1760,15 +1760,14 @@ BOOL sf_check_auto_thumb_file(VOID) fileCfg->filecnt = SendFileTotal; for(fileIndex = 0; fileIndex < SendFileTotal; fileIndex++) { - EmmcfileIndex--; - if((SF_CAM_MODE_PHOTO_VIDEO == (SendFileList[EmmcfileIndex][0] - '0')) || (SF_CAM_MODE_VIDEO2 == (SendFileList[EmmcfileIndex][0] - '0'))){ + 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[EmmcfileIndex][0] - '0')){ + }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[EmmcfileIndex][1]); + 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[EmmcfileIndex][1]); + &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); } 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 5bf8a731c..aed15a261 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 @@ -1242,6 +1242,21 @@ void sf_statistics_param_reset(SF_PDT_PARAM_STATISTICS_S *pSfPara) pSfPara->SmsFlag = 0; pSfPara->SmsNumber = 0; + pSifarPara->TotalPicsSent = 0; + pSifarPara->TotalPicsSuccess = 0; + pSifarPara->TotalPicsFailed = 0; + pSifarPara->TotalPicsTimeout = 0; + pSifarPara->TotalTransmissionTime = 0; + pSifarPara->ThumbnailTransmissionTime = 0; + pSifarPara->ThumbnailPicsSent = 0; + pSifarPara->ThumbnailPicsFailed = 0; + pSifarPara->HDTransmissionTime = 0; + pSifarPara->HDPicsSent = 0; + pSifarPara->HDPicsFailed = 0; + pSifarPara->VideoTransmissionTime = 0; + pSifarPara->VideoSent = 0; + pSifarPara->VideoFaild = 0; + memset(pSfPara->SmsStr, '\0', sizeof(pSfPara->SmsStr)); #ifdef SF_VERSION_RELEASE