1.更改超时时间
This commit is contained in:
		
							parent
							
								
									dc9361e272
								
							
						
					
					
						commit
						20d7862827
					
				| 
						 | 
				
			
			@ -1098,7 +1098,7 @@ SINT32 sf_ftp_dailyreport_send(void)
 | 
			
		|||
	UINT8 uploadFname[64] = { 0 };
 | 
			
		||||
	UINT8 customStr[64] = { 0 };
 | 
			
		||||
	UINT8 filePath[64] = { 0 };
 | 
			
		||||
	int timeout =  120000;
 | 
			
		||||
	int timeout =  60000;
 | 
			
		||||
	UIMenuStoreInfo *pPara = sf_app_ui_para_get();
 | 
			
		||||
    SF_PDT_PARAM_STATISTICS_S *pSifarPara = sf_statistics_param_get();
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -1226,7 +1226,7 @@ SINT32 sf_send_file_to_ftp(UINT8 mode)
 | 
			
		|||
	SINT32 ret2 = SF_SUCCESS;       //0:success; else:fail;
 | 
			
		||||
	UINT8 ssl = 0;
 | 
			
		||||
	UINT8 gprsMode = 0;
 | 
			
		||||
	int timeout =  120000;
 | 
			
		||||
	int timeout =  60000;
 | 
			
		||||
	UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
 | 
			
		||||
    SF_PDT_PARAM_STATISTICS_S *pSifarPara = sf_statistics_param_get();
 | 
			
		||||
    SINT64 sendEndTime = 0;
 | 
			
		||||
| 
						 | 
				
			
			@ -1418,7 +1418,7 @@ SINT32 sf_connect_ftps_server(void)
 | 
			
		|||
	SINT32 ret = SF_SUCCESS;//0:success; else:fail;
 | 
			
		||||
	UINT8 ssl = 0;
 | 
			
		||||
	UINT8 gprsMode = 0;
 | 
			
		||||
	int timeout =  120000;
 | 
			
		||||
	int timeout =  60000;
 | 
			
		||||
	UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
 | 
			
		||||
 | 
			
		||||
    MLOGD("start\n");
 | 
			
		||||
| 
						 | 
				
			
			@ -1429,11 +1429,11 @@ SINT32 sf_connect_ftps_server(void)
 | 
			
		|||
 | 
			
		||||
    if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendVideoSwitch == 1) && (puiPara->NetGeneration == 4))  //video
 | 
			
		||||
    {
 | 
			
		||||
        timeout = 120000;
 | 
			
		||||
        timeout = 60000;
 | 
			
		||||
    }
 | 
			
		||||
    else if((2 == puiPara->SendPicSize) && (((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendPhotoSwitch == 1))) //pic(+video)
 | 
			
		||||
    {
 | 
			
		||||
        timeout = 120000;
 | 
			
		||||
        timeout = 60000;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
	ret = sf_ftp_config(ssl, gprsMode, timeout);
 | 
			
		||||
| 
						 | 
				
			
			@ -1532,7 +1532,7 @@ SINT32 sf_concentrated_ftp_send(void)
 | 
			
		|||
	SINT32 ret2 = SF_SUCCESS;       //0:success; else:fail;
 | 
			
		||||
	UINT8 ssl = 0;
 | 
			
		||||
	UINT8 gprsMode = 0;
 | 
			
		||||
	int timeout =  120000;
 | 
			
		||||
	int timeout =  60000;
 | 
			
		||||
    UINT8 piccount = 0;
 | 
			
		||||
    UINT8 SendFileTotal = 0;
 | 
			
		||||
    UINT8 battery = 0;
 | 
			
		||||
| 
						 | 
				
			
			@ -2131,7 +2131,7 @@ SINT32 sf_log_send_ftp(void)
 | 
			
		|||
	UINT8 uploadFname[64] = { 0 };
 | 
			
		||||
	UINT8 customStr[64] = { 0 };
 | 
			
		||||
	UINT8 filePath[64] = { 0 };
 | 
			
		||||
	int timeout =  120000;
 | 
			
		||||
	int timeout =  60000;
 | 
			
		||||
	UIMenuStoreInfo *pPara = sf_app_ui_para_get();
 | 
			
		||||
	UINT8 ssl = 0;
 | 
			
		||||
	UINT8 gprsMode = 0;
 | 
			
		||||
| 
						 | 
				
			
			@ -2201,7 +2201,7 @@ SINT32 sf_low_power_warn_send_ftp(void)
 | 
			
		|||
	UINT8 uploadFname[64] = { 0 };
 | 
			
		||||
	UINT8 customStr[64] = { 0 };
 | 
			
		||||
	UINT8 filePath[64] = { 0 };
 | 
			
		||||
	int timeout =  120000;
 | 
			
		||||
	int timeout =  60000;
 | 
			
		||||
	UIMenuStoreInfo *pPara = sf_app_ui_para_get();
 | 
			
		||||
    SF_PDT_PARAM_STATISTICS_S *pSifarPara = sf_statistics_param_get();
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -2244,7 +2244,7 @@ SINT32 sf_gps_send_ftp(void)
 | 
			
		|||
	UINT8 uploadFname[64] = { 0 };
 | 
			
		||||
	UINT8 customStr[64] = { 0 };
 | 
			
		||||
	UINT8 filePath[64] = { 0 };
 | 
			
		||||
	int timeout =  120000;
 | 
			
		||||
	int timeout =  60000;
 | 
			
		||||
	UIMenuStoreInfo *pPara = sf_app_ui_para_get();
 | 
			
		||||
	UINT8 ssl = 0;
 | 
			
		||||
	UINT8 gprsMode = 0;
 | 
			
		||||
| 
						 | 
				
			
			@ -3035,7 +3035,7 @@ SINT32 sf_card_log_send_ftp(void)
 | 
			
		|||
    UINT8 uploadFname[64] = { 0 };
 | 
			
		||||
    UINT8 customStr[64] = { 0 };
 | 
			
		||||
    UINT8 filePath[64] = { 0 };
 | 
			
		||||
    int timeout =  120000;
 | 
			
		||||
    int timeout =  60000;
 | 
			
		||||
    UIMenuStoreInfo *pPara = sf_app_ui_para_get();
 | 
			
		||||
    UINT8 ssl = 0;
 | 
			
		||||
    UINT8 gprsMode = 0;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user