Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc

This commit is contained in:
payton 2024-01-18 16:33:40 +08:00
commit 1128c2771a
4 changed files with 7 additions and 7 deletions

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
#用于gitlab-ci.yml编译使用 #用于gitlab-ci.yml编译使用
#make app_clean make app_clean
echo "Start compile." echo "Start compile."
export ROOT_PATH=$PWD export ROOT_PATH=$PWD
@ -9,7 +9,7 @@ export ROOT_PATH=$PWD
cd rtos cd rtos
source build/envsetup.sh source build/envsetup.sh
lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf 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 bear make all > /dev/null
cp output/application.bin ../ cp output/application.bin ../
cp output/rtos-main.bin ../ cp output/rtos-main.bin ../
@ -18,7 +18,7 @@ cp output/rtos-main.bin ../
cd $ROOT_PATH cd $ROOT_PATH
source build/envsetup.sh source build/envsetup.sh
lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01 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 bear make all > /dev/null
cd $ROOT_PATH cd $ROOT_PATH

View File

@ -2517,7 +2517,7 @@
"click": false, "click": false,
"drag": false, "drag": false,
"event callback": "", "event callback": "",
"font type": "Font_Type0", "font type": "Font_Type4",
"geometry": { "geometry": {
"height": 24, "height": 24,
"width": 320, "width": 320,
@ -2534,7 +2534,7 @@
{ {
"Text": { "Text": {
"text_color": "0xffffff", "text_color": "0xffffff",
"text_font": "SF-UI-Text-Medium 16 1bpp", "text_font": "ARIALUNI 16 1bpp",
"text_sel_bg_color": "0x00b495", "text_sel_bg_color": "0x00b495",
"text_sel_color": "0x3c3c3c" "text_sel_color": "0x3c3c3c"
}, },

View File

@ -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(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(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); 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(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(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); 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_plugin_label_allocate_ext_attr(label_sim);
lv_label_set_text(label_sim,"Searching..."); lv_label_set_text(label_sim,"Searching...");
lv_plugin_label_allocate_ext_attr(label_sim); 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_align(label_sim, LV_LABEL_ALIGN_CENTER);
lv_label_set_long_mode(label_sim, LV_LABEL_LONG_SROLL); lv_label_set_long_mode(label_sim, LV_LABEL_LONG_SROLL);
lv_obj_set_pos(label_sim, 0, 98); lv_obj_set_pos(label_sim, 0, 98);