From 36dbd1e71f1107a524bfdbe19918c53beed1530e Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Wed, 8 Nov 2023 14:02:11 +0800 Subject: [PATCH] Fixed bug nember 9776. --- .../UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c | 10 +++++----- .../UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c | 2 +- code/lib/source/sifar/code/source/common/sf_common.c | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c index 99835e9f8..4cc00537f 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c @@ -83,13 +83,13 @@ int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam) { case FOUR_TIME_DAY: puiPara->TimeSend4Switch = 1; - break; + // break; case TWICE_DAY: puiPara->TimeSend3Switch = 1; - break; + // break; case ONCE_DAY: puiPara->TimeSend2Switch = 1; - break; + // break; default: puiPara->TimeSend1Switch = 1; break; @@ -386,13 +386,13 @@ static void update_send_time_msg(lv_obj_t* obj) if(NULL != SendTimeMatrixObj_0) { lv_btnmatrix_set_focused_btn(SendTimeMatrixObj_0, gMatrixIndex); + lv_btnmatrix_set_map(SendTimeMatrixObj_0, SendTimeMap_0); } if(NULL != SendTimeMatrixObj_1) { lv_btnmatrix_set_focused_btn(SendTimeMatrixObj_1, gMatrixIndex); + lv_btnmatrix_set_map(SendTimeMatrixObj_1, SendTimeMap_1); } - lv_btnmatrix_set_map(SendTimeMatrixObj_0, SendTimeMap_0); - lv_btnmatrix_set_map(SendTimeMatrixObj_1, SendTimeMap_1); } void show_send_time_page(lv_obj_t* obj, const int sendType) { diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c index be80c6e6c..51ca4c145 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c @@ -22,7 +22,7 @@ extern void UIFlowPhoto_update_selftimer_cnt(UINT32 time); CHAR *Get_FreePicNumString(UINT32 uiValue) { - snprintf(g_cFreePicNumStr, sizeof(g_cFreePicNumStr), "%05ld/%05ld", PhotoExe_GetTotalPicNum(), uiValue); + snprintf(g_cFreePicNumStr, sizeof(g_cFreePicNumStr), "%05ld/%05ld", uiValue, PhotoExe_GetTotalPicNum()); return g_cFreePicNumStr; } diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index d1bab9ede..992467000 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -3148,9 +3148,13 @@ BOOL sf_cmd_para_printf(unsigned char argc, char **argv) printf("BatteryLogSwitch:%d\n", puiPara->BatteryLogSwitch); printf("GpsNumber:%d\n", puiPara->GpsNumber); printf("TimeSend1Switch:%d\n", puiPara->TimeSend1Switch); + printf("TimeSend1:%d:%d:%d\n", puiPara->TimeSend1.Hour,puiPara->TimeSend1.Min,puiPara->TimeSend1.Sec); printf("TimeSend2Switch:%d\n", puiPara->TimeSend2Switch); + printf("TimeSend2:%d:%d:%d\n", puiPara->TimeSend2.Hour,puiPara->TimeSend2.Min,puiPara->TimeSend2.Sec); printf("TimeSend3Switch:%d\n", puiPara->TimeSend3Switch); + printf("TimeSend3:%d:%d:%d\n", puiPara->TimeSend3.Hour,puiPara->TimeSend3.Min,puiPara->TimeSend3.Sec); printf("TimeSend4Switch:%d\n", puiPara->TimeSend4Switch); + printf("TimeSend4:%d:%d:%d\n", puiPara->TimeSend4.Hour,puiPara->TimeSend4.Min,puiPara->TimeSend4.Sec); printf("SendType:%d\n", puiPara->SendType); printf("PicUpDailyReport:%d\n", puiPara->PicUpDailyReport); printf("ProfileSwitchFlg:%d\n", puiPara->ProfileSwitchFlg);