From 50233ba4994821162f8fcab0601a589b4eced703 Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Thu, 14 Dec 2023 10:31:53 +0800 Subject: [PATCH] Fixed bug number 10238. --- .../UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr | 8 ++++---- .../UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr | 2 +- .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c | 8 ++++---- .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr index f55aab3c4..9aae795c2 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr @@ -1289,7 +1289,7 @@ "height": 30, "width": 90, "x": 38, - "y": 10 + "y": 5 }, "hidden": false, "locked": false, @@ -1346,7 +1346,7 @@ "height": 40, "width": 38, "x": 0, - "y": 0 + "y": -5 }, "hidden": true, "locked": false, @@ -1886,7 +1886,7 @@ "event callback": "", "font type": "Font_Type0", "geometry": { - "height": 3, + "height": 2, "width": 320, "x": 0, "y": 119 @@ -1906,7 +1906,7 @@ }, "Text": { "text_color": "0xff0000", - "text_font": "montserrat 16 4bpp", + "text_font": "SF-UI-Text-Medium 16 1bpp", "text_opa": 0, "text_sel_bg_color": "0x00b495", "text_sel_color": "0x3c3c3c" 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 7635c021d..4056df4ae 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 @@ -2402,7 +2402,7 @@ "event callback": "", "font type": "Font_Type0", "geometry": { - "height": 3, + "height": 2, "width": 320, "x": 0, "y": 119 diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c index 4b2cc85ec..6420fd164 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c @@ -1285,7 +1285,7 @@ lv_obj_t* UIFlowMovie_create(){ lv_plugin_label_allocate_ext_attr(label_rec_time); lv_plugin_label_set_font_type(label_rec_time, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_label_set_long_mode(label_rec_time, LV_LABEL_LONG_CROP); - lv_obj_set_pos(label_rec_time, 38, 10); + lv_obj_set_pos(label_rec_time, 38, 5); lv_obj_set_size(label_rec_time, 90, 30); lv_obj_add_style(label_rec_time, 0, &label_rec_time_s0); @@ -1333,7 +1333,7 @@ lv_obj_t* UIFlowMovie_create(){ lv_obj_set_hidden(image_rec_ellipse, true); lv_obj_set_click(image_rec_ellipse, false); lv_obj_set_drag(image_rec_ellipse, false); - lv_obj_set_pos(image_rec_ellipse, 0, 0); + lv_obj_set_pos(image_rec_ellipse, 0, -5); lv_obj_set_size(image_rec_ellipse, 38, 40); lv_img_set_src(image_rec_ellipse, &sy_luzhi); lv_obj_add_style(image_rec_ellipse, 0, &image_rec_ellipse_s0); @@ -1840,7 +1840,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_DEFAULT, color); lv_style_set_text_opa(&label_line_s0,LV_STATE_DEFAULT,0); - lv_style_set_text_font(&label_line_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_line_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_CHECKED, color); @@ -1889,7 +1889,7 @@ lv_obj_t* UIFlowMovie_create(){ lv_label_set_align(label_line, LV_LABEL_ALIGN_CENTER); lv_label_set_long_mode(label_line, LV_LABEL_LONG_SROLL); lv_obj_set_pos(label_line, 0, 119); - lv_obj_set_size(label_line, 320, 3); + lv_obj_set_size(label_line, 320, 2); lv_obj_add_style(label_line, 0, &label_line_s0); label_line_scr_uiflowmovie = label_line; 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 2d198a873..c39679d9d 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 @@ -2374,7 +2374,7 @@ lv_obj_t* UIFlowPhoto_create(){ lv_label_set_align(label_line, LV_LABEL_ALIGN_CENTER); lv_label_set_long_mode(label_line, LV_LABEL_LONG_SROLL); lv_obj_set_pos(label_line, 0, 119); - lv_obj_set_size(label_line, 320, 3); + lv_obj_set_size(label_line, 320, 2); lv_obj_add_style(label_line, 0, &label_line_s0); label_line_scr_uiflowphoto = label_line;