From 623849d347d6e065d17d22f72118c585139272d9 Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Fri, 19 Jan 2024 22:38:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E5=9B=BE=E6=A1=88=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c | 2 +- .../UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 02db893bb..7f5fa098f 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 @@ -953,7 +953,7 @@ static void update_Password_msg(lv_obj_t* obj) lv_btnmatrix_set_focused_btn(PasswordMatrixObj, PasswordIndex); - lv_obj_set_x(PasswordImage, (64 + 32 * PasswordIndex)); + lv_obj_set_x(PasswordImage, (63 + 32 * PasswordIndex)); } void show_Password_page(lv_obj_t* obj) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c index 83c1617fd..3b3f0de5f 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c @@ -216,7 +216,7 @@ static void update_Password_msg(lv_obj_t* obj) lv_btnmatrix_set_focused_btn(SendTimeMatrixObj_0, PasswordIndex); lv_btnmatrix_set_map(SendTimeMatrixObj_0, PasswordMap); int offset = 0; - lv_obj_set_x(SelectedImage, (69 + 32 * PasswordIndex + offset)); + lv_obj_set_x(SelectedImage, (68 + 32 * PasswordIndex + offset)); } static void UIFlowPassword_Key(lv_obj_t* obj, uint32_t key) { From 1577f6c9bde0ce1c026293faf534d9d3018414d1 Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Fri, 19 Jan 2024 23:06:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=AE=AD=E5=A4=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e2701afeb..09f56080e 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 @@ -351,7 +351,7 @@ void show_MaxNum_page(lv_obj_t* obj) lv_obj_set_drag(SelectedImage, false); lv_obj_set_size(SelectedImage, 32, 88); lv_img_set_src(SelectedImage, &sf_pwd_down_up); - lv_obj_set_pos(SelectedImage, 145, 62); + lv_obj_set_pos(SelectedImage, 144, 62); } void hidde_MaxNum_page(void) From 90b2fd00141778728f8db4dc31a7b1e1d2d57b10 Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Sat, 20 Jan 2024 00:14:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=A1=86=E6=96=87?= =?UTF-8?q?=E5=AD=97=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowMenuCommonConfirmEventCallback.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 a5e3a50ef..4bda4ad3f 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 @@ -251,7 +251,7 @@ void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID) lv_obj_set_width(Confirm_label, 190); // lv_obj_set_size(Confirm_label, 182, 80); lv_obj_add_style(Confirm_label, 0, &gStyleLabel1); - lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -48); + lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20); } DBG_DUMP("itemID=%u\r\n",itemID); @@ -296,37 +296,44 @@ void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID) break; case IDM_DELETE_THIS: strID = LV_PLUGIN_STRING_ID_STRING_CONFIRM_DELETE; + lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20); lv_label_set_text(Confirm_label, "Comfirm Delete"); gBKGEvt = NVTEVT_BKW_DELALL; break; case IDM_FORMAT_SD: strID = LV_PLUGIN_STRING_ID_STRING_FORMAT_SD; gBKGEvt = NVTEVT_BKW_FORMAT_CARD; + lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20); lv_label_set_text(Confirm_label, "Format SD"); break; case IDM_FORMAT_EMMC: strID = LV_PLUGIN_STRING_ID_STRING_FORMAT_SD; gBKGEvt = NVTEVT_BKW_FORMAT_EMMC; + lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20); lv_label_set_text(Confirm_label, "Format EMMC"); break; case IDM_CAMERA_FW_UPGRADE: strID = LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE; gBKGEvt = NVTEVT_BKW_CAMERA_FW_UPGRADE; + lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20); lv_label_set_text(Confirm_label, "Camera FW Upgrade"); break; case IDM_MODULE_FW_UPGRADE: strID = LV_PLUGIN_STRING_ID_STRING_MODE_FW_UPGRADE; gBKGEvt = NVTEVT_BKW_MODULE_FW_UPGRADE; + lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20); lv_label_set_text(Confirm_label, "Camera FW Upgrade"); break; case IDM_RESET: strID = LV_PLUGIN_STRING_ID_STRING_RESET_WARNING; gBKGEvt = NVTEVT_BKW_RESET; + lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -46); lv_label_set_text(Confirm_label, "Reset the Camera?\n\nCamera will restart after reset is complete"); break; case IDM_ENTER_WORK_MODE: strID = LV_PLUGIN_STRING_ID_STRING_ENTER_WORK_MODE; gBKGEvt = NVTEVT_BKW_ENTER_WORK_MODE; + lv_obj_align(Confirm_label, UIFlowMenuCommonConfirm, LV_ALIGN_CENTER, 0, -20); lv_label_set_text(Confirm_label, "Enter Work Mode"); break; default: