diff --git a/build_all.sh b/build_all.sh index 1b9785abd..021b279f6 100755 --- a/build_all.sh +++ b/build_all.sh @@ -1,7 +1,7 @@ #!/bin/bash #用于gitlab-ci.yml编译使用 -#make app_clean +make app_clean echo "Start compile." export ROOT_PATH=$PWD @@ -9,7 +9,7 @@ export ROOT_PATH=$PWD cd rtos source build/envsetup.sh lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf -#make clean +make clean bear make all > /dev/null cp output/application.bin ../ cp output/rtos-main.bin ../ @@ -18,7 +18,7 @@ cp output/rtos-main.bin ../ cd $ROOT_PATH source build/envsetup.sh lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01 -#make clean +make clean bear make all > /dev/null cd $ROOT_PATH diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM.rar b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM.rar index 6f5e28468..129997024 100644 Binary files a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM.rar and b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM.rar differ 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 6c4df447c..d54d32266 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 @@ -2517,7 +2517,7 @@ "click": false, "drag": false, "event callback": "", - "font type": "Font_Type0", + "font type": "Font_Type4", "geometry": { "height": 24, "width": 320, @@ -2534,7 +2534,7 @@ { "Text": { "text_color": "0xffffff", - "text_font": "SF-UI-Text-Medium 16 1bpp", + "text_font": "ARIALUNI 16 1bpp", "text_sel_bg_color": "0x00b495", "text_sel_color": "0x3c3c3c" }, 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 46c9edb51..8e08f9180 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 @@ -2425,7 +2425,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_sim_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_sim_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_sim_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_sim_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); + lv_style_set_text_font(&label_sim_s0,LV_STATE_DEFAULT,&arialuni_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_sim_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_sim_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_sim_s0, LV_STATE_CHECKED, color); @@ -2471,7 +2471,7 @@ lv_obj_t* UIFlowPhoto_create(){ lv_plugin_label_allocate_ext_attr(label_sim); lv_label_set_text(label_sim,"Searching..."); lv_plugin_label_allocate_ext_attr(label_sim); - lv_plugin_label_set_font_type(label_sim, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); + lv_plugin_label_set_font_type(label_sim, LV_PLUGIN_LANGUAGE_FONT_TYPE_4); lv_label_set_align(label_sim, LV_LABEL_ALIGN_CENTER); lv_label_set_long_mode(label_sim, LV_LABEL_LONG_SROLL); lv_obj_set_pos(label_sim, 0, 98);