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 50c1ed566..54b789ab7 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 @@ -1257,333 +1257,341 @@ static SINT32 app_Register_Net_Error_return_server(SF_FN_PARAM_S *pfnParam, return SF_SUCCESS; } static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) { - SINT32 s32ret = 0; - // UINT8 timeCnt = 0; - // UINT8 bIsKeepConnect = 0; - // SF_CHAR version[12] = {0}; - // SF_MESSAGE_BUF_S stMessageBuf = {0}; - // SF_PDT_PARAM_CFG_S *pCustomerParam = pfnParam->pstParam; - // SF_PDT_PARAM_STATISTICS_S *pStaticParam = pfnParam->pstaticParam; - UIMenuStoreInfo *pCustomerParam = sf_app_ui_para_get(); - sf_log_Level_set(SF_LOG_LEVEL_DEBUG); + SINT32 s32ret = 0; + // UINT8 timeCnt = 0; + // UINT8 bIsKeepConnect = 0; + // SF_CHAR version[12] = {0}; + // SF_MESSAGE_BUF_S stMessageBuf = {0}; + // SF_PDT_PARAM_CFG_S *pCustomerParam = pfnParam->pstParam; + // SF_PDT_PARAM_STATISTICS_S *pStaticParam = pfnParam->pstaticParam; + UIMenuStoreInfo *pCustomerParam = sf_app_ui_para_get(); + SF_STARTUP_TYPE_E startup = sf_poweron_type_get(); - if (sf_usb_IsInsert()) - return SF_SUCCESS; + sf_log_Level_set(SF_LOG_LEVEL_DEBUG); - sf_4G_status_set(SF_4G_SEARCHING); + if (sf_usb_IsInsert() || + ((0 == sf_in_card_exist()) && (SF_MCU_STARTUP_ONKEY != startup))) { + return SF_SUCCESS; + } - switch (sf_poweron_type_get()) { - case SF_MCU_STARTUP_OFF: - break; + sf_4G_status_set(SF_4G_SEARCHING); - case SF_MCU_STARTUP_ONKEY: + switch (startup) { + case SF_MCU_STARTUP_OFF: + break; + + case SF_MCU_STARTUP_ONKEY: #ifdef SF_HARDWARE_TEST - break; + break; #endif #ifdef SF_GPS_TEST - sf_commu_set_mcu(19, 1); - sf_commu_set_mcu(20, 1); - sf_commu_set_mcu(84, 1); + sf_commu_set_mcu(19, 1); + sf_commu_set_mcu(20, 1); + sf_commu_set_mcu(84, 1); #endif - app_led_net_reg_start(); + app_led_net_reg_start(); - s32ret = app_ttyusb_IsOpen(); - SF_APPCOMM_CHECK_RETURN(s32ret, s32ret); + s32ret = app_ttyusb_IsOpen(); + SF_APPCOMM_CHECK_RETURN(s32ret, s32ret); #if SF_QLOG_ENABLE - if (pCustomerParam->QLogSwitch == 1) - app_Qlog_procress(); + if (pCustomerParam->QLogSwitch == 1) + app_Qlog_procress(); #endif - s32ret = sf_4G_sim_init(pfnParam); - SF_APPCOMM_CHECK_RETURN(s32ret, s32ret); + s32ret = sf_4G_sim_init(pfnParam); + SF_APPCOMM_CHECK_RETURN(s32ret, s32ret); - // sf_sys_software_version_get(version); - // s32ret = sf_qrcode_create(pStaticParam->IMEI,pStaticParam->SimID - //,version); + // sf_sys_software_version_get(version); + // s32ret = + //sf_qrcode_create(pStaticParam->IMEI,pStaticParam->SimID ,version); - s32ret = sf_4G_register_net_manual(pfnParam); - //sf_share_mem_customer_down(1); - SF_APPCOMM_CHECK_RETURN(s32ret, s32ret); + s32ret = sf_4G_register_net_manual(pfnParam); + // sf_share_mem_customer_down(1); + SF_APPCOMM_CHECK_RETURN(s32ret, s32ret); #ifdef SF_GPS_TEST - s32ret = app_gps_map_update(pfnParam); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_NO_SUPPOET); + s32ret = app_gps_map_update(pfnParam); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_NO_SUPPOET); - s32ret = app_gps_info_get(pfnParam); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_NO_SUPPOET); + s32ret = app_gps_info_get(pfnParam); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_NO_SUPPOET); - break; + break; #endif - s32ret = sf_get_utc(); - if ((s32ret == SF_SIM_ERROR_UTC) && (SF_ON != pCustomerParam->GpsSwitch)) { - SF_PARA_TIME_S current_time = { 0, 0, 0, 0, 0, 0}; - s32ret = sf_get_ntp(s32ret, ¤t_time); - } - sf_4G_usb_net_apn_cfg(pfnParam); - set_at_parament(); - sf_USB_net_init(); - if ((SF_ON == pCustomerParam->GpsSwitch)) { - s32ret = open_gps(s32ret); - serach_gps_onkey_start(); - } + s32ret = sf_get_utc(); + if ((s32ret == SF_SIM_ERROR_UTC) && + (SF_ON != pCustomerParam->GpsSwitch)) { + SF_PARA_TIME_S current_time = {0, 0, 0, 0, 0, 0}; + s32ret = sf_get_ntp(s32ret, ¤t_time); + } + sf_4G_usb_net_apn_cfg(pfnParam); + set_at_parament(); + sf_USB_net_init(); + if ((SF_ON == pCustomerParam->GpsSwitch)) { + s32ret = open_gps(s32ret); + serach_gps_onkey_start(); + } - if(sf_get_signal_ready()){ - if(SUCCESS != sf_connect_ftps_server()){ - printf("[%s:%d]open ftps fail, reconnect\n", __FUNCTION__, __LINE__); - if(SUCCESS != sf_connect_ftps_server()){ - printf("[%s:%d]re open ftps fail, reconnect\n", __FUNCTION__, __LINE__); + if (sf_get_signal_ready()) { + if (SUCCESS != sf_connect_ftps_server()) { + printf("[%s:%d]open ftps fail, reconnect\n", __FUNCTION__, + __LINE__); + if (SUCCESS != sf_connect_ftps_server()) { + printf("[%s:%d]re open ftps fail, reconnect\n", __FUNCTION__, + __LINE__); + } } } - } - SF_APPCOMM_CHECK_RETURN(s32ret, s32ret); + SF_APPCOMM_CHECK_RETURN(s32ret, s32ret); - break; + break; - case SF_MCU_STARTUP_NORMAL: - break; + case SF_MCU_STARTUP_NORMAL: + break; - case SF_MCU_STARTUP_RING: + case SF_MCU_STARTUP_RING: - s32ret = sf_4G_sim_IsInsert(); - if (!s32ret) { - SF_APPCOMM_CHECK_RETURN(SF_FAILURE, SF_APP_ERROR_REQUEST); - } + s32ret = sf_4G_sim_IsInsert(); + if (!s32ret) { + SF_APPCOMM_CHECK_RETURN(SF_FAILURE, SF_APP_ERROR_REQUEST); + } - s32ret = app_ttyusb_IsOpen(); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + s32ret = app_ttyusb_IsOpen(); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); #if SF_QLOG_ENABLE - if (pCustomerParam->QLogSwitch == 1) - app_Qlog_procress(); + if (pCustomerParam->QLogSwitch == 1) + app_Qlog_procress(); #endif - s32ret = sf_4G_sim_init(pfnParam); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + s32ret = sf_4G_sim_init(pfnParam); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - s32ret = sf_4G_register_net_auto(pfnParam); - //sf_share_mem_customer_down(1); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - sf_4G_usb_net_apn_cfg(pfnParam); - set_at_parament(); - sf_USB_net_init(); + s32ret = sf_4G_register_net_auto(pfnParam); + // sf_share_mem_customer_down(1); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + sf_4G_usb_net_apn_cfg(pfnParam); + set_at_parament(); + sf_USB_net_init(); - s32ret = sf_read_message(); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - if (sf_get_pic()) { - s32ret = sf_app_to_cardv_capture(); - } - else if(sf_get_send_hd()){ - s32ret = sf_app_to_cardv_hd_ture(); - } - else if(sf_get_send_video()){ - s32ret = sf_video_ftp_send(); - } - break; + s32ret = sf_read_message(); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + if (sf_get_pic()) { + s32ret = sf_app_to_cardv_capture(); + } else if (sf_get_send_hd()) { + s32ret = sf_app_to_cardv_hd_ture(); + } else if (sf_get_send_video()) { + s32ret = sf_video_ftp_send(); + } + break; - case SF_MCU_STARTUP_TIMELAPSE: - case SF_MCU_STARTUP_PIR: - if (pCustomerParam->SendType != 0) { - break; - } + case SF_MCU_STARTUP_TIMELAPSE: + case SF_MCU_STARTUP_PIR: + if (pCustomerParam->SendType != 0) { + break; + } - case SF_MCU_STARTUP_BATCH_SEND: + case SF_MCU_STARTUP_BATCH_SEND: #ifdef SF_HARDWARE_TEST - app_system_poweroff(SF_POWEROFF_NOT); - break; + app_system_poweroff(SF_POWEROFF_NOT); + break; #endif - s32ret = sf_4G_sim_IsInsert(); - if (!s32ret) { - SF_APPCOMM_CHECK_RETURN(SF_FAILURE, SF_APP_ERROR_REQUEST); - } + s32ret = sf_4G_sim_IsInsert(); + if (!s32ret) { + SF_APPCOMM_CHECK_RETURN(SF_FAILURE, SF_APP_ERROR_REQUEST); + } - s32ret = app_ttyusb_IsOpen(); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + s32ret = app_ttyusb_IsOpen(); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); #if SF_QLOG_ENABLE - if (pCustomerParam->QLogSwitch == 1) - app_Qlog_procress(); + if (pCustomerParam->QLogSwitch == 1) + app_Qlog_procress(); #endif - s32ret = sf_4G_sim_init(pfnParam); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + s32ret = sf_4G_sim_init(pfnParam); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - s32ret = sf_4G_register_net_auto(pfnParam); - if (s32ret != SF_SUCCESS) { - sf_set_signal_ready_flag(TRUE); - } - //sf_share_mem_customer_down(1); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - sf_4G_usb_net_apn_cfg(pfnParam); - set_at_parament(); - sf_USB_net_init(); + s32ret = sf_4G_register_net_auto(pfnParam); + if (s32ret != SF_SUCCESS) { + sf_set_signal_ready_flag(TRUE); + } + // sf_share_mem_customer_down(1); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + sf_4G_usb_net_apn_cfg(pfnParam); + set_at_parament(); + sf_USB_net_init(); - s32ret = sf_file_send_auto(); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + s32ret = sf_file_send_auto(); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - break; - case SF_MCU_STARTUP_WARNING: + break; + case SF_MCU_STARTUP_WARNING: - break; - case SF_MCU_STARTUP_SERVER: + break; + case SF_MCU_STARTUP_SERVER: - break; - case SF_MCU_STARTUP_DP: + break; + case SF_MCU_STARTUP_DP: - s32ret = app_ttyusb_IsOpen(); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + s32ret = app_ttyusb_IsOpen(); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); #if SF_QLOG_ENABLE - if (pCustomerParam->QLogSwitch == 1) - app_Qlog_procress(); + if (pCustomerParam->QLogSwitch == 1) + app_Qlog_procress(); #endif - s32ret = sf_4G_sim_init(pfnParam); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + s32ret = sf_4G_sim_init(pfnParam); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - s32ret = sf_4G_register_net_manual(pfnParam); - if (s32ret != SF_SUCCESS) { - sf_set_signal_ready_flag(TRUE); - } + s32ret = sf_4G_register_net_manual(pfnParam); + if (s32ret != SF_SUCCESS) { + sf_set_signal_ready_flag(TRUE); + } - if (1 == pCustomerParam->NeedTimeSyncStartUp) { - printf("[%s:%d]8 between A and B,no reg net again,no reset time sync.\n", - __FUNCTION__, __LINE__); - sf_set_dr_reset_time_sys_flag(1); - } + if (1 == pCustomerParam->NeedTimeSyncStartUp) { + printf("[%s:%d]8 between A and B,no reg net again,no reset time " + "sync.\n", + __FUNCTION__, __LINE__); + sf_set_dr_reset_time_sys_flag(1); + } - if (0 != sf_get_cq_signal()) { - pCustomerParam->NeedTimeSyncStartUp = 1; - } - if (pCustomerParam->DailyReportSwitch) { - pCustomerParam->GpsSendFlag = 1; // indicate need send dp file in b power on. - } + if (0 != sf_get_cq_signal()) { + pCustomerParam->NeedTimeSyncStartUp = 1; + } + if (pCustomerParam->DailyReportSwitch) { + pCustomerParam->GpsSendFlag = + 1; // indicate need send dp file in b power on. + } - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - sf_4G_usb_net_apn_cfg(pfnParam); - set_at_parament(); - sf_USB_net_init(); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + sf_4G_usb_net_apn_cfg(pfnParam); + set_at_parament(); + sf_USB_net_init(); - s32ret = sf_get_utc(); - if ((s32ret == SF_SIM_ERROR_UTC) && (SF_ON != pCustomerParam->GpsSwitch)) { - SF_PARA_TIME_S current_time = { 0, 0, 0, 0, 0, 0}; - s32ret = sf_get_ntp(s32ret, ¤t_time); - } - if ((SF_ON == pCustomerParam->GpsSwitch)) { - s32ret = open_gps(s32ret); - } + s32ret = sf_get_utc(); + if ((s32ret == SF_SIM_ERROR_UTC) && + (SF_ON != pCustomerParam->GpsSwitch)) { + SF_PARA_TIME_S current_time = {0, 0, 0, 0, 0, 0}; + s32ret = sf_get_ntp(s32ret, ¤t_time); + } + if ((SF_ON == pCustomerParam->GpsSwitch)) { + s32ret = open_gps(s32ret); + } - //sf_dailyReport_set(); - //sf_share_mem_customer_down(1); + // sf_dailyReport_set(); + // sf_share_mem_customer_down(1); - break; - case SF_MCU_STARTUP_USB: + break; + case SF_MCU_STARTUP_USB: - break; - case SF_MCU_STARTUP_RESET: + break; + case SF_MCU_STARTUP_RESET: - s32ret = app_ttyusb_IsOpen(); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + s32ret = app_ttyusb_IsOpen(); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); #if SF_QLOG_ENABLE - if (pCustomerParam->QLogSwitch == 1) - app_Qlog_procress(); + if (pCustomerParam->QLogSwitch == 1) + app_Qlog_procress(); #endif - s32ret = sf_4G_sim_init(pfnParam); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + s32ret = sf_4G_sim_init(pfnParam); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + + s32ret = sf_4G_register_net_manual(pfnParam); + if (s32ret != SF_SUCCESS) { + sf_set_signal_ready_flag(TRUE); + } + if (0 != sf_get_cq_signal()) { + pCustomerParam->GpsSendFlag = 1; + pCustomerParam->NeedTimeSyncStartUp = 1; + // avoid always A mode power on + pCustomerParam->NetWorkNeedSearch = 0; + } + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + sf_4G_usb_net_apn_cfg(pfnParam); + set_at_parament(); + sf_USB_net_init(); + + s32ret = sf_get_utc(); + if ((s32ret == SF_SIM_ERROR_UTC) && + (SF_ON != pCustomerParam->GpsSwitch)) { + SF_PARA_TIME_S current_time = {0, 0, 0, 0, 0, 0}; + s32ret = sf_get_ntp(s32ret, ¤t_time); + } + if ((SF_ON == pCustomerParam->GpsSwitch)) { + s32ret = open_gps(s32ret); + } + if (0 != sf_get_cq_signal()) { + + if (SUCCESS != sf_connect_ftps_server()) { + printf("[%s:%d]open ftps fail, reconnect\n", __FUNCTION__, + __LINE__); + if (SUCCESS != sf_connect_ftps_server()) { + printf("[%s:%d]re open ftps fail, reconnect\n", __FUNCTION__, + __LINE__); + } + } + } + // sf_share_mem_customer_down(1); + break; + case SF_MCU_STARTUP_SYN_PARAM: + + s32ret = app_ttyusb_IsOpen(); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + +#if SF_QLOG_ENABLE + if (pCustomerParam->QLogSwitch == 1) + app_Qlog_procress(); +#endif + s32ret = sf_4G_sim_init(pfnParam); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + + s32ret = sf_4G_register_net_auto(pfnParam); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); + sf_4G_usb_net_apn_cfg(pfnParam); + set_at_parament(); + sf_USB_net_init(); + + if ((SF_ON == pCustomerParam->GpsSwitch)) { + const int KEEP_SERACHING_TIMEOUT_MS = 2000; + const int KEEP_SERACHING_PERIOD_MS = 200; + // keep_seraching_gps_location(KEEP_SERACHING_TIMEOUT_S); + SF_GPS_PARAM gps_param = { + .timeout_ms = KEEP_SERACHING_TIMEOUT_MS, + .period_ms = KEEP_SERACHING_PERIOD_MS, + }; + keep_get_gps_location(gps_param); + gps_close(); + } + + s32ret = sf_read_message(); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - s32ret = sf_4G_register_net_manual(pfnParam); - if (s32ret != SF_SUCCESS) { - sf_set_signal_ready_flag(TRUE); - } - if (0 != sf_get_cq_signal()) { - pCustomerParam->GpsSendFlag = 1; - pCustomerParam->NeedTimeSyncStartUp = 1; - // avoid always A mode power on pCustomerParam->NetWorkNeedSearch = 0; - } - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - sf_4G_usb_net_apn_cfg(pfnParam); - set_at_parament(); - sf_USB_net_init(); + pCustomerParam->NeedTimeSyncStartUp = 0; - s32ret = sf_get_utc(); - if ((s32ret == SF_SIM_ERROR_UTC) && (SF_ON != pCustomerParam->GpsSwitch)) { - SF_PARA_TIME_S current_time = { 0, 0, 0, 0, 0, 0}; - s32ret = sf_get_ntp(s32ret, ¤t_time); - } - if ((SF_ON == pCustomerParam->GpsSwitch)) { - s32ret = open_gps(s32ret); - } - if (0 != sf_get_cq_signal()) { + s32ret = sf_file_send_auto(); + SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - if(SUCCESS != sf_connect_ftps_server()){ - printf("[%s:%d]open ftps fail, reconnect\n", __FUNCTION__, __LINE__); - if(SUCCESS != sf_connect_ftps_server()){ - printf("[%s:%d]re open ftps fail, reconnect\n", __FUNCTION__, __LINE__); - } + if (sf_get_pic()) { + s32ret = sf_app_to_cardv_capture(); + } else if (sf_get_send_hd()) { + s32ret = sf_app_to_cardv_hd_ture(); + } else if (sf_get_send_video()) { + s32ret = sf_video_ftp_send(); } - } - //sf_share_mem_customer_down(1); - break; - case SF_MCU_STARTUP_SYN_PARAM: + // sf_share_mem_customer_down(1); + break; - s32ret = app_ttyusb_IsOpen(); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - -#if SF_QLOG_ENABLE - if (pCustomerParam->QLogSwitch == 1) - app_Qlog_procress(); -#endif - s32ret = sf_4G_sim_init(pfnParam); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - - s32ret = sf_4G_register_net_auto(pfnParam); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - sf_4G_usb_net_apn_cfg(pfnParam); - set_at_parament(); - sf_USB_net_init(); - - if ((SF_ON == pCustomerParam->GpsSwitch)) { - const int KEEP_SERACHING_TIMEOUT_MS = 2000; - const int KEEP_SERACHING_PERIOD_MS = 200; - // keep_seraching_gps_location(KEEP_SERACHING_TIMEOUT_S); - SF_GPS_PARAM gps_param = { - .timeout_ms = KEEP_SERACHING_TIMEOUT_MS, - .period_ms = KEEP_SERACHING_PERIOD_MS, - }; - keep_get_gps_location(gps_param); - gps_close(); + default: + break; } - s32ret = sf_read_message(); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - - pCustomerParam->NetWorkNeedSearch = 0; - pCustomerParam->NeedTimeSyncStartUp = 0; - - s32ret = sf_file_send_auto(); - SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); - - - if (sf_get_pic()) { - s32ret = sf_app_to_cardv_capture(); - } - else if(sf_get_send_hd()){ - s32ret = sf_app_to_cardv_hd_ture(); - } - else if(sf_get_send_video()){ - s32ret = sf_video_ftp_send(); - } - //sf_share_mem_customer_down(1); - break; - - default: - break; - } - - return s32ret; + return s32ret; } void app_Register_Net_thread(void) { SINT32 s32ret = 0; @@ -1913,7 +1921,8 @@ int sf_check_sd(void) ret = sf_sd_status_get(); if (SF_SD_OK == ret) { ret = SF_SUCCESS; - MLOGI("usb net ip up\r\n"); + MLOGI("SD\r\n"); + sf_statistics_param_load(sf_statistics_param_get()); break; } else { sleep(1); diff --git a/code/application/source/sf_app/code/source/app/sf_system.c b/code/application/source/sf_app/code/source/app/sf_system.c index 4fe41cd71..ba02cd6be 100755 --- a/code/application/source/sf_app/code/source/app/sf_system.c +++ b/code/application/source/sf_app/code/source/app/sf_system.c @@ -897,6 +897,10 @@ void sf_power_off(void) SF_MESSAGE_BUF_S stMessageBuf = {0}; UINT8 PowerOnMode = sf_poweron_type_get(); printf("[%s:%d] s\n", __FUNCTION__, __LINE__); + if(SF_FAILURE == sf_check_sd()) + { + MLOGE("ERROR sf_check_sd\n"); + } //UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); SF_PDT_PARAM_STATISTICS_S *psfPara = sf_statistics_param_get();