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

Improve comfirm screen.

Browse Source
This commit is contained in:
xiaojiazhu 2023-10-20 11:41:58 +08:00
parent 94afaa5317
commit 42874c5574
6 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,9 +138,9 @@ static KEY_OBJ g_KeyTable[] = {
{FLGKEY_LEFT, KEY_PRESS, NVTEVT_KEY_LEFT, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_KEY_TONE}, {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_CONTINUE, NVTEVT_KEY_LEFT, NVTEVT_KEY_CONTINUE, 0},
{FLGKEY_LEFT, KEY_RELEASE, NVTEVT_KEY_LEFT, NVTEVT_KEY_RELEASE, 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_SELECT, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_KEY_TONE},
{FLGKEY_SHUTTER2, KEY_CONTINUE, NVTEVT_KEY_SHUTTER2, NVTEVT_KEY_CONTINUE, 0}, {FLGKEY_SHUTTER2, KEY_CONTINUE, NVTEVT_KEY_SELECT, NVTEVT_KEY_CONTINUE, 0},
{FLGKEY_SHUTTER2, KEY_RELEASE, NVTEVT_KEY_SHUTTER2, NVTEVT_KEY_RELEASE, 0}, {FLGKEY_SHUTTER2, KEY_RELEASE, NVTEVT_KEY_SELECT, 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},

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c
View File

@ -238,7 +238,6 @@ static void UIFlowMenuCommonConfirm_MessageBox_ValueChanged(lv_obj_t* obj, uint3
{ {
if(NULL == value) if(NULL == value)
return; return;
printf("============== value = %d\n", *value);
if (*value == 0) { if (*value == 0) {
const char* msgbox_text = lv_msgbox_get_text(obj); const char* msgbox_text = lv_msgbox_get_text(obj);
@ -361,7 +360,6 @@ void message_box_confirm_msg_event_callback(lv_obj_t* obj, lv_event_t event)
case LV_EVENT_VALUE_CHANGED: case LV_EVENT_VALUE_CHANGED:
case LV_EVENT_CLICKED: case LV_EVENT_CLICKED:
{ {
printf("=============================================================== LV_EVENT_VALUE_CHANGED\n");
UIFlowMenuCommonConfirm_MessageBox_ValueChanged(obj, (uint32_t*)lv_event_get_data()); UIFlowMenuCommonConfirm_MessageBox_ValueChanged(obj, (uint32_t*)lv_event_get_data());
break; break;
} }

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

@ -661,15 +661,15 @@ static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key)
break; break;
} }
case LV_USER_KEY_SELECT: // case LV_USER_KEY_SELECT:
{ // {
CHKPNT; // CHKPNT;
printf("========================== select.\n"); // printf("========================== select.\n");
LV_MenuItem_OnSelected(obj); // LV_MenuItem_OnSelected(obj);
break; // break;
} // }
case LV_USER_KEY_SHUTTER2: case LV_KEY_ENTER:
{ {
lv_plugin_scr_close(obj, NULL); lv_plugin_scr_close(obj, NULL);
break; break;

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

@ -942,10 +942,10 @@ static void UIFlowMovie_OnKeyMode(lv_obj_t* obj)
} }
static void UIFlowMovie_OnKeyEnter(lv_obj_t* obj) // static void UIFlowMovie_OnKeyEnter(lv_obj_t* obj)
{ // {
} // }
static void UIFlowMovie_OnKeyMenu(lv_obj_t* obj) static void UIFlowMovie_OnKeyMenu(lv_obj_t* obj)
{ {
@ -1196,7 +1196,7 @@ static void UIFlowMovie_Key(lv_obj_t* obj, uint32_t key)
switch(key) switch(key)
{ {
case LV_USER_KEY_SHUTTER2: case LV_KEY_ENTER:
{ {
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
sf_rtsp_stop(); sf_rtsp_stop();
@ -1263,11 +1263,11 @@ static void UIFlowMovie_Key(lv_obj_t* obj, uint32_t key)
break; break;
} }
case LV_KEY_ENTER: // case LV_KEY_ENTER:
{ // {
UIFlowMovie_OnKeyEnter(obj); // UIFlowMovie_OnKeyEnter(obj);
break; // break;
} // }
//#NT#2021/09/10#Philex Lin--end //#NT#2021/09/10#Philex Lin--end
case LV_KEY_DOWN: case LV_KEY_DOWN:

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

@ -1428,7 +1428,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
#endif #endif
switch(key) switch(key)
{ {
case LV_USER_KEY_SHUTTER2: case LV_KEY_ENTER:
{ {
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
sf_rtsp_stop(); sf_rtsp_stop();
@ -1541,7 +1541,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"); break;
UIFlowPhoto_OnKeyMenu(obj); UIFlowPhoto_OnKeyMenu(obj);
break; break;

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

@ -37,7 +37,7 @@ static void task_msgbox_timer_cb(lv_task_t* task)
const lv_plugin_string_t* string = lv_plugin_get_string(msgID); const lv_plugin_string_t* string = lv_plugin_get_string(msgID);
if(string){ if(string){
snprintf(buf, BUF_LENGTH, "%s (%ds)", string->ptr, autoClose/1000); snprintf(buf, BUF_LENGTH, "%s (%ds)\r\n", string->ptr, autoClose/1000);
lv_msgbox_set_text(msgbox, buf); lv_msgbox_set_text(msgbox, buf);
} }
autoClose = autoClose - 1000; autoClose = autoClose - 1000;