diff --git a/code/application/source/sf_app/code/include/sf_ftp.h b/code/application/source/sf_app/code/include/sf_ftp.h index a9afa1846..51177632e 100755 --- a/code/application/source/sf_app/code/include/sf_ftp.h +++ b/code/application/source/sf_app/code/include/sf_ftp.h @@ -25,6 +25,7 @@ #include "kwrap/nvt_type.h" #include "sf_type.h" +#include typedef enum _FTP_SIM_E { FTP_SIM_CGDCONT = 0, @@ -220,5 +221,7 @@ SINT32 sf_video_ftp_send(void); SINT32 sf_get_ftp_open_flag(void); SINT32 sf_log_send_ftp(void); SINT32 sf_low_power_warn_send_ftp(void); +double sf_sys_s_time_get(time_t end_time); +time_t sf_time (time_t *__timer); #endif /*_SF_FTP_H_*/ diff --git a/code/application/source/sf_app/code/include/sf_sms.h b/code/application/source/sf_app/code/include/sf_sms.h index 5e6780a5f..b75bbcd3e 100644 --- a/code/application/source/sf_app/code/include/sf_sms.h +++ b/code/application/source/sf_app/code/include/sf_sms.h @@ -266,5 +266,6 @@ UINT8 sf_set_send_hd(UINT8 value); UINT8 sf_set_send_video(UINT8 value); UINT8 sf_get_send_log(void); UINT8 sf_set_send_log(UINT8 value); +SINT32 sf_power_off_statistics(void); #endif /*_SF_SMS_H_*/ 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 ac725d4fe..db6f2b4a7 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 @@ -105,7 +105,8 @@ UINT8 DailyReportFtpSendSucess = 0; SINT32 FtpOpenOk = FAIL; extern char logStr[128]; extern char gsmPara[GPRS_INFO_LINE_MAX]; - +extern time_t sendStartTime; +time_t sendEndTime = 0; /************************************************* Function: sf_check_max_num Description: check the max num one day limit. @@ -884,11 +885,11 @@ SINT32 sf_pic_send_ftp(void) UINT8 pic = 0; UINT8 csqlevel = 0; int timeout = 120000; - SINT64 sendStartTime = 0; - SINT64 sendEndTime = 0; + //SINT64 sendStartTime = 0; + SF_SRCFILE_ATTR_S *pThumbFileCfg = sf_file_thumb_cfg_get(); MLOGD("start\n"); - sendStartTime = sf_sys_os_utime_get()/1000; + //sendStartTime = sf_sys_os_utime_get()/1000; sf_custom_str_get(CamNameStr); sf_4G_signal_level_get(pPara->NetGeneration,sf_get_cq_signal(),&csqlevel); @@ -991,14 +992,41 @@ SINT32 sf_pic_send_ftp(void) printf("%s:%d err up file ftpFileName:%s filePath:%s\n", __FUNCTION__, __LINE__, ftpFileName[pic], filePath[pic]); } } - sendEndTime = sf_sys_os_utime_get()/1000; - pSifarPara->picSendTimeCount +=sendEndTime - sendStartTime; - pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime; + // sendEndTime = clock(); + + //pSifarPara->picSendTimeCount +=sendEndTime - sendStartTime; + //pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime; - MLOGD(" end ret:[0x%08X] sendTime:%ds\n", ret, (sendEndTime - sendStartTime)); + MLOGD(" end ret:[0x%08X] \n", ret); return ret; } +double sf_sys_ms_time_get(clock_t end_time) +{ + // ms + double elapsed_time = (double)(end_time - sendStartTime) / CLOCKS_PER_SEC * 1000; + printf("time: %.2f ms\n", elapsed_time); + + return elapsed_time; +} +double sf_sys_s_time_get(time_t end_time) +{ + // time + double elapsed_time = difftime(end_time, sendStartTime); + + // s + printf("start_time: %s", ctime(&sendStartTime)); + printf("end_time: %s", ctime(&end_time)); + + + printf("time: %.2f s\n", elapsed_time); + + return elapsed_time; +} +time_t sf_time (time_t *__timer) +{ + time(__timer); +} SINT32 sf_video_send_ftp(void) { //extern UINT8 PicName[5][2][35]; @@ -1197,7 +1225,8 @@ SINT32 sf_send_file_to_ftp(UINT8 mode) UINT8 gprsMode = 0; int timeout = 120000; UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); - + SF_PDT_PARAM_STATISTICS_S *pSifarPara = sf_statistics_param_get(); + SINT64 sendEndTime = 0; MLOGD("start\n"); ssl = ((2 == puiPara->FtpSwitch) ? 1 : 0); @@ -1271,6 +1300,13 @@ SINT32 sf_send_file_to_ftp(UINT8 mode) ret1 = sf_video_send_ftp(); } } + //sendEndTime = clock(); + time(&sendEndTime); + double elapsed_time = sf_sys_s_time_get(sendEndTime); + 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); + time(&sendStartTime); } else { @@ -1519,12 +1555,12 @@ SINT32 sf_concentrated_ftp_send(void) UINT8 sendFailFlag = 0; UINT8 sendAlreadyFlag = 0; UINT8 timeoutCnt = 0; - SINT64 sendStartTime = 0; + // SINT64 sendStartTime = 0; SINT64 sendEndTime = 0; sf_custom_str_get(CamNameStr); sf_4G_signal_level_get(pPara->NetGeneration,sf_get_cq_signal(),&csqlevel); - sendStartTime = sf_sys_os_utime_get()/1000; + // sendStartTime = sf_sys_os_utime_get()/1000; SF_CONCENTRATED_MODULE_REBOOT://Restart the module once. ret1 = sf_ftp_config(ssl, gprsMode, timeout); @@ -1579,9 +1615,9 @@ SINT32 sf_concentrated_ftp_send(void) } else if(1 == sendFailFlag){ sendFailFlag++; - sendEndTime = sf_sys_os_utime_get()/1000; - pSifarPara->picSendTimeCount +=sendEndTime - sendStartTime; - pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime; + // sendEndTime = sf_sys_os_utime_get()/1000; + // pSifarPara->picSendTimeCount +=sendEndTime - sendStartTime; + // pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime; if(sf_ttyusb_restart() != SUCCESS) { printf("%s:%d restart tty usb err\n", __FUNCTION__, __LINE__); @@ -1617,10 +1653,12 @@ SINT32 sf_concentrated_ftp_send(void) SF_CONCENTRATED_END: - sendEndTime = sf_sys_os_utime_get()/1000; - pSifarPara->picSendTimeCount +=sendEndTime - sendStartTime; - pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime; - printf("[%s:%d] : sendStartTime:%d sendEndTime:%d\n\n", __FUNCTION__, __LINE__, sendStartTime, sendEndTime); + time(&sendEndTime); + double elapsed_time = sf_sys_s_time_get(sendEndTime); + 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); + time(&sendStartTime); if(!(((piccount+1) <= SendFileTotal) && ((pSifarPara->picSendMax < pPara->SendMaxNum) || (pPara->SendMaxNum == 0)))) { @@ -1697,14 +1735,13 @@ SINT32 sf_hd_ftp_send(void) UINT8 sendFailFlag = 0; UINT8 sendAlreadyFlag = 0; UINT8 timeoutCnt = 0; - SINT64 sendStartTime = 0; - SINT64 sendEndTime = 0; + double elapsed_time = 0; sf_set_send_hd(0); sf_custom_str_get(CamNameStr); sf_4G_signal_level_get(pPara->NetGeneration,sf_get_cq_signal(),&csqlevel); - sendStartTime = sf_sys_os_utime_get()/1000; + // sendStartTime = sf_sys_os_utime_get()/1000; SF_HD_MODULE_REBOOT://Restart the module once. ret1 = sf_ftp_config(ssl, gprsMode, timeout); @@ -1755,9 +1792,12 @@ SINT32 sf_hd_ftp_send(void) } else if(1 == sendFailFlag){ sendFailFlag++; - sendEndTime = sf_sys_os_utime_get()/1000; - pSifarPara->picSendTimeCount +=sendEndTime - sendStartTime; - pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime; + time(&sendEndTime); + elapsed_time = sf_sys_s_time_get(sendEndTime); + 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); + time(&sendStartTime); if(sf_ttyusb_restart() != SUCCESS) { printf("%s:%d restart tty usb err\n", __FUNCTION__, __LINE__); @@ -1796,10 +1836,11 @@ SINT32 sf_hd_ftp_send(void) SF_HD_END: - sendEndTime = sf_sys_os_utime_get()/1000; - pSifarPara->picSendTimeCount +=sendEndTime - sendStartTime; - //pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime; - printf("[%s:%d] : sendStartTime:%d sendEndTime:%d\n\n", __FUNCTION__, __LINE__, sendStartTime, sendEndTime); + time(&sendEndTime); + elapsed_time = sf_sys_s_time_get(sendEndTime); + pSifarPara->picSendTimeCount +=elapsed_time; + MLOGD("SendTime:%d s picSendTimeCount:%d s sendThumbnailTimeCount:%d s\n", elapsed_time, pSifarPara->picSendTimeCount,pSifarPara->sendThumbnailTimeCount); + time(&sendStartTime); if(!(((piccount) <= SendFileTotal) && ((pSifarPara->picSendMax < pPara->SendMaxNum) || (pPara->SendMaxNum == 0)))) { @@ -1913,7 +1954,7 @@ SINT32 sf_video_ftp_send(void) UINT8 sendFailFlag = 0; UINT8 sendAlreadyFlag = 0; UINT8 timeoutCnt = 0; - SINT64 sendStartTime = 0; + double elapsed_time = 0; SINT64 sendEndTime = 0; UINT32 size = 0; @@ -1921,7 +1962,7 @@ SINT32 sf_video_ftp_send(void) sf_custom_str_get(CamNameStr); sf_4G_signal_level_get(pPara->NetGeneration,sf_get_cq_signal(),&csqlevel); - sendStartTime = sf_sys_os_utime_get()/1000; + // sendStartTime = sf_sys_os_utime_get()/1000; SF_VIDEO_MODULE_REBOOT://Restart the module once. ret1 = sf_ftp_config(ssl, gprsMode, timeout); @@ -1980,9 +2021,14 @@ SINT32 sf_video_ftp_send(void) } else if(1 == sendFailFlag){ sendFailFlag++; - sendEndTime = sf_sys_os_utime_get()/1000; - pSifarPara->picSendTimeCount +=sendEndTime - sendStartTime; - pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime; + + time(&sendEndTime); + elapsed_time = sf_sys_s_time_get(sendEndTime); + //pSifarPara->picSendTimeCount +=elapsed_time; + pSifarPara->videoSendTimeCount += elapsed_time; + MLOGD("SendTime:%d s picSendTimeCount:%d s sendThumbnailTimeCount:%d s\n", elapsed_time, pSifarPara->picSendTimeCount,pSifarPara->sendThumbnailTimeCount); + time(&sendStartTime); + if(sf_ttyusb_restart() != SUCCESS) { printf("%s:%d restart tty usb err\n", __FUNCTION__, __LINE__); @@ -2021,11 +2067,12 @@ SINT32 sf_video_ftp_send(void) SF_VIDEO_END: - sendEndTime = sf_sys_os_utime_get()/1000; - pSifarPara->videoSendTimeCount +=sendEndTime - sendStartTime; - //pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime; - printf("[%s:%d] : sendStartTime:%d sendEndTime:%d\n\n", __FUNCTION__, __LINE__, sendStartTime, sendEndTime); - + time(&sendEndTime); + elapsed_time = sf_sys_s_time_get(sendEndTime); + pSifarPara->videoSendTimeCount +=elapsed_time; + MLOGD("SendTime:%d s videoSendTimeCount:%d s sendThumbnailTimeCount:%d s\n", elapsed_time, pSifarPara->videoSendTimeCount,pSifarPara->sendThumbnailTimeCount); + time(&sendStartTime); + if(ret1 != SF_FTP_ERROR_TERM) { ret2 = sf_ftp_stop(ssl, gprsMode);