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

1.修改发送限制

Browse Source
This commit is contained in:
payton 2023-07-12 09:45:32 +08:00
parent f7bdc261f0
commit 3d7ff1f15c
2 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/application/source/sf_app/code/source/4gMng/sf_ftp.c
View File

@ -847,7 +847,7 @@ SINT32 sf_pic_send_ftp(void)
printf("NetGeneration:%dG,tempPicSize=%d,piccount=%d,pic=%d\n", pPara->NetGeneration, tempPicSize, piccount, pic); printf("NetGeneration:%dG,tempPicSize=%d,piccount=%d,pic=%d\n", pPara->NetGeneration, tempPicSize, piccount, pic);
if((pPara->SendMultishotIndex1) || (SF_MANUAL == sf_get_mode_flag())) if((0 == pPara->SendMulti) || (pPara->SendMultishotIndex1) || (SF_MANUAL == sf_get_mode_flag()))
{ {
if(SF_FILE_TYPE_PIC_VIDEO == pThumbFileCfg->stfileattr[piccount].enFileTye){ if(SF_FILE_TYPE_PIC_VIDEO == pThumbFileCfg->stfileattr[piccount].enFileTye){
sprintf((char *)ftpFileName[piccount], "%sV-%s", cameraID, pThumbFileCfg->stfileattr[piccount].thumbfileName); sprintf((char *)ftpFileName[piccount], "%sV-%s", cameraID, pThumbFileCfg->stfileattr[piccount].thumbfileName);
@ -859,7 +859,7 @@ SINT32 sf_pic_send_ftp(void)
piccount++; piccount++;
} }
if(SF_AUTO == sf_get_mode_flag()) if((SF_AUTO == sf_get_mode_flag()) && (1 == pPara->SendMulti))
{ {
if(pPara->SendMultishotIndex2) if(pPara->SendMultishotIndex2)
{ {

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

@ -1043,34 +1043,7 @@ static SINT32 app_file_transfer(SF_FN_PARAM_S *pfnParam) {
s32ret = sf_concentrated_ftp_send(); s32ret = sf_concentrated_ftp_send();
} }
break; break;
#if 0
case SF_MCU_STARTUP_NORMAL:
case SF_MCU_STARTUP_RING:
sf_thumb_file_creat();
if(pStaticParam->PicPlan == 1)
s32ret = app_file_thumbsend(pfnParam);
s32ret |= app_server_excute_cmd(pfnParam);
if(pStaticParam->AliveIp[0] !='\0') {
s32ret = sf_4G_acm_tcp_server_open(pfnParam);
SF_APPCOMM_CHECK_RETURN(s32ret,SF_APP_ERROR_NO_SUPPOET);
s32ret = app_server_Iskeepconnect(pfnParam,pCustomerParam->GprsMode);
SF_APPCOMM_CHECK_RETURN(s32ret,SF_APP_ERROR_NO_SUPPOET);
}
stMessageBuf.arg1 = SF_POWEROFF_NOT;
stMessageBuf.cmdId = CMD_POWEROFF;
sf_com_message_send_to_app(&stMessageBuf);
break;
case SF_MCU_STARTUP_WARNING:
case SF_MCU_STARTUP_SERVER:
case SF_MCU_STARTUP_DP:
case SF_MCU_STARTUP_USB:
case SF_MCU_STARTUP_RESET:
#endif
case SF_MCU_STARTUP_RING: case SF_MCU_STARTUP_RING:
if (sf_get_pic()) { if (sf_get_pic()) {
s32ret = sf_send_file_to_ftp(1); s32ret = sf_send_file_to_ftp(1);
@ -1514,14 +1487,15 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
s32ret = sf_4G_register_net_auto(pfnParam); s32ret = sf_4G_register_net_auto(pfnParam);
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
s32ret = sf_read_message();
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
s32ret = sf_file_send_auto(); s32ret = sf_file_send_auto();
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
pCustomerParam->NetWorkNeedSearch = 0; pCustomerParam->NetWorkNeedSearch = 0;
pCustomerParam->NeedTimeSyncStartUp = 0; pCustomerParam->NeedTimeSyncStartUp = 0;
s32ret = sf_read_message();
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
if (sf_get_pic()) { if (sf_get_pic()) {
s32ret = sf_app_to_cardv_capture(); s32ret = sf_app_to_cardv_capture();
} }