From 9776baf171b511fb03d5365acc1984e0e7db19fb Mon Sep 17 00:00:00 2001 From: payton Date: Tue, 25 Jul 2023 14:59:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=BF=9E=E6=8B=8D=E5=8F=91?= =?UTF-8?q?=E9=80=81=202.=E9=80=82=E9=85=8Deg915q?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/sf_app/code/source/4gMng/sf_ftp.c | 76 +++++++++++-------- 1 file changed, 45 insertions(+), 31 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 6432326f4..c178a2322 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 @@ -226,7 +226,7 @@ SINT32 sf_ftp_config(UINT8 ssl, UINT8 GprsMode, UINT8 timeout) if(SF_SUCCESS != ret){ sf_sys_status_led_set(SF_LED_SYS_STATE_SEND_FAIL); } - FtpOpenOk = ret; + //FtpOpenOk = ret; return ret; @@ -908,8 +908,7 @@ SINT32 sf_pic_send_ftp(void) timeout = 120; } - printf("NetGeneration:%dG,tempPicSize=%d,piccount=%d,pic=%d\n", pPara->NetGeneration, tempPicSize, piccount, pic); - +#if 0 if((0 == pPara->SendMulti) || (pPara->SendMultishotIndex1) || (SF_MANUAL == sf_get_mode_flag())) { if(SF_FILE_TYPE_PIC_VIDEO == pThumbFileCfg->stfileattr[piccount].enFileTye){ @@ -993,7 +992,8 @@ SINT32 sf_pic_send_ftp(void) piccount++; } } - +#endif + piccount = pThumbFileCfg->filecnt; if(4 == pPara->NetGeneration) { if(piccount >= 2) @@ -1008,17 +1008,26 @@ SINT32 sf_pic_send_ftp(void) piccount = 1; } } + MLOGI("NetGeneration:%dG,tempPicSize=%d,piccount=%d,filecnt=%d\n", pPara->NetGeneration, tempPicSize, piccount, pThumbFileCfg->filecnt); - printf("[%s:%d]piccount=%d\n", __FUNCTION__, __LINE__, piccount); + //printf("[%s:%d]piccount=%d\n", __FUNCTION__, __LINE__, piccount); /* dbg log */ - for(pic = 0; pic < piccount; pic++) +/* for(pic = 0; pic < piccount; pic++) { printf("%s:%d pic:%d ftpFileName:%s filePath:%s fileStr:%s\n", __FUNCTION__, __LINE__, pic, ftpFileName[pic], filePath[pic], fileStr[pic]); } - +*/ for(pic = 0; pic < piccount; pic++) { + if(SF_FILE_TYPE_PIC_VIDEO == pThumbFileCfg->stfileattr[pic].enFileTye){ + sprintf((char *)ftpFileName[pic], "%sV-%s", cameraID, pThumbFileCfg->stfileattr[pic].thumbfileName); + }else{ + sprintf((char *)ftpFileName[pic], "%s%s", cameraID, pThumbFileCfg->stfileattr[pic].thumbfileName); + } + sprintf((char *)filePath[pic], "%s", pThumbFileCfg->stfileattr[pic].thumbfilePath); + printf("%s:%d pic:%d ftpFileName:%s filePath:%s fileStr:%s\n", __FUNCTION__, __LINE__, pic, ftpFileName[pic], filePath[pic], fileStr[pic]); + //ret = sf_simcom_upload_file_to_module(fileStr[pic],ftpFileName[pic]); ret = SF_SUCCESS; @@ -1076,7 +1085,7 @@ SINT32 sf_video_send_ftp(void) fileIndex = sf_check_file_video(); sprintf((char *)ftpFileName, "%s%s", cameraID, pThumbFileCfg->stfileattr[fileIndex].thumbfileName); - sprintf((char *)filePath, "UFS:/%s", pThumbFileCfg->stfileattr[fileIndex].thumbfileName); + sprintf((char *)filePath, "%s", pThumbFileCfg->stfileattr[fileIndex].thumbfilePath); printf("%s:%d ftpFileName:%s filePath:%s videoDir:%s\n", __FUNCTION__, __LINE__, ftpFileName, filePath, videoDir); @@ -1118,7 +1127,7 @@ SINT32 sf_ftp_dailyreport_send(void) printf("%s:%d err create dailyreport file\n", __FUNCTION__, __LINE__); return SF_FAILURE; } - sprintf((char *)filePath, "UFS:/%s", SF_DAILYREPORT_TXT); + sprintf((char *)filePath, "%s", SF_DAILYREPORT_FILENAME); //sprintf((char *)filePath, "UFS:/%s-dr.txt", pPara->ModuleImei); printf("%s:%d filePath:%s\n", __FUNCTION__, __LINE__, filePath); @@ -1126,7 +1135,7 @@ SINT32 sf_ftp_dailyreport_send(void) sf_custom_str_get(customStr); sprintf((char *)uploadFname, "%s-%s-dr.txt",pPara->ModuleImei, customStr); - ret = sf_quectel_upload_file_to_module((UINT8 *)SF_DAILYREPORT_FILENAME, (UINT8 *)SF_DAILYREPORT_TXT); + ret = SF_SUCCESS;//sf_quectel_upload_file_to_module((UINT8 *)SF_DAILYREPORT_FILENAME, (UINT8 *)SF_DAILYREPORT_TXT); if(SF_SUCCESS != ret) { @@ -1252,7 +1261,7 @@ SINT32 sf_send_file_to_ftp(UINT8 mode) { if(smtpUploadPicFlag == 0) { - ret1 = sf_upload_send_files_to_module(1); + ret1 = SF_SUCCESS;//sf_upload_send_files_to_module(1); if(SF_UPLOAD_ERROR_RETRY == ret1) { @@ -1261,7 +1270,7 @@ SINT32 sf_send_file_to_ftp(UINT8 mode) if(ret1 == SF_SUCCESS) { - ret1 = sf_upload_send_files_to_module(1); + ret1 = SF_SUCCESS;//sf_upload_send_files_to_module(1); } } } @@ -1278,7 +1287,7 @@ SINT32 sf_send_file_to_ftp(UINT8 mode) { if(smtpUploadVideoFlag == 0) { - ret1 = sf_upload_send_files_to_module(2); + ret1 = SF_SUCCESS;//sf_upload_send_files_to_module(2); if(SF_UPLOAD_ERROR_RETRY == ret1) { @@ -1287,7 +1296,7 @@ SINT32 sf_send_file_to_ftp(UINT8 mode) if(ret1 == SF_SUCCESS) { - ret1 = sf_upload_send_files_to_module(2); + ret1 = SF_SUCCESS;//sf_upload_send_files_to_module(2); } } } @@ -2264,7 +2273,11 @@ SINT32 sf_connect_ftps_server(void) } ret = sf_ftp_config(ssl, gprsMode, timeout); - + FtpManagerCode result = ftp_service_available(); + if(FTP_MANAGER_SERVICE_AVAILABLE == result) + { + FtpOpenOk = SUCCESS; + } ret = sf_ftp_stop(ssl, gprsMode); //SF_FTP_CONNECT_END: @@ -3296,7 +3309,7 @@ SINT32 sf_hd_ftp_send(void) UINT8 ssl = 0; UINT8 gprsMode = 0; UINT8 timeout = 100; - UINT8 piccount = 1; + UINT8 piccount = 0; UINT8 SendFileTotal = 0; UINT8 battery = 0; UIMenuStoreInfo *pPara = sf_app_ui_para_get(); @@ -3334,13 +3347,13 @@ SINT32 sf_hd_ftp_send(void) if(SF_SUCCESS == ret1) { - while((sf_app_while_flag()) && (((piccount+1) <= SendFileTotal)) && ((pPara->GprsMode == 1) || ((pSifarPara->subscribeSendCnt < SUBSCRIBE_SEND_MAX_NUM) && (pPara->GprsMode != 1)))) + while((sf_app_while_flag()) && (((piccount) < SendFileTotal)) && ((pPara->GprsMode == 1) || ((pSifarPara->subscribeSendCnt < SUBSCRIBE_SEND_MAX_NUM) && (pPara->GprsMode != 1)))) { snprintf((char *)ftpFileName, sizeof(ftpFileName), "W%03d%04d.JPG", fileCfg->stfileattr[piccount].dirKey, fileCfg->stfileattr[piccount].fileKey); snprintf((char *)filePath, sizeof(filePath), "%s/%s", SF_HD_DIR, ftpFileName); sf_set_del_flag(FALSE); - ret1 = sf_quectel_upload_file_to_module(filePath, ftpFileName); + ret1 = SF_SUCCESS;//sf_quectel_upload_file_to_module(filePath, ftpFileName); if(SF_UPLOAD_ERROR_RETRY == ret1) { @@ -3349,18 +3362,18 @@ SINT32 sf_hd_ftp_send(void) if(ret1 == SF_SUCCESS) { - ret1 = sf_quectel_upload_file_to_module(filePath, ftpFileName); + ret1 = SF_SUCCESS;//sf_quectel_upload_file_to_module(filePath, ftpFileName); } } battery = sf_app_get_battery(); memset(cameraID, '\0', sizeof(cameraID)); memset(ftpFileName, '\0', sizeof(ftpFileName)); - memset(filePath, '\0', sizeof(filePath)); + //memset(filePath, '\0', sizeof(filePath)); snprintf(cameraID, sizeof(cameraID), "%s-%d-%d-%s-", pPara->ModuleImei, battery, csqlevel, CamNameStr); snprintf((char *)ftpFileName, sizeof(ftpFileName), "%sHD-W%03d%04d.JPG", cameraID, fileCfg->stfileattr[piccount].dirKey, fileCfg->stfileattr[piccount].fileKey); - snprintf((char *)filePath, sizeof(filePath), "UFS:/W%03d%04d.JPG", fileCfg->stfileattr[piccount].dirKey, fileCfg->stfileattr[piccount].fileKey); + //snprintf((char *)filePath, sizeof(filePath), "UFS:/W%03d%04d.JPG", fileCfg->stfileattr[piccount].dirKey, fileCfg->stfileattr[piccount].fileKey); printf("%s:%d ftpFileName:%s filePath:%s\n", __FUNCTION__, __LINE__, ftpFileName, filePath); @@ -3424,7 +3437,7 @@ SF_HD_END: //pSifarPara->sendThumbnailTimeCount += sendEndTime - sendStartTime; printf("[%s:%d] : sendStartTime:%d sendEndTime:%d\n\n", __FUNCTION__, __LINE__, sendStartTime, sendEndTime); - if(!(((piccount+1) <= SendFileTotal) && ((pSifarPara->picSendMax < pPara->SendMaxNum) || (pPara->SendMaxNum == 0)))) + if(!(((piccount) <= SendFileTotal) && ((pSifarPara->picSendMax < pPara->SendMaxNum) || (pPara->SendMaxNum == 0)))) { sf_delete_send_flie_list(); } @@ -3511,7 +3524,7 @@ SINT32 sf_video_ftp_send(void) UINT8 ssl = 0; UINT8 gprsMode = 0; UINT8 timeout = 100; - UINT8 piccount = 1; + UINT8 piccount = 0; UINT8 SendFileTotal = 0; UINT8 battery = 0; UIMenuStoreInfo *pPara = sf_app_ui_para_get(); @@ -3550,7 +3563,7 @@ SINT32 sf_video_ftp_send(void) if(SF_SUCCESS == ret1) { - while((sf_app_while_flag()) && (((piccount+1) <= SendFileTotal)) && ((pPara->GprsMode == 1) || ((pSifarPara->subscribeVideoSendCnt < SUBSCRIBE_VIDEO_SEND_MAX_NUM) && (pPara->GprsMode != 1)))) + while((sf_app_while_flag()) && (((piccount) < SendFileTotal)) && ((pPara->GprsMode == 1) || ((pSifarPara->subscribeVideoSendCnt < SUBSCRIBE_VIDEO_SEND_MAX_NUM) && (pPara->GprsMode != 1)))) { snprintf((char *)ftpFileName, sizeof(ftpFileName), "W%03d%04d.MP4", fileCfg->stfileattr[piccount].dirKey, fileCfg->stfileattr[piccount].fileKey); //snprintf((char *)filePath, sizeof(filePath), "%s/%s", SF_HD_DIR, ftpFileName); @@ -3564,7 +3577,7 @@ SINT32 sf_video_ftp_send(void) } sf_set_del_flag(FALSE); - ret1 = sf_quectel_upload_file_to_module(filePath, ftpFileName); + ret1 = SF_SUCCESS;//sf_quectel_upload_file_to_module(filePath, ftpFileName); if(SF_UPLOAD_ERROR_RETRY == ret1) { @@ -3573,18 +3586,18 @@ SINT32 sf_video_ftp_send(void) if(ret1 == SF_SUCCESS) { - ret1 = sf_quectel_upload_file_to_module(filePath, ftpFileName); + ret1 = SF_SUCCESS;//sf_quectel_upload_file_to_module(filePath, ftpFileName); } } battery = sf_app_get_battery(); memset(cameraID, '\0', sizeof(cameraID)); memset(ftpFileName, '\0', sizeof(ftpFileName)); - memset(filePath, '\0', sizeof(filePath)); + //memset(filePath, '\0', sizeof(filePath)); snprintf(cameraID, sizeof(cameraID), "%s-%d-%d-%s-", pPara->ModuleImei, battery, csqlevel, CamNameStr); - snprintf((char *)ftpFileName, sizeof(ftpFileName), "%s-W%03d%04d.MP4", cameraID, fileCfg->stfileattr[piccount].dirKey, fileCfg->stfileattr[piccount].fileKey); + snprintf((char *)ftpFileName, sizeof(ftpFileName), "%sW%03d%04d.MP4", cameraID, fileCfg->stfileattr[piccount].dirKey, fileCfg->stfileattr[piccount].fileKey); - snprintf((char *)filePath, sizeof(filePath), "UFS:/W%03d%04d.MP4", fileCfg->stfileattr[piccount].dirKey, fileCfg->stfileattr[piccount].fileKey); + //snprintf((char *)filePath, sizeof(filePath), "UFS:/W%03d%04d.MP4", fileCfg->stfileattr[piccount].dirKey, fileCfg->stfileattr[piccount].fileKey); printf("%s:%d ftpFileName:%s filePath:%s\n", __FUNCTION__, __LINE__, ftpFileName, filePath); @@ -3715,14 +3728,15 @@ SINT32 sf_log_send_ftp(void) if(SF_SUCCESS == ret) { - sprintf((char *)filePath, "UFS:/%s", SF_LOG_TXT); + //sprintf((char *)filePath, "UFS:/%s", SF_LOG_TXT); + sprintf((char *)filePath, "%s", LOG_AT_FILE_PATH); printf("%s:%d filePath:%s\n", __FUNCTION__, __LINE__, filePath); sf_custom_str_get(customStr); sprintf((char *)uploadFname, "%s-%s-log.txt",pPara->ModuleImei, customStr); - ret = sf_quectel_upload_file_to_module((UINT8 *)LOG_AT_FILE_PATH, (UINT8 *)SF_LOG_TXT); + ret = SF_SUCCESS;//sf_quectel_upload_file_to_module((UINT8 *)LOG_AT_FILE_PATH, (UINT8 *)SF_LOG_TXT); if(SF_SUCCESS != ret) {