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

Fixed key event in lvgl callback.

Browse Source
This commit is contained in:
xiaojiazhu 2023-10-13 13:54:09 +08:00
parent 11129f22ef
commit 84bb6aeb8f
5 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/application/source/cardv/SrcCode/System/SysInput_Exe.c
View File

@ -132,15 +132,21 @@ static KEY_OBJ g_KeyTable[] = {
{FLGKEY_DOWN, KEY_PRESS, NVTEVT_KEY_NEXT, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_KEY_TONE}, {FLGKEY_DOWN, KEY_PRESS, NVTEVT_KEY_NEXT, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_KEY_TONE},
{FLGKEY_DOWN, KEY_CONTINUE, NVTEVT_KEY_NEXT, NVTEVT_KEY_CONTINUE, 0}, {FLGKEY_DOWN, KEY_CONTINUE, NVTEVT_KEY_NEXT, NVTEVT_KEY_CONTINUE, 0},
{FLGKEY_DOWN, KEY_RELEASE, NVTEVT_KEY_NEXT, NVTEVT_KEY_RELEASE, 0}, {FLGKEY_DOWN, KEY_RELEASE, NVTEVT_KEY_NEXT, NVTEVT_KEY_RELEASE, 0},
{FLGKEY_LEFT, KEY_PRESS, NVTEVT_KEY_MOVIE, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_KEY_TONE}, // {FLGKEY_LEFT, KEY_PRESS, NVTEVT_KEY_MOVIE, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_KEY_TONE},
//{FLGKEY_LEFT, KEY_CONTINUE, NVTEVT_KEY_PREV, NVTEVT_KEY_CONTINUE, 0}, //{FLGKEY_LEFT, KEY_CONTINUE, NVTEVT_KEY_PREV, NVTEVT_KEY_CONTINUE, 0},
//{FLGKEY_LEFT, KEY_RELEASE, NVTEVT_KEY_PREV, NVTEVT_KEY_RELEASE, 0}, //{FLGKEY_LEFT, KEY_RELEASE, NVTEVT_KEY_PREV, NVTEVT_KEY_RELEASE, 0},
{FLGKEY_LEFT, KEY_PRESS, NVTEVT_KEY_LEFT, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_KEY_TONE},
{FLGKEY_LEFT, KEY_CONTINUE, NVTEVT_KEY_LEFT, NVTEVT_KEY_CONTINUE, 0},
{FLGKEY_LEFT, KEY_RELEASE, NVTEVT_KEY_LEFT, NVTEVT_KEY_RELEASE, 0},
{FLGKEY_SHUTTER2, KEY_PRESS, NVTEVT_KEY_SHUTTER2, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_KEY_TONE}, {FLGKEY_SHUTTER2, KEY_PRESS, NVTEVT_KEY_SHUTTER2, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_KEY_TONE},
{FLGKEY_SHUTTER2, KEY_CONTINUE, NVTEVT_KEY_SHUTTER2, NVTEVT_KEY_CONTINUE, 0}, {FLGKEY_SHUTTER2, KEY_CONTINUE, NVTEVT_KEY_SHUTTER2, NVTEVT_KEY_CONTINUE, 0},
{FLGKEY_SHUTTER2, KEY_RELEASE, NVTEVT_KEY_SHUTTER2, NVTEVT_KEY_RELEASE, 0}, {FLGKEY_SHUTTER2, KEY_RELEASE, NVTEVT_KEY_SHUTTER2, NVTEVT_KEY_RELEASE, 0},
{FLGKEY_RIGHT, KEY_PRESS, NVTEVT_KEY_SELECT, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_KEY_TONE}, // {FLGKEY_RIGHT, KEY_PRESS, NVTEVT_KEY_SELECT, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_KEY_TONE},
{FLGKEY_RIGHT, KEY_CONTINUE, NVTEVT_KEY_SELECT, NVTEVT_KEY_CONTINUE, 0}, // {FLGKEY_RIGHT, KEY_CONTINUE, NVTEVT_KEY_SELECT, NVTEVT_KEY_CONTINUE, 0},
{FLGKEY_RIGHT, KEY_RELEASE, NVTEVT_KEY_SELECT, NVTEVT_KEY_RELEASE, 0}, // {FLGKEY_RIGHT, KEY_RELEASE, NVTEVT_KEY_SELECT, NVTEVT_KEY_RELEASE, 0},
{FLGKEY_RIGHT, KEY_PRESS, NVTEVT_KEY_RIGHT, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_KEY_TONE},
{FLGKEY_RIGHT, KEY_CONTINUE, NVTEVT_KEY_RIGHT, NVTEVT_KEY_CONTINUE, 0},
{FLGKEY_RIGHT, KEY_RELEASE, NVTEVT_KEY_RIGHT, NVTEVT_KEY_RELEASE, 0},
{FLGKEY_CUSTOM1, KEY_PRESS, NVTEVT_KEY_CUSTOM1, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_NONE}, {FLGKEY_CUSTOM1, KEY_PRESS, NVTEVT_KEY_CUSTOM1, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_NONE},
{FLGKEY_CUSTOM1, KEY_RELEASE, NVTEVT_KEY_CUSTOM1, NVTEVT_KEY_RELEASE, 0}, {FLGKEY_CUSTOM1, KEY_RELEASE, NVTEVT_KEY_CUSTOM1, NVTEVT_KEY_RELEASE, 0},
{FLGKEY_DATAREADY, KEY_PRESS, NVTEVT_KEY_DATAREADY, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_NONE}, {FLGKEY_DATAREADY, KEY_PRESS, NVTEVT_KEY_DATAREADY, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_NONE},

43
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c
View File

@ -2,6 +2,7 @@
#include "PrjInc.h" #include "PrjInc.h"
#include "UIFlowLVGL/UIFlowLVGL.h" #include "UIFlowLVGL/UIFlowLVGL.h"
#include "UIApp/Network/UIAppNetwork.h" #include "UIApp/Network/UIAppNetwork.h"
#include "UIFlowLVGL_SPORTCAM.h"
#include <kwrap/debug.h> #include <kwrap/debug.h>
#define PAGE 6 #define PAGE 6
@ -543,39 +544,39 @@ static void UIFlowMenuCommonItem_ScrOpen(lv_obj_t* obj)
static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key) static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key)
{ {
printf(" wwwwwwwwwwwwwwwwww key = %d\n", key);
switch(key) switch(key)
{ {
case LV_USER_KEY_NEXT: case LV_USER_KEY_RIGHT:
{ {
printf("=============== down.\n"); printf("=============== right.\n");
MenuItem_OnNext(obj); MenuItem_OnSelected(obj);
// MenuItem_OnDown(obj); break;
MenuItem_OnDown(obj);
break; break;
} }
case LV_USER_KEY_PREV: case LV_USER_KEY_LEFT:
{ {
printf("=============== up.\n"); printf("=============== left.\n");
MenuItem_OnPrev(obj);
// MenuItem_OnUp(obj);
break;
}
case LV_USER_KEY_UP:
{
printf("=============== up.\n");
// MenuItem_OnPrev(obj);
MenuItem_OnUp(obj); MenuItem_OnUp(obj);
break; break;
} }
case LV_USER_KEY_DOWN: case LV_USER_KEY_NEXT:
// case LV_USER_KEY_DOWN:
{ {
printf("=============== down.\n"); printf("=============== down.\n");
// MenuItem_OnNext(obj); MenuItem_OnNext(obj);
MenuItem_OnDown(obj); break;
}
case LV_USER_KEY_PREV:
// case LV_USER_KEY_UP:
{
printf("=============== up.\n");
MenuItem_OnPrev(obj);
break; break;
} }
@ -649,7 +650,6 @@ void container_main_menu_callback(lv_obj_t* obj, lv_event_t event)
void UIFlowMenuCommonItemEventCallback(lv_obj_t* obj, lv_event_t event) void UIFlowMenuCommonItemEventCallback(lv_obj_t* obj, lv_event_t event)
{ {
printf("=================== event.\n", event);
switch(event) switch(event)
{ {
case LV_PLUGIN_EVENT_SCR_OPEN: case LV_PLUGIN_EVENT_SCR_OPEN:
@ -683,14 +683,13 @@ void UIFlowMenuCommonItemEventCallback(lv_obj_t* obj, lv_event_t event)
break; break;
case LV_EVENT_CLICKED: case LV_EVENT_CLICKED:
printf("ssssssssss LV_EVENT_CLICKED\n"); printf("=================== menu press right, rec LV_EVENT_CLICKED\n");
MenuItem_OnSelected(obj); MenuItem_OnSelected(obj);
break; break;
case LV_EVENT_KEY: case LV_EVENT_KEY:
{ {
uint32_t* key = (uint32_t*)lv_event_get_data(); uint32_t* key = (uint32_t*)lv_event_get_data();
printf("wwwwwwww LV_EVENT_KEY = %d\n", key);
/* handle key event */ /* handle key event */
UIFlowMenuCommonItem_Key(obj, *key); UIFlowMenuCommonItem_Key(obj, *key);

1
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c
View File

@ -1187,6 +1187,7 @@ static void UIFlowMovie_Key(lv_obj_t* obj, uint32_t key)
break; break;
} }
case LV_USER_KEY_RIGHT:
case LV_USER_KEY_MENU: case LV_USER_KEY_MENU:
{ {
UIFlowMovie_OnKeyMenu(obj); UIFlowMovie_OnKeyMenu(obj);

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

@ -1379,6 +1379,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
} }
case LV_USER_KEY_MENU: case LV_USER_KEY_MENU:
case LV_USER_KEY_RIGHT:
{ {
UIFlowPhoto_OnKeyMenu(obj); UIFlowPhoto_OnKeyMenu(obj);
break; break;
@ -1458,6 +1459,7 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
break; break;
case LV_EVENT_CLICKED: case LV_EVENT_CLICKED:
printf(" ============================== photo press right, rec LV_EVENT_CLICKED.\n");
UIFlowPhoto_OnKeyMenu(obj); UIFlowPhoto_OnKeyMenu(obj);
break; break;

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL_SPORTCAM.h
View File

@ -72,6 +72,8 @@ typedef enum {
LV_USER_KEY_DOWN = LV_KEY_DOWN, LV_USER_KEY_DOWN = LV_KEY_DOWN,
LV_USER_KEY_UP = LV_KEY_UP, LV_USER_KEY_UP = LV_KEY_UP,
LV_USER_KEY_LEFT = LV_KEY_LEFT,
LV_USER_KEY_RIGHT = LV_KEY_RIGHT,
LV_USER_KEY_DEF_START = 128, LV_USER_KEY_DEF_START = 128,
LV_USER_KEY_SHUTTER1, LV_USER_KEY_SHUTTER1,