From 5cc6f37df1dfad93edcfcfe3216ceeceb2b1e09b Mon Sep 17 00:00:00 2001
From: payton <payton@willfine.com>
Date: Thu, 4 Jan 2024 09:42:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E5=8F=91=E9=80=81=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=EF=BC=8C=E5=85=88=E5=8F=91=E5=9B=BE=E5=86=8D=E5=8F=91?=
 =?UTF-8?q?dp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sf_app/code/source/app/sf_service.c       | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

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 45b1401a8..fea077299 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
@@ -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()) {