From ded81acf68f554417c306cc5e2fcf294fe3846f3 Mon Sep 17 00:00:00 2001 From: xiaojiazhu <258828110@qq.com> Date: Wed, 11 Oct 2023 11:41:40 +0800 Subject: [PATCH] Confirm screen. --- ...UIFlowLVGL.UIFlowMenuCommonConfirm.lvglscr | 12 +++--- .../UIFlowLVGL.UIFlowPhoto.lvglscr | 1 - .../UIFlowMenuCommonConfirm.c | 38 +++++++++---------- .../UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c | 4 +- .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 2 + 5 files changed, 29 insertions(+), 28 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonConfirm.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonConfirm.lvglscr index fa62562f8..af6aea20c 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonConfirm.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonConfirm.lvglscr @@ -7,7 +7,7 @@ "add buttons": [ ], "animation time": 500, - "button's text": "AAAAAA,BBBBBB,", + "button's text": "Yes,No,", "class": "lv_msgbox", "click": true, "content": "All data will be deleted", @@ -30,7 +30,7 @@ "styles": [ { "Background": { - "bg_color": "0x1f489a" + "bg_color": "0x5e5e5e" }, "Border": { "border_color": "0xdddddd", @@ -46,8 +46,8 @@ "Text": { "text_color": "0xffffff", "text_font": "montserrat 16 4bpp", - "text_sel_bg_color": "0x00b495", - "text_sel_color": "0x3c3c3c" + "text_sel_bg_color": "0x5e5e5e", + "text_sel_color": "0xffffff" }, "part": 0, "state": 0 @@ -482,8 +482,8 @@ "geometry": { "height": 136, "width": 210, - "x": 60, - "y": 51 + "x": -246, + "y": 48 }, "hidden": false, "locked": false, diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr index 9b7839f5c..2cfd9cd77 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr @@ -1175,7 +1175,6 @@ }, "Text": { "text_color": "0x31404f", - "text_font": "montserrat 16 4bpp", "text_sel_bg_color": "0x00b495", "text_sel_color": "0x3c3c3c" }, 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 676d4093c..65be1b8e7 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 @@ -33,7 +33,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ static lv_style_t message_box_1_s0; lv_style_init(&message_box_1_s0); lv_style_set_radius(&message_box_1_s0,LV_STATE_DEFAULT,10); - STYLE_COLOR_PROP(0xcd, 0x1f, 0x48, 0x9a) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; 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); @@ -43,56 +43,56 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ lv_style_set_shadow_width(&message_box_1_s0,LV_STATE_DEFAULT,0); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_DEFAULT, color); lv_style_set_text_font(&message_box_1_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xcc, 0x02, 0x62, 0xb6) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xcd, 0x1f, 0x48, 0x9a) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xcc, 0x02, 0x62, 0xb6) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xcc, 0x02, 0x62, 0xb6) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xcd, 0x1f, 0x48, 0x9a) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xcc, 0x02, 0x62, 0xb6) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_DISABLED, color); static lv_style_t message_box_1_s1; lv_style_init(&message_box_1_s1); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&message_box_1_s1, LV_STATE_DEFAULT, color); @@ -207,7 +207,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ lv_obj_set_drag(message_box_1, false); lv_obj_set_pos(message_box_1, 21, 63); lv_obj_set_size(message_box_1, 279, 116); - static const char* message_box_1_LVGLPropertyMsgBoxBtnmatrixButtonsText[] = {"AAAAAA","BBBBBB","",""}; + static const char* message_box_1_LVGLPropertyMsgBoxBtnmatrixButtonsText[] = {"Yes","No","",""}; lv_msgbox_add_btns(message_box_1, message_box_1_LVGLPropertyMsgBoxBtnmatrixButtonsText); lv_plugin_msgbox_allocate_ext_attr(message_box_1); lv_plugin_msgbox_set_text(message_box_1, LV_PLUGIN_STRING_ID_STRID_DELETE_WARNING); @@ -266,7 +266,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ lv_obj_set_hidden(warning_bg, false); lv_obj_set_click(warning_bg, false); lv_obj_set_drag(warning_bg, false); - lv_obj_set_pos(warning_bg, 60, 51); + lv_obj_set_pos(warning_bg, -246, 48); lv_obj_set_size(warning_bg, 210, 136); lv_img_set_src(warning_bg, &sf_warning_bg); lv_obj_add_style(warning_bg, 0, &warning_bg_s0); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c index 215c2619f..a0bdaca73 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c @@ -1096,7 +1096,6 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_2_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_2_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_FOCUSED, color); @@ -1115,6 +1114,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_2_s0, LV_STATE_HOVERED, color); + lv_style_set_text_font(&label_2_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_PRESSED, color); @@ -1228,7 +1228,6 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_3_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_3_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_FOCUSED, color); @@ -1247,6 +1246,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_HOVERED, color); + lv_style_set_text_font(&label_3_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_PRESSED, color); 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 44721c6ee..d4f5a5952 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 @@ -2,6 +2,7 @@ #include "PrjInc.h" #include "UIFlowLVGL/UIFlowLVGL.h" #include "UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgAPI.h" +#include "UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmAPI.h" #include "UIFlowPhotoParams.h" #include "UIFlowPhotoFuncs.h" #include "ImageApp/ImageApp_Photo.h" @@ -962,6 +963,7 @@ static void UIFlowPhoto_ScrOpen(lv_obj_t* obj) /* never closed */ gPhotoData.State = PHOTO_ST_WARNING_MENU; UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, 1000); + // UIFlowMenuCommonConfirmAPI_Open(IDM_FORMAT); // return; #endif }