From 1e82836e1c5b5beb020d21c99aea87db22440952 Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 11 Aug 2023 23:16:37 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=91=E9=80=81ftp=E6=97=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=9Blog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/sf_app/code/source/4gMng/sf_ftp.c | 56 +++++++++++-------- 1 file changed, 33 insertions(+), 23 deletions(-) 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 7b9e7d6ba..a220a2a47 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 @@ -884,6 +884,7 @@ SINT32 sf_pic_send_ftp(void) UINT8 csqlevel = 0; int timeout = 120000; SF_SRCFILE_ATTR_S *pThumbFileCfg = sf_file_thumb_cfg_get(); + MLOGD("start\n"); sf_custom_str_get(CamNameStr); sf_4G_signal_level_get(pPara->NetGeneration,sf_get_cq_signal(),&csqlevel); @@ -1050,7 +1051,7 @@ SINT32 sf_pic_send_ftp(void) } } - printf("[%s:%d]ret:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret); + MLOGD(" end ret:[0x%08X]\n", ret); return ret; } @@ -1073,6 +1074,7 @@ SINT32 sf_video_send_ftp(void) UINT8 fileIndex = 0; UINT8 csqlevel = 0; SF_SRCFILE_ATTR_S *pThumbFileCfg = sf_file_thumb_cfg_get(); + MLOGD("start\n"); sf_custom_str_get(CamNameStr); sf_4G_signal_level_get(pPara->NetGeneration,sf_get_cq_signal(),&csqlevel); @@ -1110,7 +1112,7 @@ SINT32 sf_video_send_ftp(void) } } - printf("[%s:%d]ret:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret); + MLOGD(" end ret:[0x%08X]\n", ret); return ret; } @@ -1125,7 +1127,7 @@ SINT32 sf_ftp_dailyreport_send(void) UIMenuStoreInfo *pPara = sf_app_ui_para_get(); SF_PDT_PARAM_STATISTICS_S *pSifarPara = sf_statistics_param_get(); - printf("%s:%d start\n", __FUNCTION__, __LINE__); + MLOGD("start\n"); if(SUCCESS != sf_create_dailyreport_file()) { @@ -1173,8 +1175,8 @@ SINT32 sf_ftp_dailyreport_send(void) } sf_dailyReport_set(); } + MLOGD(" end ret:[0x%08X]\n", ret); - printf("[%s:%d]ret:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret); return ret; } @@ -1231,8 +1233,7 @@ SINT32 sf_check_ftp_send(UINT8 mode) } } } - - printf("[%s:%d] ret=%d\n", __FUNCTION__, __LINE__, ret); + MLOGD("ret=%d\n", ret); return ret; } @@ -1253,7 +1254,7 @@ SINT32 sf_send_file_to_ftp(UINT8 mode) int timeout = 120000; UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); - printf("[%s:%d] s\n", __FUNCTION__, __LINE__); + MLOGD("start\n"); ssl = ((2 == puiPara->FtpSwitch) ? 1 : 0); gprsMode = 0;//puiPara->GprsMode; @@ -1341,7 +1342,8 @@ SINT32 sf_send_file_to_ftp(UINT8 mode) #if SF_TEST_ERROR_CODE sf_set_code_err_flag(0); #endif - printf("[%s:%d]ret1:[0x%08X],ret2:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret1, ret2); + //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); if(ret1 != SF_SUCCESS) { @@ -1372,6 +1374,7 @@ SINT32 sf_4g_module_ota_ftp(void) const UINT8 *user; const UINT8 *password; // FtpConfig config; + MLOGD("start\n"); ssl_flag = FTP_SSL_FLAG_DISABLE; ftpIP = pPara->OtaFtpIp; @@ -1408,7 +1411,7 @@ SINT32 sf_4g_module_ota_ftp(void) } } - MLOGD("e\n"); + MLOGD(" end ret:[0x%08X]\n", ret); return ret; } @@ -1428,7 +1431,7 @@ SINT32 sf_connect_ftps_server(void) int timeout = 120000; UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); - printf("[%s:%d] s\n", __FUNCTION__, __LINE__); + MLOGD("start\n"); ssl = ((2 == puiPara->FtpSwitch) ? 1 : 0); gprsMode = 0;//puiPara->GprsMode; @@ -1452,7 +1455,9 @@ SINT32 sf_connect_ftps_server(void) ret = sf_ftp_stop(ssl, gprsMode); //SF_FTP_CONNECT_END: - printf("[%s:%d]ret:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret); + //printf("[%s:%d]ret:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret); + MLOGD(" end ret:[0x%08X]\n", ret); + return ret; } @@ -1476,6 +1481,7 @@ SINT32 sf_camera_ota_ftp(void) const UINT8 *user; const UINT8 *password; // FtpConfig config; + MLOGD("start\n"); ssl_flag = FTP_SSL_FLAG_DISABLE; ftpIP = pPara->OtaFtpIp; @@ -1512,7 +1518,7 @@ SINT32 sf_camera_ota_ftp(void) } } - MLOGD("e\n"); + MLOGD(" end ret:[0x%08X]\n", ret); return ret; } @@ -1539,7 +1545,7 @@ SINT32 sf_concentrated_ftp_send(void) SF_SRCFILE_ATTR_S *pThumbFileCfg = sf_file_thumb_cfg_get(); - printf("[%s:%d] s\n", __FUNCTION__, __LINE__); + MLOGD("start\n"); SendFileTotal = sf_get_send_file_total(); ssl = ((2 == pPara->FtpSwitch) ? 1 : 0); gprsMode = 0;//puiPara->GprsMode; @@ -1682,7 +1688,8 @@ SF_CONCENTRATED_END: pSifarPara->sendThumbnailFailCount += ((piccount + 1) - sendAlreadyFlag); pSifarPara->picSendTimeoutCount += timeoutCnt; } - printf("[%s:%d]ret1:[0x%08X],ret2:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret1, ret2); + //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); if(ret1 != SF_SUCCESS) { @@ -1716,7 +1723,7 @@ SINT32 sf_hd_ftp_send(void) SF_PDT_PARAM_STATISTICS_S *pSifarPara = sf_statistics_param_get(); SF_HDFILE_ATTR_S* fileCfg = sf_file_hd_cfg_get(); - printf("[%s:%d] s\n", __FUNCTION__, __LINE__); + MLOGD("start\n"); SendFileTotal = fileCfg->filecnt; ssl = ((2 == pPara->FtpSwitch) ? 1 : 0); gprsMode = 0;//puiPara->GprsMode; @@ -1860,7 +1867,8 @@ SF_HD_END: //pSifarPara->sendThumbnailFailCount += ((piccount + 1) - sendAlreadyFlag); pSifarPara->picSendTimeoutCount += timeoutCnt; } - printf("[%s:%d]ret1:[0x%08X],ret2:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret1, ret2); + //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); if(ret1 != SF_SUCCESS) { @@ -1931,7 +1939,7 @@ SINT32 sf_video_ftp_send(void) SF_PDT_PARAM_STATISTICS_S *pSifarPara = sf_statistics_param_get(); SF_HDFILE_ATTR_S* fileCfg = sf_file_video_cfg_get(); - printf("[%s:%d] s\n", __FUNCTION__, __LINE__); + MLOGD("start\n"); SendFileTotal = fileCfg->filecnt; ssl = ((2 == pPara->FtpSwitch) ? 1 : 0); gprsMode = 0;//puiPara->GprsMode; @@ -2077,7 +2085,8 @@ SF_VIDEO_END: pSifarPara->picSendTimeoutCount += timeoutCnt; } - printf("[%s:%d]ret1:[0x%08X],ret2:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret1, ret2); + //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); if(ret1 != SF_SUCCESS) { @@ -2116,7 +2125,7 @@ SINT32 sf_log_send_ftp(void) ssl = ((2 == pPara->FtpSwitch) ? 1 : 0); gprsMode = 0;//puiPara->GprsMode; - printf("%s:%d start\n", __FUNCTION__, __LINE__); + MLOGD("start\n"); sf_set_send_log(0); if(sf_file_IsExsit(LOG_AT_FILE_PATH) != SF_TRUE) { @@ -2160,7 +2169,8 @@ SINT32 sf_log_send_ftp(void) #if SF_TEST_ERROR_CODE sf_set_code_err_flag(0); #endif - printf("[%s:%d]ret:[0x%08X],ret2:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret, ret2); + //printf("[%s:%d]ret:[0x%08X],ret2:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret, ret2); + MLOGD(" end ret:[0x%08X],ret2:[0x%08X]\n", ret, ret2); if(ret != SF_SUCCESS) { @@ -2198,9 +2208,9 @@ SINT32 sf_low_power_warn_send_ftp(void) sprintf((char *)filePath, "%s", SF_LOW_POWER_WARN_FILENAME); - printf("%s:%d filePath:%s\n", __FUNCTION__, __LINE__, filePath); sf_custom_str_get(customStr); sprintf((char *)uploadFname, "%s-%s-btalarm.txt",pPara->ModuleImei, customStr); + MLOGD(" uploadFname:%s filePath:%s\n", uploadFname, filePath); ret = sf_ftp_send(uploadFname, filePath, timeout); @@ -2210,8 +2220,8 @@ SINT32 sf_low_power_warn_send_ftp(void) }else { pSifarPara->SendlowPowerWarnCnt++; } - - printf("[%s:%d]ret:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret); + MLOGD(" end ret:[0x%08X]\n", ret); + //printf("[%s:%d]ret:[0x%08X]\n\n", __FUNCTION__, __LINE__, ret); return ret; } #ifdef __cplusplus