From 754d4214e0f42a20807014dcd8d14e21c978ab2e Mon Sep 17 00:00:00 2001 From: zyj Date: Thu, 16 Nov 2023 18:49:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A1=AE=E8=AE=A4=E6=A1=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowMenuCommonConfirm.c | 2 +- .../UIFlowMenuCommonConfirmEventCallback.c | 28 +++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c index f0273674d..9531d8b82 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c @@ -38,7 +38,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ lv_style_set_pad_left(&message_box_1_s0,LV_STATE_DEFAULT,0); lv_style_set_pad_right(&message_box_1_s0,LV_STATE_DEFAULT,0); lv_style_set_pad_inner(&message_box_1_s0,LV_STATE_DEFAULT,0); - STYLE_COLOR_PROP(0x24, 0x6c, 0x6c, 0x6c) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x27, 0x6c, 0x6c, 0x6c) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&message_box_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&message_box_1_s0, LV_STATE_DEFAULT, color); lv_style_set_border_width(&message_box_1_s0,LV_STATE_DEFAULT,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 ec001cb1f..4760d1e4e 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 @@ -4,6 +4,7 @@ #include "UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmAPI.h" #include "UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgAPI.h" #include +#include "kwrap/nvt_type.h" #include "sf_sd_common.h" #include "sf_common.h" @@ -141,7 +142,7 @@ static void init_style(void) STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gStyleLabel1, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gStyleLabel1, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gStyleLabel1, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&gStyleLabel1,LV_STATE_DEFAULT,&sf_ui_text_medium_18_1bpp); + lv_style_set_text_font(&gStyleLabel1,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gStyleLabel1, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gStyleLabel1, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gStyleLabel1, LV_STATE_CHECKED, color); @@ -181,12 +182,13 @@ static void init_style(void) STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gStyleLabel1, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gStyleLabel1, LV_STATE_DISABLED, color); + // lv_obj_align // isinitialized = 1; } - +static lv_obj_t *Confirm_label = NULL; void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID) { @@ -226,6 +228,20 @@ void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID) *******************************************************************/ lv_plugin_msgbox_allocate_ext_attr(msgbox); + if(Confirm_label == NULL) + { + // Confirm_label = lv_label_create(lv_scr_act(), NULL); + Confirm_label = lv_label_create(UIFlowMenuCommonConfirm, NULL); + lv_label_set_long_mode(Confirm_label, LV_LABEL_LONG_BREAK); + lv_label_set_align(Confirm_label, LV_LABEL_ALIGN_CENTER); + lv_label_set_text(Confirm_label, ""); + // lv_obj_set_pos(Confirm_label, 14, 16); + 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); + } + DBG_DUMP("itemID=%u\r\n",itemID); UINT32 strID = 0; @@ -268,26 +284,32 @@ void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID) break; case IDM_DELETE_THIS: strID = LV_PLUGIN_STRING_ID_STRING_CONFIRM_DELETE; + lv_label_set_text(Confirm_label, "Comfirm Delete"); break; case IDM_FORMAT_SD: strID = LV_PLUGIN_STRING_ID_STRING_FORMAT_SD; gBKGEvt = NVTEVT_BKW_FORMAT_CARD; + lv_label_set_text(Confirm_label, "Format SD"); break; case IDM_CAMERA_FW_UPGRADE: strID = LV_PLUGIN_STRING_ID_STRING_CAMERA_FW_UPGRADE; gBKGEvt = NVTEVT_BKW_CAMERA_FW_UPGRADE; + 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_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_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_label_set_text(Confirm_label, "Enter Work Mdoe"); break; default: gBKGEvt = 0; @@ -574,6 +596,8 @@ void message_box_confirm_msg_event_callback(lv_obj_t* obj, lv_event_t event) /* reset pointer of msgbox */ msgbox = NULL; + Confirm_label = NULL; + /* parent is UIFlowMenuCommonConfirm */ lv_plugin_scr_close(lv_obj_get_parent(obj), NULL); break;