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

1.发送流程增加sd卡检查

Browse Source
This commit is contained in:
payton 2023-09-01 10:07:34 +08:00
parent 6f867bde34
commit 45303b42cc
2 changed files with 267 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1265,14 +1265,18 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
// 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();
sf_log_Level_set(SF_LOG_LEVEL_DEBUG);
if (sf_usb_IsInsert())
if (sf_usb_IsInsert() ||
((0 == sf_in_card_exist()) && (SF_MCU_STARTUP_ONKEY != startup))) {
return SF_SUCCESS;
}
sf_4G_status_set(SF_4G_SEARCHING);
switch (sf_poweron_type_get()) {
switch (startup) {
case SF_MCU_STARTUP_OFF:
break;
@ -1301,11 +1305,11 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
SF_APPCOMM_CHECK_RETURN(s32ret, s32ret);
// sf_sys_software_version_get(version);
// s32ret = sf_qrcode_create(pStaticParam->IMEI,pStaticParam->SimID
//,version);
// s32ret =
//sf_qrcode_create(pStaticParam->IMEI,pStaticParam->SimID ,version);
s32ret = sf_4G_register_net_manual(pfnParam);
//sf_share_mem_customer_down(1);
// sf_share_mem_customer_down(1);
SF_APPCOMM_CHECK_RETURN(s32ret, s32ret);
#ifdef SF_GPS_TEST
s32ret = app_gps_map_update(pfnParam);
@ -1317,8 +1321,9 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
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};
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, &current_time);
}
sf_4G_usb_net_apn_cfg(pfnParam);
@ -1329,11 +1334,13 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
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__);
}
}
}
@ -1363,7 +1370,7 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
s32ret = sf_4G_register_net_auto(pfnParam);
//sf_share_mem_customer_down(1);
// 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();
@ -1373,11 +1380,9 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
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()){
} else if (sf_get_send_hd()) {
s32ret = sf_app_to_cardv_hd_ture();
}
else if(sf_get_send_video()){
} else if (sf_get_send_video()) {
s32ret = sf_video_ftp_send();
}
break;
@ -1414,7 +1419,7 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
if (s32ret != SF_SUCCESS) {
sf_set_signal_ready_flag(TRUE);
}
//sf_share_mem_customer_down(1);
// 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();
@ -1448,7 +1453,8 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
}
if (1 == pCustomerParam->NeedTimeSyncStartUp) {
printf("[%s:%d]8 between A and B,no reg net again,no reset time sync.\n",
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);
}
@ -1457,7 +1463,8 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
pCustomerParam->NeedTimeSyncStartUp = 1;
}
if (pCustomerParam->DailyReportSwitch) {
pCustomerParam->GpsSendFlag = 1; // indicate need send dp file in b power on.
pCustomerParam->GpsSendFlag =
1; // indicate need send dp file in b power on.
}
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
@ -1466,16 +1473,17 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
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};
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, &current_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:
@ -1509,8 +1517,9 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
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};
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, &current_time);
}
if ((SF_ON == pCustomerParam->GpsSwitch)) {
@ -1518,14 +1527,16 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
}
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__);
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);
// sf_share_mem_customer_down(1);
break;
case SF_MCU_STARTUP_SYN_PARAM:
@ -1566,17 +1577,14 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
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()){
} else if (sf_get_send_hd()) {
s32ret = sf_app_to_cardv_hd_ture();
}
else if(sf_get_send_video()){
} else if (sf_get_send_video()) {
s32ret = sf_video_ftp_send();
}
//sf_share_mem_customer_down(1);
// sf_share_mem_customer_down(1);
break;
default:
@ -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);

4
code/application/source/sf_app/code/source/app/sf_system.c
View File

@ -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();