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

Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc

Browse Source
This commit is contained in:
payton 2024-01-04 19:49:06 +08:00
commit 66ccd12a8e
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c
View File

@ -633,7 +633,6 @@ void Option_Network_Selection_Key(lv_obj_t* obj, uint32_t key)
hidde_Network_Selection_page();
break;
case LV_USER_KEY_RIGHT:
break;
case LV_KEY_ENTER:
if(network_scan_task == NULL && network_select_task == NULL)
{

6
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c
View File

@ -1212,7 +1212,8 @@ static void FlowPlay_CheckFileAndRecovery(lv_obj_t* obj)
}
}
PBView_DrawErrorView();
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PICTUREERROR, warn_msgbox_auto_close_ms);
//UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PICTUREERROR, warn_msgbox_auto_close_ms);
printf("[FlowPlay_CheckFileAndRecovery]error picture");
}
}
@ -2333,7 +2334,8 @@ static void UIFlowPlay_StorageChange(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_D
static void UIFlowPlay_CB_Error(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg)
{
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PICTUREERROR, warn_msgbox_auto_close_ms);
//UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PICTUREERROR, warn_msgbox_auto_close_ms);
printf("[UIFlowPlay_CB_Error]error picture");
}
///================================callback event end============================================================================================

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

@ -258,7 +258,7 @@ void sf_mode_detect(void)
time=0;
printf("[*x] get pir statu : %d ...\n", sf_get_pir_statu_flag());
if((sf_get_pir_statu_flag()) && (!gpio_getPin(GPIO_KEY_TEST)))
{
timeBak++;