From f67eb52c26ae11bfd0f9f46cebb455214c3a990e Mon Sep 17 00:00:00 2001 From: zyj Date: Tue, 17 Oct 2023 21:15:56 +0800 Subject: [PATCH] add debug log --- .../UIFlowMenuCommonItem/MenuGeneral.c | 15 +++++++++++++-- .../UIFlowMenuCommonItem/MenuSend.c | 9 ++++++++- .../UIFlowMenuCommonItemEventCallback.c | 11 +++++++++++ .../UIFlowMenuCommonOptionEventCallback.c | 19 +++++++++++++++++-- 4 files changed, 49 insertions(+), 5 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c index d5ab81f8f..2c054fb53 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c @@ -5,6 +5,7 @@ TMDEF_BEGIN_OPTIONS(CAMERA_MODE) TMDEF_OPTION_TEXT_S(CAMERA_MODE_PHOTO, TM_OPTION_ENABLE) +// TMDEF_OPTION_TEXT_S(CAMERA_MODE_VIDEO, TM_OPTION_DISABLE) TMDEF_OPTION_TEXT_S(CAMERA_MODE_PHOTO_AND_VIDEO, TM_OPTION_ENABLE) TMDEF_END_OPTIONS() TMDEF_BEGIN_OPTIONS(IMAGE_SIZE) @@ -77,28 +78,38 @@ TMDEF_EMNU(gGeneralMenu, GENERAL, General_MenuCallback) // -------------------------------------------------------------------------- int General_MenuCallback(UINT32 uiMessage, UINT32 uiParam) { + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + // printf(" ====================================================== \n"); + printf("\033[33m[General_MenuCallback]uiMessage:%d uiParam:%d\033[0m\n", uiMessage, uiParam); + UINT16 uwItemId; -// UINT16 uwOption; + UINT16 uwOption; if (uiMessage == TMM_CONFIRM_OPTION) { uwItemId = LO_WORD(uiParam); - // uwOption = HI_WORD(uiParam); + uwOption = HI_WORD(uiParam); switch (uwItemId) { case IDM_CAMERA_MODE: { + puiPara->CamMode = uwOption == 0 ? 0 : 2; + printf("\033[33m[General_MenuCallback]set CamMode:%d\033[0m\n", uwOption); break; } case IDM_IMAGE_SIZE: { + puiPara->ImgSize = uwOption; + printf("\033[33m[General_MenuCallback]set CamMode:%d\033[0m\n", uwOption); break; } case IDM_VIDEO_SIZE: { + puiPara->VideoSize = uwOption; break; } case IDM_VIDEA_LENGTH: { + puiPara->VideoLenth = uwOption; break; } case IDM_NIGHT_MODE: diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c index 90e713140..55c24b633 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c @@ -47,7 +47,9 @@ TMDEF_EMNU(gSendMenu, SEND, Send_MenuCallback) // -------------------------------------------------------------------------- int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam) { - printf(" ====================================================== \n"); + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + // printf(" ====================================================== \n"); + printf("\033[33m[Send_MenuCallback]uiMessage:%d uiParam:%d\033[0m\n", uiMessage, uiParam); UINT16 uwItemId; // UINT16 uwOption; if (uiMessage == TMM_CONFIRM_OPTION) @@ -58,22 +60,27 @@ int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam) { case IDM_MAX_NUM_DAY: { + printf("\033[33m[Send_MenuCallback]SendMaxNum:%d\033[0m\n", puiPara->SendMaxNum); break; } case IDM_SETTINGS_CHECK: { + // printf("\033[33m[Send_MenuCallback]SendMaxNum:%d\033[0m\n", puiPara->SendMaxNum); break; } case IDM_SEND_TYPE: { + printf("\033[33m[Send_MenuCallback]SendType:%d\033[0m\n", puiPara->SendType); break; } case IDM_CHECK_IN_PHOTO: { + // printf("\033[33m[Send_MenuCallback]SendMaxNum:%d\033[0m\n", puiPara->SendMaxNum); break; } case IDM_GPS: { + printf("\033[33m[Send_MenuCallback]GpsSendFlag:%d\033[0m\n", puiPara->GpsSendFlag); break; } default: diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c index 73031bd47..53d5af92a 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c @@ -422,6 +422,8 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu) itemIndex = (Sel_item * PER_PAGE_NUM); //draw item form startIndex + + printf("\033[33m[LV_MenuCommonItem_UpdateContent]Sel_item:%d itemIndex:%d pPage->Count:%d\033[0m\n",Sel_item,itemIndex,pPage->Count); for (i = 0; i < PER_PAGE_NUM; i++) { //check item if disable TM_CheckItemStatus(pMenu, &itemIndex, TRUE); @@ -431,6 +433,9 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu) // DBG_DUMP("\r\n %s for page = %d\r\n", __func__, pItem->TextId); // u_Item[i] = pPage->pItems[i]; // Sel_page = pPage->SelItem; + + + if ((itemIndex == pPage->Count) && (i < PER_PAGE_NUM)) { // if ((pPage->SelItem >= pPage->Count) && (i < PER_PAGE_NUM)) { CHKPNT; @@ -623,6 +628,7 @@ static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_NEXT: { + printf("\033[33m[UIFlowMenuCommonItem_Key]LV_USER_KEY_NEXT\033[0m\n"); printf("========================== down.\n"); LV_MenuItem_OnNext(obj); break; @@ -630,6 +636,7 @@ static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_PREV: { + printf("\033[33m[UIFlowMenuCommonItem_Key]LV_USER_KEY_PREV\033[0m\n"); printf("========================== up.\n"); LV_MenuItem_OnPrev(obj); break; @@ -638,6 +645,7 @@ static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key) case LV_KEY_LEFT: case LV_USER_KEY_UP: { + printf("\033[33m[UIFlowMenuCommonItem_Key]LV_KEY_LEFT LV_USER_KEY_UP\033[0m\n"); printf("========================== left.\n"); LV_MenuItem_OnUp(obj); break; @@ -646,6 +654,7 @@ static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key) case LV_KEY_RIGHT: case LV_USER_KEY_DOWN: { + printf("\033[33m[UIFlowMenuCommonItem_Key]LV_KEY_RIGHT LV_USER_KEY_DOWN\033[0m\n"); printf("========================== right.\n"); LV_MenuItem_OnDown(obj); break; @@ -653,6 +662,7 @@ static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_SELECT: { + printf("\033[33m[UIFlowMenuCommonItem_Key]LV_USER_KEY_SELECT\033[0m\n"); CHKPNT; printf("========================== select.\n"); LV_MenuItem_OnSelected(obj); @@ -661,6 +671,7 @@ static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_SHUTTER2: { + printf("\033[33m[UIFlowMenuCommonItem_Key]LV_USER_KEY_SELECT\033[0m\n"); lv_plugin_scr_close(obj, NULL); break; } diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c index 2139b14df..b9b960d7a 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c @@ -366,6 +366,15 @@ static void LV_MenuOption_OnSelected(lv_obj_t* obj) TM_OPTION *pOption; UINT16 SelOption = 0; + // UIMenuStoreInfo *puiPara = sf_ui_para_get(); + + printf("\033[33m[LV_MenuOption_OnSelected]zyj pMenu->SelPage:%d\033[0m\n",pMenu->SelPage); + TM_MENU *MenuList[4]; + MenuList[0] = &gQrMenu; + MenuList[1] = &gGeneralMenu; + MenuList[2] = &gSendMenu; + MenuList[3] = &gMoreMenu; + pPage = &pMenu->pPages[pMenu->SelPage]; pItem = &pPage->pItems[pPage->SelItem]; @@ -390,7 +399,7 @@ static void LV_MenuOption_OnSelected(lv_obj_t* obj) SysSetFlag(pItem->SysFlag, SelOption); // notify upper layer the Option had been confirmed - TM_MENU_CALLBACK(pMenu, TMM_CONFIRM_OPTION, MAKE_LONG(pItem->ItemId, SelOption)); + TM_MENU_CALLBACK(MenuList[pMenu->SelPage], TMM_CONFIRM_OPTION, MAKE_LONG(pItem->ItemId, SelOption)); pOption = &pItem->pOptions[SysGetFlag(pItem->SysFlag)]; @@ -490,6 +499,7 @@ static void UIFlowMenuCommonOption_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_NEXT: case LV_USER_KEY_DOWN: { + printf("\033[33m[UIFlowMenuCommonOption_Key]NEXT DOWN\033[0m\n"); LV_MenuOption_OnNext(obj); break; } @@ -497,11 +507,13 @@ static void UIFlowMenuCommonOption_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_PREV: case LV_USER_KEY_UP: { + printf("\033[33m[UIFlowMenuCommonOption_Key]PREV UP\033[0m\n"); LV_MenuOption_OnPrev(obj); break; } case LV_KEY_RIGHT: { + printf("\033[33m[UIFlowMenuCommonOption_Key] \033[0m\n"); printf("========================== right.\n"); LV_MenuOption_OnSelected(obj); break; @@ -509,12 +521,14 @@ static void UIFlowMenuCommonOption_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_SELECT: { + printf("\033[33m[UIFlowMenuCommonOption_Key]SELECT\033[0m\n"); LV_MenuOption_OnSelected(obj); break; } case LV_USER_KEY_SHUTTER2: { + printf("\033[33m[UIFlowMenuCommonOption_Key]SHUTTER2\033[0m\n"); LV_MenuOption_OnSelected(obj); break; } @@ -556,13 +570,14 @@ void UIFlowMenuCommonOptionEventCallback(lv_obj_t* obj, lv_event_t event) break; case LV_EVENT_CLICKED: + printf("\033[33m[UIFlowMenuCommonOptionEventCallback]LV_EVENT_CLICKED\033[0m\n"); LV_MenuOption_OnSelected(obj); break; case LV_EVENT_KEY: { uint32_t* key = (uint32_t*)lv_event_get_data(); - + printf("\033[33m[UIFlowMenuCommonOptionEventCallback]LV_EVENT_KEY key:%d\033[0m\n", *key); /* handle key event */ UIFlowMenuCommonOption_Key(obj, *key);