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 1942325e3..2234c1c74 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 @@ -3206,6 +3206,12 @@ SINT32 sf_mem_send_file_to_ftp(void) UINT8 csqlevel = 0; MLOGD("start\n"); + ret1 = sf_check_ftp_send(1); + if (ret1 != SF_SUCCESS) { + MLOGE("ERROR:%#x\n", ret1); + return ret1; + } + sf_custom_str_get(CamNameStr); sf_4G_signal_level_get(sf_get_net_generation(),sf_get_cq_signal(),&csqlevel); @@ -3244,7 +3250,11 @@ SINT32 sf_mem_send_file_to_ftp(void) } }*/ - + if(sf_file_IsExsit((char *)filePath) == SF_TRUE) + { + sf_file_remove((char *)filePath); + } + system("sync"); MLOGD(" end ret1:[0x%08X],ret2:[0x%08X]\n", ret1, ret2); if(ret1 != SF_SUCCESS) diff --git a/code/application/source/sf_app/code/source/app/sf_service.c b/code/application/source/sf_app/code/source/app/sf_service.c index d48a6f335..ef867e46b 100755 --- a/code/application/source/sf_app/code/source/app/sf_service.c +++ b/code/application/source/sf_app/code/source/app/sf_service.c @@ -1299,6 +1299,19 @@ SINT32 sf_cardv_file_to_app_send_thread(void) { #endif goto SEND_FILE_END; } + #if SF_NO_SD_SEND == ENABLE + if((0 == puiPara->SendType)) + { + if(sf_file_IsExsit("/tmp/MEMPHOTO.JPG") == SF_TRUE) + { + sf_4G_status_set(SF_4G_SENDING); + s32ret = sf_mem_send_file_to_ftp(); + sf_4G_status_set(SF_4G_FREE); + goto SEND_FILE_END; + } + } + #endif + stpfncallback.pstParam = sf_customer_param_get(); stpfncallback.pstaticParam = sf_app_ui_para_get(); // stpfncallback.pstaticParam = sf_statistics_param_get(); @@ -1361,6 +1374,13 @@ SINT32 sf_file_send_auto(void) { // } return SF_FAILURE; } + #if SF_NO_SD_SEND == ENABLE + if((0 == puiPara->SendType) && (0 == sf_usr_mem_photo_ch())) + { + s32ret = sf_mem_send_file_to_ftp(); + return s32ret; + } + #endif // else if(2 == puiPara->SdFailCount) // { // sleep(1); @@ -1381,7 +1401,6 @@ SINT32 sf_file_send_auto(void) { s32ret = sf_check_ftp_send(1); if (s32ret != SF_SUCCESS) { MLOGE("ERROR:%#x\n", s32ret); - ThumbSend.IsRun = 0; sf_file_thumb_cfg_clear(); sf_share_mem_file_down(1, s32ret); return s32ret; @@ -1392,7 +1411,6 @@ SINT32 sf_file_send_auto(void) { sf_set_gprs_errno(s32ret); } // app_file_transfer_Error_return_server(&stpfncallback); - ThumbSend.IsRun = 0; sf_file_thumb_cfg_clear(); sf_share_mem_file_down(1, s32ret); @@ -2553,16 +2571,20 @@ void sf_register_net_para_ck(void) if (0 != sf_get_cq_signal()) { puiPara->NeedTimeSyncStartUp = 1; } + puiPara->NetWorkNeedSearch = 0; + sf_sleep_ms(100); break; case SF_MCU_STARTUP_RESET: if (0 != sf_get_cq_signal()) { puiPara->NeedTimeSyncStartUp = 1; } puiPara->NetWorkNeedSearch = 0; + sf_sleep_ms(100); break; case SF_MCU_STARTUP_SYN_PARAM: puiPara->NetWorkNeedSearch = 0; puiPara->NeedTimeSyncStartUp = 0; + sf_sleep_ms(100); break; default: break;