From 42874c5574f5abf6b939169a39233084580c648e Mon Sep 17 00:00:00 2001 From: xiaojiazhu <258828110@qq.com> Date: Fri, 20 Oct 2023 11:41:58 +0800 Subject: [PATCH] Improve comfirm screen. --- .../source/cardv/SrcCode/System/SysInput_Exe.c | 6 +++--- .../UIFlowMenuCommonConfirmEventCallback.c | 2 -- .../UIFlowMenuCommonItemEventCallback.c | 16 ++++++++-------- .../UIFlowMovie/UIFlowMovieEventCallback.c | 18 +++++++++--------- .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 4 ++-- .../UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c | 2 +- 6 files changed, 23 insertions(+), 25 deletions(-) diff --git a/code/application/source/cardv/SrcCode/System/SysInput_Exe.c b/code/application/source/cardv/SrcCode/System/SysInput_Exe.c index 6f27831b9..ae6bd6165 100755 --- a/code/application/source/cardv/SrcCode/System/SysInput_Exe.c +++ b/code/application/source/cardv/SrcCode/System/SysInput_Exe.c @@ -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_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_CONTINUE, NVTEVT_KEY_SHUTTER2, NVTEVT_KEY_CONTINUE, 0}, - {FLGKEY_SHUTTER2, KEY_RELEASE, NVTEVT_KEY_SHUTTER2, NVTEVT_KEY_RELEASE, 0}, + {FLGKEY_SHUTTER2, KEY_PRESS, NVTEVT_KEY_SELECT, NVTEVT_KEY_PRESS, DEMOSOUND_SOUND_KEY_TONE}, + {FLGKEY_SHUTTER2, KEY_CONTINUE, NVTEVT_KEY_SELECT, NVTEVT_KEY_CONTINUE, 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_CONTINUE, NVTEVT_KEY_SELECT, NVTEVT_KEY_CONTINUE, 0}, // {FLGKEY_RIGHT, KEY_RELEASE, NVTEVT_KEY_SELECT, NVTEVT_KEY_RELEASE, 0}, diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c index 96c4439c2..49a42f213 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c @@ -238,7 +238,6 @@ static void UIFlowMenuCommonConfirm_MessageBox_ValueChanged(lv_obj_t* obj, uint3 { if(NULL == value) return; -printf("============== value = %d\n", *value); if (*value == 0) { 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_CLICKED: { - printf("=============================================================== LV_EVENT_VALUE_CHANGED\n"); UIFlowMenuCommonConfirm_MessageBox_ValueChanged(obj, (uint32_t*)lv_event_get_data()); break; } 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 4181c4c85..a89141b79 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 @@ -661,15 +661,15 @@ static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key) break; } - case LV_USER_KEY_SELECT: - { - CHKPNT; - printf("========================== select.\n"); - LV_MenuItem_OnSelected(obj); - break; - } + // case LV_USER_KEY_SELECT: + // { + // CHKPNT; + // printf("========================== select.\n"); + // LV_MenuItem_OnSelected(obj); + // break; + // } - case LV_USER_KEY_SHUTTER2: + case LV_KEY_ENTER: { lv_plugin_scr_close(obj, NULL); break; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c index 5145ac0ea..9a428d7a7 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c @@ -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) { @@ -1196,7 +1196,7 @@ static void UIFlowMovie_Key(lv_obj_t* obj, uint32_t key) switch(key) { - case LV_USER_KEY_SHUTTER2: + case LV_KEY_ENTER: { #if HUNTING_CAMERA_MCU == ENABLE sf_rtsp_stop(); @@ -1263,11 +1263,11 @@ static void UIFlowMovie_Key(lv_obj_t* obj, uint32_t key) break; } - case LV_KEY_ENTER: - { - UIFlowMovie_OnKeyEnter(obj); - break; - } + // case LV_KEY_ENTER: + // { + // UIFlowMovie_OnKeyEnter(obj); + // break; + // } //#NT#2021/09/10#Philex Lin--end case LV_KEY_DOWN: diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c index 334eb503a..3500afe1b 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c @@ -1428,7 +1428,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key) #endif switch(key) { - case LV_USER_KEY_SHUTTER2: + case LV_KEY_ENTER: { #if HUNTING_CAMERA_MCU == ENABLE sf_rtsp_stop(); @@ -1541,7 +1541,7 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event) break; case LV_EVENT_CLICKED: - printf(" ============================== photo press right, rec LV_EVENT_CLICKED.\n"); + break; UIFlowPhoto_OnKeyMenu(obj); break; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c index 969024be6..7d5834ee1 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c @@ -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); 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); } autoClose = autoClose - 1000;