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 798e9c204..3388604f3 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 @@ -1643,7 +1643,7 @@ SINT32 sf_camera_ota_ftp(void) if(SF_TRUE == sf_file_IsExsit(tmp)){ sf_file_remove(tmp); } - + sleep(2); ret = ftp_download_file(SF_CAM_UP_FILE,tmp,0); //if(SUCCESS == ret) { diff --git a/code/application/source/sf_app/code/source/4gMng/sf_sms.c b/code/application/source/sf_app/code/source/4gMng/sf_sms.c index 341111645..dc1dda73c 100755 --- a/code/application/source/sf_app/code/source/4gMng/sf_sms.c +++ b/code/application/source/sf_app/code/source/4gMng/sf_sms.c @@ -2491,24 +2491,27 @@ SINT32 sf_power_off_module_ota(void) /*instant, hybrid mode*/ if(CameraCmd.moduleUpdateOTA) { - if(app_ttyusb_IsOpen() != SUCCESS) - { - sf_cmd_camera_restart(1);//usb error,need restart - } - else - { - ret = sf_4g_module_ota_ftp();//need restart module - - //if(ret == OTA_UPDATED_ERROR || ret == OTA_SUCCESS || ret == OTA_VERTION_ERROR || ret == OTA_TIME_OUT) - { - if(CameraCmd.setPara) - pPara_sms_saved->NetWorkNeedSearch = 3; - else - puiPara->NetWorkNeedSearch = 3; - - sf_set_para_sava(); - } - } + if(0 == sf_check_sd()) + { + if(app_ttyusb_IsOpen() != SUCCESS) + { + sf_cmd_camera_restart(1);//usb error,need restart + } + else + { + ret = sf_4g_module_ota_ftp();//need restart module + + //if(ret == OTA_UPDATED_ERROR || ret == OTA_SUCCESS || ret == OTA_VERTION_ERROR || ret == OTA_TIME_OUT) + { + if(CameraCmd.setPara) + pPara_sms_saved->NetWorkNeedSearch = 3; + else + puiPara->NetWorkNeedSearch = 3; + + sf_set_para_sava(); + } + } + } } return ret; } @@ -2571,28 +2574,31 @@ SINT32 sf_power_off_module_sd_update(void) /*instant, hybrid mode*/ if(CameraCmd.moduleUpdateOTA) { - if(app_ttyusb_IsOpen() != SUCCESS) + if(0 == sf_check_sd()) { - sf_cmd_camera_restart(1);//usb error,need restart - } - else - { - ret = OTA_NOUPDATE; - if(sf_is_4g_module_usb_update_file_exist(updateFileName)) - { - ret = sf_4g_module_sd_usb_update(updateFileName); - } - - if(ret == OTA_UPDATED_ERROR || ret == OTA_SUCCESS || ret == OTA_VERTION_ERROR || ret == OTA_TIME_OUT) - { - if(CameraCmd.setPara) - pPara_sms_saved->NetWorkNeedSearch = 3; - else - puiPara->NetWorkNeedSearch = 3; - - sf_set_para_sava(); - } - } + if(app_ttyusb_IsOpen() != SUCCESS) + { + sf_cmd_camera_restart(1);//usb error,need restart + } + else + { + ret = OTA_NOUPDATE; + if(sf_is_4g_module_usb_update_file_exist(updateFileName)) + { + ret = sf_4g_module_sd_usb_update(updateFileName); + } + + if(ret == OTA_UPDATED_ERROR || ret == OTA_SUCCESS || ret == OTA_VERTION_ERROR || ret == OTA_TIME_OUT) + { + if(CameraCmd.setPara) + pPara_sms_saved->NetWorkNeedSearch = 3; + else + puiPara->NetWorkNeedSearch = 3; + + sf_set_para_sava(); + } + } + } } return 0; } @@ -2850,7 +2856,7 @@ SINT32 sf_power_off_check_fw_update(void) if(CameraCmd.firmwareUpdateOTA) { - if(sf_in_card_exist() && sf_is_card()) + if(0 == sf_check_sd()) { if(app_ttyusb_IsOpen() != SUCCESS)