payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.内存发送函数名更改

Browse Source
This commit is contained in:
payton 2024-01-16 09:53:29 +08:00
parent 53c5b4c5ff
commit 932809e17b
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/application/source/sf_app/code/include/sf_ftp.h
View File

@ -224,7 +224,7 @@ 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);
SINT32 sf_gps_send_ftp(void);
SINT32 sf_test_send_file_to_ftp(void);
SINT32 sf_mem_send_file_to_ftp(void);
SINT32 sf_card_log_send_ftp(void);
SINT32 sf_ftp_lpa_log_send(void);
#endif /*_SF_FTP_H_*/

24
code/application/source/sf_app/code/source/4gMng/sf_ftp.c
View File

@ -2431,14 +2431,14 @@ SINT32 sf_gps_send_ftp(void)
#if SF_NO_SD_SEND == ENABLE
/*************************************************
Function: sf_ftp_config
Function: sf_mem_ftp_config
Description: send pic to ftp
Input: N/A
Output: N/A
Return: 0 SUCCESS, 1 error
Others: N/A
*************************************************/
SINT32 sf_test_ftp_config(UINT8 ssl, UINT8 GprsMode, int timeout)
SINT32 sf_mem_ftp_config(UINT8 ssl, UINT8 GprsMode, int timeout)
{
UIMenuStoreInfo *pPara = sf_app_ui_para_get();
SINT32 ret = SF_SUCCESS;
@ -2766,14 +2766,14 @@ SINT32 sf_test_ftp_config(UINT8 ssl, UINT8 GprsMode, int timeout)
}
/*************************************************
Function: sf_ftp_send
Function: sf_mem_ftp_send
Description: send pic to ftp
Input: N/A
Output: N/A
Return: 0 SUCCESS, 1 error
Others: N/A
*************************************************/
SINT32 sf_test_ftp_send(UINT8 *ftpFileName, UINT8 *filePath, int timeout)
SINT32 sf_mem_ftp_send(UINT8 *ftpFileName, UINT8 *filePath, int timeout)
{
#if 1
SINT32 ret = SF_SUCCESS;
@ -2898,14 +2898,14 @@ SINT32 sf_test_ftp_send(UINT8 *ftpFileName, UINT8 *filePath, int timeout)
}
/*************************************************
Function: sf_ftp_send
Description: send pic to ftp
Function: sf_mem_ftp_stop
Description: send pic to ftp stop
Input: N/A
Output: N/A
Return: 0 SUCCESS, 1 error
Others: N/A
*************************************************/
SINT32 sf_test_ftp_stop(UINT8 ssl, UINT8 GprsMode)
SINT32 sf_mem_ftp_stop(UINT8 ssl, UINT8 GprsMode)
{
#if 1
SINT32 ret = SF_SUCCESS;
@ -3078,7 +3078,7 @@ SINT32 sf_test_ftp_stop(UINT8 ssl, UINT8 GprsMode)
Return: 0:success; else:fail;
Others: N/A
*************************************************/
SINT32 sf_test_send_file_to_ftp(void)
SINT32 sf_mem_send_file_to_ftp(void)
{
SINT32 ret1 = SF_SUCCESS; //0:success; else:fail;
SINT32 ret2 = SF_SUCCESS; //0:success; else:fail;
@ -3106,7 +3106,7 @@ SINT32 sf_test_send_file_to_ftp(void)
printf("netGeneration:%dG,tempPicSize=%d,piccount=%d,pic=%d\n", sf_get_net_generation(), tempPicSize, piccount, pic);
sprintf((char *)ftpFileName, "%sMEMPHOTO.JPG", cameraID);
sprintf((char *)ftpFileName, "%sN-E1000001.JPG", cameraID);
sprintf((char *)filePath, "UFS:MEMPHOTO.JPG");
printf("%s:%d ftpFileName:%s filePath:%s \n", __FUNCTION__, __LINE__, ftpFileName, filePath);
@ -3117,16 +3117,16 @@ SINT32 sf_test_send_file_to_ftp(void)
printf("[%s:%d] ssl:%d,GprsMode:%d\n", __FUNCTION__, __LINE__, ssl, gprsMode);
ret1 = sf_test_ftp_config(ssl, gprsMode, timeout);
ret1 = sf_mem_ftp_config(ssl, gprsMode, timeout);
if(SF_SUCCESS == ret1)
{
ret1 = sf_test_ftp_send(ftpFileName, filePath, timeout);
ret1 = sf_mem_ftp_send(ftpFileName, filePath, timeout);
}
if(ret1 != SF_FTP_ERROR_TERM)
{
ret2 = sf_test_ftp_stop(ssl, gprsMode);
ret2 = sf_mem_ftp_stop(ssl, gprsMode);
}
MLOGD(" end ret1:[0x%08X],ret2:[0x%08X]\n", ret1, ret2);

2
code/application/source/sf_app/code/source/app/sf_service.c
View File

@ -1331,7 +1331,7 @@ SINT32 sf_file_send_auto(void) {
#if SF_NO_SD_SEND == ENABLE
if( 0 == sf_usr_mem_photo_ch())
{
s32ret = sf_test_send_file_to_ftp();
s32ret = sf_mem_send_file_to_ftp();
return s32ret;
}
#endif