From fd98f2785e174d2f9f439bbfb2c384088f100b7b Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Tue, 9 Jan 2024 10:37:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E6=97=B6?= =?UTF-8?q?=E5=BA=8F=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c index c4dc46803..a5cfca75f 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c @@ -51,8 +51,15 @@ static void task_msgbox_timer_cb(lv_task_t* task) msgbox_timer = NULL; if (msgbox) { - printf("msg box close delay 1000.\n"); - lv_msgbox_start_auto_close(msgbox, 1000); + if (0 != autoClose) + { + printf("msg box close delay 1000.\n"); + lv_msgbox_start_auto_close(msgbox, 1000); + } + else + { + lv_msgbox_start_auto_close(msgbox, 5000); + } } if (0 == autoClose) { From 204f9ea7b039dca13c826855170e772cd30cbdda Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Tue, 9 Jan 2024 13:46:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=80=92=E8=AE=A1?= =?UTF-8?q?=E6=97=B6=E5=88=B00=E5=90=8E=E9=97=AA=E7=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowMenuCommonConfirmEventCallback.c | 1 + .../UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c | 2 ++ .../UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c | 6 +++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c index 05f41773c..32503edf6 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c @@ -543,6 +543,7 @@ static void UIFlowMenuCommonConfirm_MessageBox_ValueChanged(lv_obj_t* obj, uint3 } else if (gBKGEvt == NVTEVT_BKW_ENTER_WORK_MODE) { OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF); + sf_set_pir_statu_flag(1); // BKG_PostEvent(gBKGEvt); // UIFlowMenuCommonConfirm_CloseScr(); } else if (gBKGEvt) { diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c index fbda6e0b8..4e5e5f2fe 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c @@ -1739,6 +1739,7 @@ static void task_update_icons_timer_cb(lv_task_t* task) else { OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF); + sf_set_pir_statu_flag(1); } } return; @@ -2129,6 +2130,7 @@ void UIFlowPhtot_KeyLongPress(lv_obj_t* obj, uint32_t key) { // Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_APO); OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF); + sf_set_pir_statu_flag(1); KeyLeftPressingTimeMs = 0; } break; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c index a5cfca75f..ffb93b26a 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c @@ -7,6 +7,7 @@ #include "sf_sd_common.h" #include "sf_commu_mcu_reg.h" #include "sf_common.h" +extern BOOL sf_is_usb_flag(void); /************************************************************** * static variables @@ -42,7 +43,10 @@ static void task_msgbox_timer_cb(lv_task_t* task) UINT16 autoOffTime = sf_get_auto_off_time(); const lv_plugin_string_t* string = lv_plugin_get_string(msgID); - + if(sf_is_usb_flag()) + { + return; + } if (0 == autoClose || autoOffTime <= 10) { printf("[task_msgbox_timer_cb][*x]auto close\n"); From e509223c332a7d4411b874d9c8920ba8110142d3 Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Tue, 9 Jan 2024 15:21:55 +0800 Subject: [PATCH 3/3] 1.ver:7MR5RCwE102 --- build_all.sh | 6 +++--- code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h | 2 +- .../application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build_all.sh b/build_all.sh index 4616e2a42..913af95c1 100755 --- a/build_all.sh +++ b/build_all.sh @@ -1,7 +1,7 @@ #!/bin/bash #用于gitlab-ci.yml编译使用 -#make app_clean +make app_clean echo "Start compile." export ROOT_PATH=$PWD @@ -9,7 +9,7 @@ export ROOT_PATH=$PWD cd rtos source build/envsetup.sh lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf -#make clean +make clean make all > /dev/null cp output/application.bin ../ cp output/rtos-main.bin ../ @@ -18,7 +18,7 @@ cp output/rtos-main.bin ../ cd $ROOT_PATH source build/envsetup.sh lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01 -#make clean +make clean make all > /dev/null cd $ROOT_PATH diff --git a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h index 87744d544..a055705d7 100755 --- a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h +++ b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h @@ -924,7 +924,7 @@ #define HUNTING_MCU_UART ENABLE #define HUNTING_IR_LED_940 ENABLE #define SF_EXIF_MN_BUF_SIZE 256 -#define SF_BASE_VERSION "7MR5RCwE101" +#define SF_BASE_VERSION "7MR5RCwE102" #define HW_S530 DISABLE #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ #define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ diff --git a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h index 9326c1f1b..98fad1c02 100755 --- a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h +++ b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h @@ -945,7 +945,7 @@ #define HUNTING_MCU_UART ENABLE #define HUNTING_IR_LED_940 ENABLE #define SF_EXIF_MN_BUF_SIZE 256 -#define SF_BASE_VERSION "7MR5RCwE101" +#define SF_BASE_VERSION "7MR5RCwE102" #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ #define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ #define PHOTO_THUMB_PATH ":\\THUMB\\"