payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug:show review screen when power off.

Browse Source
This commit is contained in:
xiaojiazhu 2023-12-20 10:17:03 +08:00
parent 488c4c1e34
commit 9741bf7716
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
code/application/source/cardv/SrcCode/System/SysMain_Exe.c
View File

@ -422,6 +422,7 @@ BOOL System_GetShutdownBegin(void)
INT32 System_OnShutdown(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) INT32 System_OnShutdown(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
{ {
UINT32 displayShow = SHOW_POWER_OFF; UINT32 displayShow = SHOW_POWER_OFF;
BOOL isMenu = sf_is_menu_open();
if ( paramNum >= 2) if ( paramNum >= 2)
{ {
DBG_DUMP("^MOn Shutdown begin paramNum:%d paramArray[0]:%d paramArray[1]:%d\r\n",paramNum, paramArray[0], paramArray[1]); DBG_DUMP("^MOn Shutdown begin paramNum:%d paramArray[0]:%d paramArray[1]:%d\r\n",paramNum, paramArray[0], paramArray[1]);
@ -479,11 +480,24 @@ INT32 System_OnShutdown(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
if(sf_get_mode_flag() && SHOW_POWER_OFF == displayShow) if(sf_get_mode_flag() && SHOW_POWER_OFF == displayShow)
#endif #endif
{ {
GxDisplay_Set(LAYER_OSD1, LAYER_STATE_ENABLE, 0); //turn off OSD1 if (FALSE == isMenu)
GxDisplay_Flush(LAYER_OSD1); {
GxDisplay_Set(LAYER_OSD1, LAYER_STATE_ENABLE, 0); //turn off OSD1
Display_ShowSplash(SPLASH_POWEROFF); GxDisplay_Flush(LAYER_OSD1);
SwTimer_DelayMs(500); Display_ShowSplash(SPLASH_POWEROFF);
SwTimer_DelayMs(500);
}
else
{
Display_ShowSplash(SPLASH_POWEROFF);
SwTimer_DelayMs(500);
GxDisplay_Set(LAYER_OSD1, LAYER_STATE_ENABLE, 0); //turn off OSD1
GxDisplay_Flush(LAYER_OSD1);
}
// Display_ShowSplash(SPLASH_POWEROFF);
// SwTimer_DelayMs(500);
// GxDisplay_Set(LAYER_OSD1, LAYER_STATE_ENABLE, 0); //turn off OSD1
// GxDisplay_Flush(LAYER_OSD1);
} }
#endif #endif
} }

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
View File

@ -1383,6 +1383,8 @@ void UIFlowPhoto_OnBatteryLow(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* ms
static void UIFlowPhoto_ScrOpen(lv_obj_t* obj) static void UIFlowPhoto_ScrOpen(lv_obj_t* obj)
{ {
lv_obj_set_hidden(container_photo_scr_uiflowphoto, false);
lv_obj_set_hidden(label_line_scr_uiflowphoto, false);
set_indev_keypad_group(obj); set_indev_keypad_group(obj);
update_fd_frame(); update_fd_frame();
//#NT#2016/10/04#Lincy Lin -begin //#NT#2016/10/04#Lincy Lin -begin
@ -1489,6 +1491,8 @@ static void UIFlowPhoto_ScrClose(lv_obj_t* obj)
/* Reset key press/release/continue mask to default */ /* Reset key press/release/continue mask to default */
Ux_FlushEventByRange(NVTEVT_KEY_EVT_START, NVTEVT_KEY_EVT_END); Ux_FlushEventByRange(NVTEVT_KEY_EVT_START, NVTEVT_KEY_EVT_END);
lv_obj_set_hidden(container_photo_scr_uiflowphoto, true);
lv_obj_set_hidden(label_line_scr_uiflowphoto, true);
return; return;
} }

1
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -2018,7 +2018,6 @@ void sf_cardv_message_thread_init(void)
void sf_set_menu_open(BOOL is) void sf_set_menu_open(BOOL is)
{ {
IsMenu = is; IsMenu = is;
//printf("[%s]:%d IsMenu:%d\n", __FUNCTION__, __LINE__, IsMenu);
} }
BOOL sf_is_menu_open(void) BOOL sf_is_menu_open(void)