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-02-04 21:23:37 +08:00
commit 7345c7f689
9 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c
View File

@ -94,7 +94,7 @@ int General_MenuCallback(UINT32 uiMessage, UINT32 uiParam)
{ {
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
set_menu_changed(1); set_menu_changed(1);
// printf(" ====================================================== \n");
printf("\033[33m[General_MenuCallback]uiMessage:%d uiParam:%d\033[0m\n", uiMessage, uiParam); printf("\033[33m[General_MenuCallback]uiMessage:%d uiParam:%d\033[0m\n", uiMessage, uiParam);
UINT16 uwItemId; UINT16 uwItemId;
@ -480,7 +480,7 @@ void Option_Sensitivity_Key(lv_obj_t* obj, uint32_t key)
{ {
if(SensitivityTitleLabel == NULL || SensitivityValueLabel == NULL) if(SensitivityTitleLabel == NULL || SensitivityValueLabel == NULL)
{ {
printf("Sensitivity is NULL"); printf("Sensitivity is NULL\n");
return; return;
} }

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c
View File

@ -315,7 +315,7 @@ int Movie_MenuCallback(UINT32 uiMessage, UINT32 uiParam)
{ {
UINT16 uwItemId; UINT16 uwItemId;
UINT16 uwOption; UINT16 uwOption;
printf("=========================================================\n");
if (uiMessage == TMM_CONFIRM_OPTION) { if (uiMessage == TMM_CONFIRM_OPTION) {
uwItemId = LO_WORD(uiParam); uwItemId = LO_WORD(uiParam);
uwOption = HI_WORD(uiParam); uwOption = HI_WORD(uiParam);

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

@ -363,7 +363,7 @@ static void update_Network_Selection_msg(lv_obj_t* obj)
lv_plugin_menu_set_item_hidden(pMenu, i, false); lv_plugin_menu_set_item_hidden(pMenu, i, false);
if((ITEMS_PER_PAGE * selectedPage) + i == ProfileFocused) if((ITEMS_PER_PAGE * selectedPage) + i == ProfileFocused)
{ {
printf("[*x]i: %d\n", i); printf("[%s:%d]i: %d\n", __FUNCTION__, __LINE__, i);
lv_plugin_menu_select_item(pMenu, i); lv_plugin_menu_select_item(pMenu, i);
} }
if((ITEMS_PER_PAGE * selectedPage) + i == ProfileSelected) if((ITEMS_PER_PAGE * selectedPage) + i == ProfileSelected)

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c
View File

@ -55,7 +55,7 @@ int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam)
{ {
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
set_menu_changed(1); set_menu_changed(1);
// printf(" ====================================================== \n");
printf("\033[33m[Send_MenuCallback]uiMessage:%d uiParam:%d\033[0m\n", uiMessage, uiParam); printf("\033[33m[Send_MenuCallback]uiMessage:%d uiParam:%d\033[0m\n", uiMessage, uiParam);
UINT16 uwItemId; UINT16 uwItemId;
UINT16 uwOption; UINT16 uwOption;
@ -456,7 +456,7 @@ void Option_MaxNum_Key(lv_obj_t* obj, uint32_t key)
{ {
if(MaxNumTitleLabel == NULL || MaxNumValueLabel == NULL) if(MaxNumTitleLabel == NULL || MaxNumValueLabel == NULL)
{ {
printf("MaxNum is NULL"); printf("MaxNum is NULL\n");
return; return;
} }

3
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c
View File

@ -307,7 +307,6 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
lv_obj_set_hidden(container_main_menu_scr_uiflowmenucommonoption, true); lv_obj_set_hidden(container_main_menu_scr_uiflowmenucommonoption, true);
if(pItem->ItemId == IDM_NETWORK_SELECTION && ReadFile == 1) if(pItem->ItemId == IDM_NETWORK_SELECTION && ReadFile == 1)
{ {
printf("=======================================================================================\n");
lv_obj_set_hidden(container_main_menu_scr_uiflowmenucommonoption, false); lv_obj_set_hidden(container_main_menu_scr_uiflowmenucommonoption, false);
} }
return; return;
@ -1336,7 +1335,7 @@ static void UIFlowMenuCommonOption_Key(lv_obj_t* obj, uint32_t key)
sf_set_auto_off_time(0); sf_set_auto_off_time(0);
#endif #endif
printf("[UIFlowMenuCommonOption_Key]key:%d\n"); printf("[UIFlowMenuCommonOption_Key]key:%d\n", key);
switch(key) switch(key)
{ {

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c
View File

@ -235,7 +235,7 @@ static void UIFlowPassword_Key(lv_obj_t* obj, uint32_t key)
{ {
if(SendTimeMatrixObj_0 == NULL) if(SendTimeMatrixObj_0 == NULL)
{ {
printf("SendTimeMatrixObj_0 is NULL"); printf("SendTimeMatrixObj_0 is NULL\n");
return; return;
} }
#define OFFSET 31 #define OFFSET 31

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

@ -2149,7 +2149,7 @@ static void UIFlowPhoto_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* m
{ {
//g_SysStrg_Chg = false; //g_SysStrg_Chg = false;
UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum);
printf("[*x]====UI_StorageCheck: g_uiFreePicNum = 0x%ld\r\n", g_uiFreePicNum); printf("[%s:%d]UI_StorageCheck: g_uiFreePicNum = 0x%ld\r\n", __FUNCTION__, __LINE__, g_uiFreePicNum);
DBG_DUMP("UI_StorageCheck: g_uiFreePicNum = 0x%ld\r\n", g_uiFreePicNum); DBG_DUMP("UI_StorageCheck: g_uiFreePicNum = 0x%ld\r\n", g_uiFreePicNum);
//lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum)); //lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum));
break; break;

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

@ -1249,7 +1249,7 @@ static void FlowPlay_CheckFileAndRecovery(lv_obj_t* obj)
} }
PBView_DrawErrorView(); 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"); printf("[FlowPlay_CheckFileAndRecovery]error picture\n");
} }
} }
@ -2404,7 +2404,7 @@ 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) 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"); printf("[UIFlowPlay_CB_Error]error picture\n");
} }
///================================callback event end============================================================================================ ///================================callback event end============================================================================================

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c
View File

@ -68,7 +68,7 @@ static void task_msgbox_timer_cb(lv_task_t* task)
} }
if (0 == autoClose) if (0 == autoClose)
{ {
printf("[task_msgbox_timer_cb][*x]set statu flag\n"); printf("[task_msgbox_timer_cb]set statu flag\n");
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