1.调整发送顺序,先发图再发dp
This commit is contained in:
parent
e44c3d1e77
commit
5cc6f37df1
|
@ -1104,6 +1104,8 @@ SINT16 app_file_transfer_Error_return_server(SF_FN_PARAM_S *pfnParam) {
|
|||
static SINT32 app_file_transfer(SF_FN_PARAM_S *pfnParam) {
|
||||
SINT32 s32ret = 0;
|
||||
static int DailyreportSendFlag = 0;
|
||||
static int PicUpDailyReportFlag = 0;
|
||||
|
||||
// SF_MESSAGE_BUF_S stMessageBuf = {0};
|
||||
// UIMenuStoreInfo *pCustomerParam = pfnParam->pstParam;
|
||||
// SF_PDT_PARAM_STATISTICS_S *pStaticParam = pfnParam->pstaticParam;
|
||||
|
@ -1189,8 +1191,22 @@ static SINT32 app_file_transfer(SF_FN_PARAM_S *pfnParam) {
|
|||
if(sf_get_send_gps_txt()){
|
||||
s32ret = sf_gps_send_ftp();
|
||||
}
|
||||
|
||||
if((!PicUpDailyReportFlag) && (pCustomerParam->PicUpDailyReport))
|
||||
{
|
||||
PicUpDailyReportFlag = 1;
|
||||
sf_sms_set_pic(1);
|
||||
sf_sleep_ms(200);
|
||||
SLOGD("GpsSendFlag:%d\n", pCustomerParam->GpsSendFlag);
|
||||
break;
|
||||
}
|
||||
|
||||
if (!DailyreportSendFlag)
|
||||
{
|
||||
if ((sf_get_pic()) && (pCustomerParam->PicUpDailyReport)) {
|
||||
s32ret = sf_send_file_to_ftp(1);
|
||||
sf_sms_set_pic(0);
|
||||
}
|
||||
DailyreportSendFlag = 1;
|
||||
s32ret = sf_send_file_to_ftp(2);
|
||||
if(pCustomerParam->SdFailCount)
|
||||
|
@ -1200,12 +1216,6 @@ static SINT32 app_file_transfer(SF_FN_PARAM_S *pfnParam) {
|
|||
sf_sleep_ms(200);
|
||||
}
|
||||
//pCustomerParam->GpsSendFlag = 0;
|
||||
if(pCustomerParam->PicUpDailyReport){
|
||||
sf_sms_set_pic(1);
|
||||
sf_sleep_ms(200);
|
||||
SLOGD("GpsSendFlag:%d\n", pCustomerParam->GpsSendFlag);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (sf_get_pic()) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user