修复倒计时界面插入usb不停止

This commit is contained in:
xiehongyan 2024-01-02 16:55:59 +08:00
parent 7afffdb5cf
commit a4e4952d00
3 changed files with 5 additions and 7 deletions

View File

@ -906,8 +906,7 @@ static void UIFlowMovie_OnExeRecord(lv_obj_t* obj)
if (System_GetState(SYS_STATE_POWERON) == SYSTEM_POWERON_SAFE) { if (System_GetState(SYS_STATE_POWERON) == SYSTEM_POWERON_SAFE) {
if (System_GetState(SYS_STATE_CARD) == CARD_REMOVED) { if (System_GetState(SYS_STATE_CARD) == CARD_REMOVED) {
//UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms);
return; return;
} }
@ -921,7 +920,6 @@ static void UIFlowMovie_OnExeRecord(lv_obj_t* obj)
} }
if (System_GetState(SYS_STATE_CARD) == CARD_REMOVED) { if (System_GetState(SYS_STATE_CARD) == CARD_REMOVED) {
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms); UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms);
return; return;
} }

View File

@ -58,8 +58,8 @@ static void task_msgbox_timer_cb(lv_task_t* task)
{ {
sf_set_pir_statu_flag(1); sf_set_pir_statu_flag(1);
// OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF); // OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF);
#define DO_NOT_SHOW_POWER_OFF 0 //#define DO_NOT_SHOW_POWER_OFF 0
Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 2, APP_POWER_OFF_APO, DO_NOT_SHOW_POWER_OFF); //Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 2, APP_POWER_OFF_APO, DO_NOT_SHOW_POWER_OFF);
} }
return; return;
} }

View File

@ -290,7 +290,7 @@ void sf_mode_detect(void)
else if(pwroffcnt == 6) else if(pwroffcnt == 6)
{ {
sf_sys_status_led_set(SF_LED_SYS_STATE_POWER_OFF); sf_sys_status_led_set(SF_LED_SYS_STATE_POWER_OFF);
/*
printf("[power off] %s(%d) AutoOfftime:%d\n", __FUNCTION__, __LINE__, AutoOfftime); printf("[power off] %s(%d) AutoOfftime:%d\n", __FUNCTION__, __LINE__, AutoOfftime);
#define DO_NOT_SHOW_POWER_OFF 0 #define DO_NOT_SHOW_POWER_OFF 0
if(AutoOfftime >= KeepAliveTime_s) if(AutoOfftime >= KeepAliveTime_s)
@ -305,7 +305,7 @@ void sf_mode_detect(void)
Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 2, APP_POWER_OFF_APO, DO_NOT_SHOW_POWER_OFF); //shutdown start Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 2, APP_POWER_OFF_APO, DO_NOT_SHOW_POWER_OFF); //shutdown start
#endif #endif
} }
sf_set_power_off_flag(1);*/ sf_set_power_off_flag(1);
} }
} }
else else