From f864680e6fd657890829c91383b28cbfa81e4bda Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 3 Jan 2024 20:35:17 +0800 Subject: [PATCH 1/7] =?UTF-8?q?1.=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=90=8E=E7=9B=B4=E6=8E=A5=E5=88=9B=E5=BB=BADCIM?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h | 2 ++ .../source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h index 3c373de58..51965a156 100755 --- a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h +++ b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h @@ -981,6 +981,8 @@ #define SF_SD_LOG_INFO_FILENAME "/tmp/SD.txt" #define SF_4G_MODE_TEST DISABLE + +#define SF_DCIM_PATH ":\\DCIM\\" //////////////////////sf end/////////////////////////////// /******************************************************************************************* diff --git a/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c b/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c index ec905f8a1..3509ddd9a 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c +++ b/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c @@ -922,6 +922,9 @@ UINT32 BackgroundFormatEmmc(void) { LogFile_ReOpen(); } + char tmp[32] = {'\0'}; + snprintf(tmp, sizeof(tmp), "B%s", SF_DCIM_PATH); /* DCF 8.3 naming rule */ + FileSys_MakeDir(tmp); #else LogFile_ReOpen(); #endif @@ -1021,6 +1024,9 @@ UINT32 BackgroundFormatCard(void) { LogFile_ReOpen(); } + char tmp[32] = {'\0'}; + snprintf(tmp, sizeof(tmp), "A%s", SF_DCIM_PATH); /* DCF 8.3 naming rule */ + FileSys_MakeDir(tmp); #else LogFile_ReOpen(); #endif From c805ee3237d166dd74d5a490fc26fb997f097479 Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 3 Jan 2024 20:48:07 +0800 Subject: [PATCH 2/7] =?UTF-8?q?1.sf=E5=8F=82=E6=95=B0=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/application/source/sf_app/code/source/app/sf_common.c | 3 ++- .../source/sf_app/code/source/paramMng/sf_param_common.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/application/source/sf_app/code/source/app/sf_common.c b/code/application/source/sf_app/code/source/app/sf_common.c index bfafd04a0..f7bf9f70a 100755 --- a/code/application/source/sf_app/code/source/app/sf_common.c +++ b/code/application/source/sf_app/code/source/app/sf_common.c @@ -814,7 +814,7 @@ static SINT32 sf_app_proccess_cmd_para_update(SF_MESSAGE_BUF_S *pMessageBuf) { MLOGD("ID = %#x\n",pMessageBuf->arg1); SF_PDT_PARAM_STATISTICS_S *pSifarPara = sf_statistics_param_get(); - + switch(pMessageBuf->arg1) { case SF_PARA_CMD_UPDATE: @@ -822,6 +822,7 @@ static SINT32 sf_app_proccess_cmd_para_update(SF_MESSAGE_BUF_S *pMessageBuf) break; case SF_PARA_CMD_RESET: sf_statistics_param_reset(pSifarPara); + sf_statistics_param_save(pSifarPara); break; case SF_PARA_CMD_FWUP: FwUpdate = pMessageBuf->arg2; diff --git a/code/application/source/sf_app/code/source/paramMng/sf_param_common.c b/code/application/source/sf_app/code/source/paramMng/sf_param_common.c index 5ff399edb..677f08816 100755 --- a/code/application/source/sf_app/code/source/paramMng/sf_param_common.c +++ b/code/application/source/sf_app/code/source/paramMng/sf_param_common.c @@ -1304,7 +1304,8 @@ SINT32 sf_statistics_param_save(SF_PDT_PARAM_STATISTICS_S* pStatisticsParam) MLOGE("save param failed!!!\n"); fsync(fd); close(fd); - + system("sync"); + MLOGI("save e\n"); return SF_SUCCESS; } From 5cc6f37df1dfad93edcfcfe3216ceeceb2b1e09b Mon Sep 17 00:00:00 2001 From: payton Date: Thu, 4 Jan 2024 09:42:31 +0800 Subject: [PATCH 3/7] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=EF=BC=8C=E5=85=88=E5=8F=91=E5=9B=BE=E5=86=8D?= =?UTF-8?q?=E5=8F=91dp?= 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()) { From e883e059ef1f089102e2e668de6c827f0cbf3a39 Mon Sep 17 00:00:00 2001 From: payton Date: Thu, 4 Jan 2024 10:09:14 +0800 Subject: [PATCH 4/7] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E7=94=B5=E6=B1=A0?= =?UTF-8?q?=E9=94=82=E7=94=B5=E5=88=87=E6=8D=A2=E5=92=8C=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E5=8E=9F=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 1 + .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h | 1 + .../sf_app/code/source/battery/sf_battery.c | 18 ++++++++++-------- .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h | 1 + 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c index 18694b5d1..681aa79b4 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c @@ -1748,6 +1748,7 @@ void SysResetFlag(void) ///////////// puiPara->StampSwitch = DEFAULT_DATE_STAMP;//DEFAULT_STAMP_SWITCH; puiPara->BatteryType = DEFAULT_BATTERY_TYPE; + puiPara->LiBatteryType = DEFAULT_BATTERY_TYPE; puiPara->SdLoopSwitch = DEFAULT_SD_LOOP_SWITCH; puiPara->PwdSwitch = DEFAULT_PWD_SWITCH; puiPara->SendPhotoSwitch = DEFAULT_SEND_PHOTO_SWITCH; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h index bbad5e1d6..3be399bc3 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h @@ -580,6 +580,7 @@ typedef struct _UIMenuUIMenuStoreInfo { CHAR SimIccidV[21]; CHAR SimIccidA[21]; UINT32 SdFailCount; + CHAR LiBatteryType;/*Alkaline/NI-MH/LI*/ UINT32 x1; UINT32 x2; UINT32 x3; diff --git a/code/application/source/sf_app/code/source/battery/sf_battery.c b/code/application/source/sf_app/code/source/battery/sf_battery.c index d22a8d23c..3dc99c816 100755 --- a/code/application/source/sf_app/code/source/battery/sf_battery.c +++ b/code/application/source/sf_app/code/source/battery/sf_battery.c @@ -411,6 +411,7 @@ UINT32 sf_battery_adc_value_get_once(void) printf("[sf_battery_level_polling]is lith battery\n"); if(SF_BATT_LI_PACK != puiPara->BatteryType) { + puiPara->LiBatteryType = puiPara->BatteryType; puiPara->BatteryType = SF_BATT_LI_PACK; } @@ -420,7 +421,7 @@ UINT32 sf_battery_adc_value_get_once(void) { first_init--; if (puiPara->BatteryType == SF_BATT_LI_PACK) { - puiPara->BatteryType = SF_BATT_ALKALINE; + puiPara->BatteryType = puiPara->LiBatteryType == SF_BATT_LI_PACK ?SF_BATT_ALKALINE:puiPara->LiBatteryType; } } @@ -969,16 +970,17 @@ void sf_battery_level_polling(void) printf("[sf_battery_level_polling]is lith battery\n"); if(SF_BATT_LI_PACK != puiPara->BatteryType) { + puiPara->LiBatteryType = puiPara->BatteryType; puiPara->BatteryType = SF_BATT_LI_PACK; } } - else{ - if(puiPara->BatteryType == SF_BATT_LI_PACK) - { - puiPara->BatteryType = SF_BATT_ALKALINE; - } - - } + else{ + if(puiPara->BatteryType == SF_BATT_LI_PACK) + { + puiPara->BatteryType = puiPara->LiBatteryType == SF_BATT_LI_PACK ?SF_BATT_ALKALINE:puiPara->LiBatteryType; + } + + } //ret = sf_check_low_battery(); diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h index 38df49ae5..dc0c157a8 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h @@ -580,6 +580,7 @@ typedef struct _UIMenuUIMenuStoreInfo { CHAR SimIccidV[21]; CHAR SimIccidA[21]; UINT32 SdFailCount; + CHAR LiBatteryType;/*Alkaline/NI-MH/LI*/ UINT32 x1; UINT32 x2; From 6d7a1150beda035431eb8bdb7c5302293111ca06 Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Thu, 4 Jan 2024 10:18:30 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=80=80=E5=87=BA=E5=9B=9E=E6=94=BE?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=88=87=E6=8D=A2=E5=9B=9E=E6=8B=8D=E7=85=A7?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E7=9A=84=E5=9B=9E=E6=94=BE=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c index 4acdaaf00..194a684cf 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c @@ -2380,6 +2380,10 @@ static void UIFlowPlay_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_UP: case LV_USER_KEY_PREV: { + printf("[UIFlowPlay_Key]exit play handle change: %d. \n", FirstHandle); + ChangeHandle = FirstHandle; + FirstHandle = -1; + UIFlowPlay_Exit(obj); break; UINT32 uiFileSeq; From 81346a8edc4d08c587fd9e7f80f3aafdb81ffb65 Mon Sep 17 00:00:00 2001 From: payton Date: Thu, 4 Jan 2024 10:28:46 +0800 Subject: [PATCH 6/7] =?UTF-8?q?1.=E7=94=B5=E6=B1=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/sf_app/code/source/battery/sf_battery.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/application/source/sf_app/code/source/battery/sf_battery.c b/code/application/source/sf_app/code/source/battery/sf_battery.c index 3dc99c816..727bff623 100755 --- a/code/application/source/sf_app/code/source/battery/sf_battery.c +++ b/code/application/source/sf_app/code/source/battery/sf_battery.c @@ -902,15 +902,15 @@ void sf_battery_level_polling(void) readBatCnt++; if(puiPara->BatteryLogSwitch) { - printf("\nDC Adc:%d After Convert:(%d.%dV),Is Dc In=%s, TemperAdc:%d \n", sf_battery_convert_to_adc(24, 100, DcVoltageVal), DcVoltageVal / 10, DcVoltageVal % 10, IsPowerDcIn == 1? "Yes" : "No", TemperAdc); + printf("\nDC Adc:%d After Convert:(%d.%dV),Is Dc In=%s, TemperAdc:%d \n", sf_battery_convert_to_adc(24, 100, _DcVoltageVal), _DcVoltageVal / 10, _DcVoltageVal % 10, IsPowerDcIn == 1? "Yes" : "No", TemperAdc); - if(LiPolymerVoltageVal) + if(_LiPolymerVoltageVal) { - printf("Li Battery Adc:%d After Convert:(%d.%dV)\n\n", sf_battery_convert_to_adc(24, 100, LiPolymerVoltageVal), LiPolymerVoltageVal / 10, LiPolymerVoltageVal % 10); + printf("Li Battery Adc:%d After Convert:(%d.%dV)\n\n", sf_battery_convert_to_adc(24, 100, _LiPolymerVoltageVal), _LiPolymerVoltageVal / 10, _LiPolymerVoltageVal % 10); } else { - printf("Other Battery Adc:%d After Convert:(%d.%dV)\n\n", sf_aa_battery_convert_to_adc(24, 100, BatVoltageVal),BatVoltageVal / 10, BatVoltageVal % 10); + printf("Other Battery Adc:%d After Convert:(%d.%dV)\n\n", sf_aa_battery_convert_to_adc(24, 100, _BatVoltageVal),_BatVoltageVal / 10, _BatVoltageVal % 10); } } if(readBatCnt >= 10) From 94aea9c44501f90d4ffb555ef5dfa636dcc2c80d Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Thu, 4 Jan 2024 11:23:41 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E8=8F=9C=E5=8D=95=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowMenuCommonOptionEventCallback.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c index 0ea6b2679..29e9d4b90 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c @@ -364,12 +364,12 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) printf("[LV_MenuCommonOption_UpdateContent]s_SelOption: %d\n", s_SelOption); if (IDM_FORMAT_SD == pItem->ItemId) { if (0 == SelOption && i == 0) { - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ - lv_obj_set_pos(image_option1_scr_uiflowmenucommonoption, 272, 0); + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT2;//> + lv_obj_set_pos(image_option1_scr_uiflowmenucommonoption, 288, 0); ui_hidden = false; } else if (1 == SelOption && i == 1) { - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT2;//> + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0); ui_hidden = false; } else if (0 == SelOption && i == 1) { itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//>