diff --git a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxInput_Key.c b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxInput_Key.c index ced18d402..ec816f24a 100755 --- a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxInput_Key.c +++ b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxInput_Key.c @@ -376,7 +376,7 @@ UINT32 DrvKey_DetNormalKey(void) // } if (gpio_getPin(GPIO_KEY_DATAREADY)) { - uiKeyCode |= FLGKEY_DATAREADY; + // uiKeyCode |= FLGKEY_DATAREADY; } #endif /* @@ -387,6 +387,10 @@ UINT32 DrvKey_DetNormalKey(void) } */ DBG_IND("KEY= %08x\r\n", uiKeyCode); + if (0 != uiKeyCode) + { + sf_set_auto_off_time(0); + } // DBG_DUMP("KEY= %d\r\n", gpio_getPin(GPIO_KEY_LEFT)); DrvKey_DetKeyDelay(); 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 32ebab6a2..7195fcbe1 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 @@ -4,6 +4,7 @@ #include #include "sf_sd_common.h" #include "sf_commu_mcu_reg.h" +#include "sf_common.h" /************************************************************** * static variables @@ -36,6 +37,14 @@ static void task_msgbox_timer_cb(lv_task_t* task) // LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD if(LV_PLUGIN_STRING_ID_STRING_ENTER_WORK == msgID) { + UINT16 autoOffTime = sf_get_auto_off_time(); + if (autoOffTime < 160) + { + lv_task_del(msgbox_timer); + msgbox_timer = NULL; + lv_msgbox_start_auto_close(msgbox, 0); + return; + } const lv_plugin_string_t* string = lv_plugin_get_string(msgID); if(string){