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 7ed42f39c..916c06633 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 @@ -348,7 +348,7 @@ void Option_Sensitivity_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_RIGHT: printf("\033[33m[Option_Sensitivity_Key]d\033[0m\n"); break; - case LV_USER_KEY_SHUTTER2: + case LV_KEY_ENTER: printf("\033[33m[Option_Sensitivity_Key]SELECT\033[0m\n"); lv_plugin_scr_close(obj, gen_nvtmsg_data(NVTRET_ENTER_MENU, 0)); hidde_Sensitivity_page(); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c index f9d86e693..3997cf8ec 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c @@ -216,7 +216,7 @@ void Option_Password_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_RIGHT: printf("\033[33m[Option_Password_Key]d\033[0m\n"); break; - case LV_USER_KEY_SHUTTER2: + case LV_KEY_ENTER: printf("\033[33m[Option_Password_Key]SELECT\033[0m\n"); lv_plugin_scr_close(obj, gen_nvtmsg_data(NVTRET_ENTER_MENU, 0)); hidde_Password_page(); @@ -415,6 +415,7 @@ void show_Camera_Info_page(lv_obj_t* obj) void hidde_Camera_Info_page(void) { + printf("[hidde_Camera_Info_page]\n"); CameraInfoIndex = 0; CameraInfoisHidden = 0; if(CameraInfolabel) @@ -457,7 +458,7 @@ void Option_CAMERA_INFO_Key(lv_obj_t* obj, uint32_t key) CameraInfoIndex = 1; update_Camera_Info_msg(obj); break; - case LV_USER_KEY_SHUTTER2: + case LV_KEY_ENTER: printf("\033[33m[Option_CAMERA_INFO_Key]SELECT\033[0m\n"); lv_plugin_scr_close(obj, gen_nvtmsg_data(NVTRET_ENTER_MENU, 0)); hidde_Camera_Info_page(); @@ -643,7 +644,7 @@ void Option_Camera_Name_Key(lv_obj_t* obj, uint32_t key) } lv_obj_set_state(CameraNameArray[CameraNameIndex], LV_STATE_FOCUSED); break; - case LV_USER_KEY_SHUTTER2: + case LV_KEY_ENTER: printf("\033[33m[Option_Camera_Name_Key]SELECT\033[0m\n"); lv_plugin_scr_close(obj, gen_nvtmsg_data(NVTRET_ENTER_MENU, 0)); hidde_Camera_Name_page(); 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 82982ddd4..78d44be6b 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 @@ -132,7 +132,6 @@ static void LV_MenuItem_OnUp(lv_obj_t* obj) } } - static void LV_MenuItem_OnDown(lv_obj_t* obj) { @@ -585,7 +584,6 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu) } - static void UIFlowMenuCommonItem_ScrOpen(lv_obj_t* obj) { DBG_DUMP("UIFlowMenuCommonItem_ScrOpen\r\n"); @@ -634,16 +632,24 @@ static void UIFlowMenuCommonItem_ScrOpen(lv_obj_t* obj) static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key) { + TM_MENU* pMenu = TM_GetMenu(); + #if HUNTING_CAMERA_MCU == ENABLE sf_set_auto_off_time(0); #endif + printf("[UIFlowMenuCommonItem_Key]key: %d\n",key); + switch(key) { + case LV_USER_KEY_UP: + case LV_USER_KEY_DOWN: + { + printf("[UIFlowMenuCommonItem_Key]error input\n",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; @@ -651,25 +657,20 @@ 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; } 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; } 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; @@ -685,7 +686,14 @@ static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key) case LV_KEY_ENTER: { - lv_plugin_scr_close(obj, NULL); + if (pMenu->Status == TMS_ON_TAB) + { + lv_plugin_scr_close(obj, NULL); + } + else + { + LV_MenuItem_OnSelected(obj); + } break; } #if HUNTING_CAMERA_MCU == ENABLE @@ -733,6 +741,7 @@ void container_main_menu_callback(lv_obj_t* obj, lv_event_t event) void UIFlowMenuCommonItemEventCallback(lv_obj_t* obj, lv_event_t event) { + printf("[UIFlowMenuCommonItemEventCallback]event:%d\n",event); switch(event) { case LV_PLUGIN_EVENT_SCR_OPEN: @@ -762,9 +771,9 @@ void UIFlowMenuCommonItemEventCallback(lv_obj_t* obj, lv_event_t event) lv_plugin_menu_set_selected_item_released(menu_item); break; - case LV_EVENT_CLICKED: - LV_MenuItem_OnSelected(obj); - break; + // case LV_EVENT_CLICKED: + // LV_MenuItem_OnSelected(obj); + // break; case LV_EVENT_KEY: { 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 98401c1fa..38eab9605 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 @@ -236,7 +236,7 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) pPage = &pMenu->pPages[pMenu->SelPage]; pItem = &pPage->pItems[pPage->SelItem]; -#if 1 +#if 0 DBG_DUMP("\r\n %s pMenu Status= %d\r\n", __func__, pMenu->Status); DBG_DUMP("\r\n %s pMenu SelPage= %d\r\n", __func__, pMenu->SelPage); DBG_DUMP("\r\n %s pMenu FirstPage= %d\r\n", __func__, pMenu->FirstPage); @@ -692,13 +692,13 @@ static void UIFlowMenuCommonOption_Key(lv_obj_t* obj, uint32_t key) sf_set_auto_off_time(0); #endif + printf("[UIFlowMenuCommonOption_Key]key:%d\n"); switch(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; } @@ -706,28 +706,23 @@ 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; } case LV_USER_KEY_SELECT: { - printf("\033[33m[UIFlowMenuCommonOption_Key]SELECT\033[0m\n"); LV_MenuOption_OnSelected(obj); break; } - - case LV_USER_KEY_SHUTTER2: +// + case LV_KEY_ENTER: { - printf("\033[33m[UIFlowMenuCommonOption_Key]SHUTTER2\033[0m\n"); LV_MenuOption_OnSelected(obj); break; } @@ -790,7 +785,7 @@ void UIFlowMenuCommonOptionEventCallback(lv_obj_t* obj, lv_event_t event) case LV_EVENT_CLICKED: printf("\033[33m[UIFlowMenuCommonOptionEventCallback]LV_EVENT_CLICKED\033[0m\n"); - LV_MenuOption_OnSelected(obj); + // LV_MenuOption_OnSelected(obj); break; case LV_EVENT_KEY: