From 204f9ea7b039dca13c826855170e772cd30cbdda Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Tue, 9 Jan 2024 13:46:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=80=92=E8=AE=A1=E6=97=B6?= =?UTF-8?q?=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");