From 9c13bba056913ef05b05ea593622e7cd3fd8320f Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Thu, 30 Nov 2023 17:44:01 +0800 Subject: [PATCH] Improve connected tips. --- .../UIFlowLVGL.UIFlowPhoto.lvglscr | 64 +++++++++++++++++- .../UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp | 12 ---- .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c | 1 - .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h | 26 ++++---- .../UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c | 66 ++++++++++++++++++- .../UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.h | 1 + .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 7 ++ 7 files changed, 145 insertions(+), 32 deletions(-) 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 395cc997e..970448b2b 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 @@ -1014,7 +1014,7 @@ "widget": "Image" }, { - "align": "Center", + "align": "Right", "class": "lv_label", "click": false, "drag": false, @@ -1023,8 +1023,8 @@ "geometry": { "height": 40, "width": 120, - "x": 88, - "y": 0 + "x": 140, + "y": 10 }, "hidden": true, "locked": false, @@ -1073,6 +1073,64 @@ ], "text": "", "widget": "Label" + }, + { + "align": "Left", + "class": "lv_label", + "click": false, + "drag": false, + "event callback": "", + "font type": "Font_Type0", + "geometry": { + "height": 40, + "width": 140, + "x": 88, + "y": 10 + }, + "hidden": true, + "locked": false, + "long mode": "Roll", + "name": "label_tips2", + "recolor": false, + "string id": "None", + "styles": [ + { + "Text": { + "text_color": "0x42af29", + "text_font": "SF-UI-Text-Medium 16 1bpp", + "text_sel_bg_color": "0x00b495", + "text_sel_color": "0x3c3c3c" + }, + "part": 0, + "state": 0 + }, + { + "part": 0, + "state": 1 + }, + { + "part": 0, + "state": 2 + }, + { + "part": 0, + "state": 3 + }, + { + "part": 0, + "state": 4 + }, + { + "part": 0, + "state": 5 + }, + { + "part": 0, + "state": 6 + } + ], + "text": "Connected to APP", + "widget": "Label" } ], "class": "lv_cont", diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp index 036ebe5e1..e2d913051 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp @@ -2349,18 +2349,6 @@ "Ascii" ] }, - { - "bpp": 1, - "compressed": false, - "custom code range": "", - "file path": "fonts/ARIALUNI.TTF", - "include language table": true, - "name": "ARIALUNI", - "size": 32, - "unicode range names": [ - "Ascii" - ] - }, { "bpp": 1, "compressed": false, diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c index 8cf2e1997..73c6b215e 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c @@ -539,7 +539,6 @@ lv_plugin_font_t lv_plugin_UIFlowLVGL_font_table[] = { ¬osanscjksc_black_16_1bpp }, { &arialuni_16_1bpp }, { &arialuni_18_1bpp }, - { &arialuni_32_1bpp }, { &arialuni_48_1bpp }, { &arialuni_60_1bpp }, { &arialuni_86_1bpp }, diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h index a5b64ae3d..327c08058 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h @@ -58,7 +58,6 @@ extern lv_obj_t *UIFlowClose; LV_FONT_DECLARE(notosanscjksc_black_16_1bpp); LV_FONT_DECLARE(arialuni_16_1bpp); LV_FONT_DECLARE(arialuni_18_1bpp); -LV_FONT_DECLARE(arialuni_32_1bpp); LV_FONT_DECLARE(arialuni_48_1bpp); LV_FONT_DECLARE(arialuni_60_1bpp); LV_FONT_DECLARE(arialuni_86_1bpp); @@ -1073,19 +1072,18 @@ LV_IMG_DECLARE(work_mode); #define LV_PLUGIN_FONT_ID_NOTOSANSCJKSC_BLACK_16_1BPP 2 #define LV_PLUGIN_FONT_ID_ARIALUNI_16_1BPP 3 #define LV_PLUGIN_FONT_ID_ARIALUNI_18_1BPP 4 -#define LV_PLUGIN_FONT_ID_ARIALUNI_32_1BPP 5 -#define LV_PLUGIN_FONT_ID_ARIALUNI_48_1BPP 6 -#define LV_PLUGIN_FONT_ID_ARIALUNI_60_1BPP 7 -#define LV_PLUGIN_FONT_ID_ARIALUNI_86_1BPP 8 -#define LV_PLUGIN_FONT_ID_ARIALUNI_106_1BPP 9 -#define LV_PLUGIN_FONT_ID_ARIALUNI_74_1BPP 10 -#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_1BPP 11 -#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_1BPP 12 -#define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP 13 -#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_16_1BPP 14 -#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_20_1BPP 15 -#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_18_1BPP 16 -#define LV_PLUGIN_FONT_TABLE_SIZE 17 +#define LV_PLUGIN_FONT_ID_ARIALUNI_48_1BPP 5 +#define LV_PLUGIN_FONT_ID_ARIALUNI_60_1BPP 6 +#define LV_PLUGIN_FONT_ID_ARIALUNI_86_1BPP 7 +#define LV_PLUGIN_FONT_ID_ARIALUNI_106_1BPP 8 +#define LV_PLUGIN_FONT_ID_ARIALUNI_74_1BPP 9 +#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_1BPP 10 +#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_1BPP 11 +#define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP 12 +#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_16_1BPP 13 +#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_20_1BPP 14 +#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_18_1BPP 15 +#define LV_PLUGIN_FONT_TABLE_SIZE 16 #define LV_PLUGIN_STRING_ID_STRID_NULL_ 1 #define LV_PLUGIN_STRING_ID_STRID_MODE 2 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 de509e17a..2d9006430 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 @@ -29,6 +29,7 @@ lv_obj_t* label_5_scr_uiflowphoto; lv_obj_t* image_7_scr_uiflowphoto; lv_obj_t* label_6_scr_uiflowphoto; lv_obj_t* label_tips_scr_uiflowphoto; +lv_obj_t* label_tips2_scr_uiflowphoto; lv_obj_t* image_iso_scr_uiflowphoto; lv_obj_t* image_ev_scr_uiflowphoto; lv_obj_t* image_wb_scr_uiflowphoto; @@ -1073,15 +1074,76 @@ lv_obj_t* UIFlowPhoto_create(){ lv_plugin_label_allocate_ext_attr(label_tips); lv_plugin_label_allocate_ext_attr(label_tips); lv_plugin_label_set_font_type(label_tips, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); - lv_label_set_align(label_tips, LV_LABEL_ALIGN_CENTER); + lv_label_set_align(label_tips, LV_LABEL_ALIGN_RIGHT); lv_label_set_long_mode(label_tips, LV_LABEL_LONG_SROLL); - lv_obj_set_pos(label_tips, 88, 0); + lv_obj_set_pos(label_tips, 140, 10); lv_obj_set_size(label_tips, 120, 40); lv_obj_add_style(label_tips, 0, &label_tips_s0); label_tips_scr_uiflowphoto = label_tips; + static lv_style_t label_tips2_s0; + lv_style_init(&label_tips2_s0); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips2_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips2_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips2_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xc7, 0x42, 0xaf, 0x29) ; lv_style_set_text_color(&label_tips2_s0, LV_STATE_DEFAULT, color); + lv_style_set_text_font(&label_tips2_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips2_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips2_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips2_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips2_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips2_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xc7, 0x42, 0xaf, 0x29) ; lv_style_set_text_color(&label_tips2_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips2_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips2_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips2_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips2_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips2_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xc7, 0x42, 0xaf, 0x29) ; lv_style_set_text_color(&label_tips2_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips2_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips2_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips2_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips2_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips2_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xc7, 0x42, 0xaf, 0x29) ; lv_style_set_text_color(&label_tips2_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips2_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips2_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips2_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips2_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips2_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xc7, 0x42, 0xaf, 0x29) ; lv_style_set_text_color(&label_tips2_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips2_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips2_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips2_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips2_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips2_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xc7, 0x42, 0xaf, 0x29) ; lv_style_set_text_color(&label_tips2_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips2_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips2_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips2_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips2_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips2_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xc7, 0x42, 0xaf, 0x29) ; lv_style_set_text_color(&label_tips2_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips2_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips2_s0, LV_STATE_DISABLED, color); + lv_obj_t *label_tips2 = lv_label_create(container_photo, NULL); + lv_obj_set_hidden(label_tips2, true); + lv_obj_set_click(label_tips2, false); + lv_obj_set_drag(label_tips2, false); + lv_plugin_label_allocate_ext_attr(label_tips2); + lv_label_set_text(label_tips2,"Connected to APP"); + lv_plugin_label_allocate_ext_attr(label_tips2); + lv_plugin_label_set_font_type(label_tips2, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); + lv_label_set_long_mode(label_tips2, LV_LABEL_LONG_SROLL); + lv_obj_set_pos(label_tips2, 88, 10); + lv_obj_set_size(label_tips2, 140, 40); + lv_obj_add_style(label_tips2, 0, &label_tips2_s0); + + label_tips2_scr_uiflowphoto = label_tips2; + + static lv_style_t image_iso_s0; lv_style_init(&image_iso_s0); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_iso_s0, LV_STATE_DEFAULT, color); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.h index 14bf8d5e4..810da22e0 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.h @@ -37,6 +37,7 @@ extern lv_obj_t* label_5_scr_uiflowphoto; extern lv_obj_t* image_7_scr_uiflowphoto; extern lv_obj_t* label_6_scr_uiflowphoto; extern lv_obj_t* label_tips_scr_uiflowphoto; +extern lv_obj_t* label_tips2_scr_uiflowphoto; extern lv_obj_t* image_iso_scr_uiflowphoto; extern lv_obj_t* image_ev_scr_uiflowphoto; extern lv_obj_t* image_wb_scr_uiflowphoto; 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 3d9fa8d8e..1f70b55f2 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 @@ -742,6 +742,13 @@ static void update_wifi(void) int index = status; lv_obj_set_hidden(image_wifi_connected_scr_uiflowphoto, false); lv_plugin_img_set_src(image_wifi_connected_scr_uiflowphoto, res[index]); + SF_BLE_STATUS_E status2 = sf_get_ble_status(); + if (SF_WIFI_CON == status || SF_BLE_CON == status2) + { + lv_obj_set_hidden(label_tips2_scr_uiflowphoto, false); + } else { + lv_obj_set_hidden(label_tips2_scr_uiflowphoto, true); + } // lv_obj_t *scr = lv_plugin_scr_act(); // #define MENU_UNLUCK 0 // if (scr != UIFlowPhoto && SF_WIFI_CON == status && MENU_UNLUCK == is_menu_screen_luck())