修改ui弹窗颜色, 搜索字体大小
This commit is contained in:
parent
f85b8ebec1
commit
65dd411119
|
@ -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
|
||||
|
|
Binary file not shown.
|
@ -125,7 +125,7 @@
|
|||
"height": 40,
|
||||
"width": 48,
|
||||
"x": 216,
|
||||
"y": 0
|
||||
"y": -2
|
||||
},
|
||||
"hidden": true,
|
||||
"locked": false,
|
||||
|
@ -235,7 +235,7 @@
|
|||
"height": 40,
|
||||
"width": 48,
|
||||
"x": 216,
|
||||
"y": 0
|
||||
"y": -2
|
||||
},
|
||||
"hidden": true,
|
||||
"locked": false,
|
||||
|
@ -290,7 +290,7 @@
|
|||
"height": 40,
|
||||
"width": 48,
|
||||
"x": 216,
|
||||
"y": 0
|
||||
"y": -2
|
||||
},
|
||||
"hidden": true,
|
||||
"locked": false,
|
||||
|
@ -345,7 +345,7 @@
|
|||
"height": 40,
|
||||
"width": 48,
|
||||
"x": 216,
|
||||
"y": 0
|
||||
"y": -2
|
||||
},
|
||||
"hidden": true,
|
||||
"locked": false,
|
||||
|
@ -400,7 +400,7 @@
|
|||
"height": 40,
|
||||
"width": 48,
|
||||
"x": 216,
|
||||
"y": 0
|
||||
"y": -2
|
||||
},
|
||||
"hidden": true,
|
||||
"locked": false,
|
||||
|
@ -2517,12 +2517,12 @@
|
|||
"click": false,
|
||||
"drag": false,
|
||||
"event callback": "",
|
||||
"font type": "Font_Type4",
|
||||
"font type": "Font_Type1",
|
||||
"geometry": {
|
||||
"height": 24,
|
||||
"width": 320,
|
||||
"x": 0,
|
||||
"y": 98
|
||||
"y": 95
|
||||
},
|
||||
"hidden": false,
|
||||
"locked": false,
|
||||
|
@ -2534,7 +2534,7 @@
|
|||
{
|
||||
"Text": {
|
||||
"text_color": "0xffffff",
|
||||
"text_font": "ARIALUNI 16 1bpp",
|
||||
"text_font": "SF-UI-Text-Medium 18 1bpp",
|
||||
"text_sel_bg_color": "0x00b495",
|
||||
"text_sel_color": "0x3c3c3c"
|
||||
},
|
||||
|
|
|
@ -188,14 +188,14 @@
|
|||
"styles": [
|
||||
{
|
||||
"Background": {
|
||||
"bg_color": "0x3c3c3c"
|
||||
"bg_color": "0x6c6c6c"
|
||||
},
|
||||
"Border": {
|
||||
"border_color": "0x551f57",
|
||||
"border_width": 0
|
||||
},
|
||||
"Mix": {
|
||||
"radius": 12
|
||||
"radius": 6
|
||||
},
|
||||
"Outline": {
|
||||
"outline_color": "0x551f57"
|
||||
|
|
|
@ -245,7 +245,7 @@ lv_obj_t* UIFlowPhoto_create(){
|
|||
lv_obj_set_hidden(image_signal_4, true);
|
||||
lv_obj_set_click(image_signal_4, false);
|
||||
lv_obj_set_drag(image_signal_4, false);
|
||||
lv_obj_set_pos(image_signal_4, 216, 0);
|
||||
lv_obj_set_pos(image_signal_4, 216, -2);
|
||||
lv_obj_set_size(image_signal_4, 48, 40);
|
||||
lv_img_set_src(image_signal_4, &sf_signal4);
|
||||
lv_obj_add_style(image_signal_4, 0, &image_signal_4_s0);
|
||||
|
@ -343,7 +343,7 @@ lv_obj_t* UIFlowPhoto_create(){
|
|||
lv_obj_set_hidden(image_signal_0, true);
|
||||
lv_obj_set_click(image_signal_0, false);
|
||||
lv_obj_set_drag(image_signal_0, false);
|
||||
lv_obj_set_pos(image_signal_0, 216, 0);
|
||||
lv_obj_set_pos(image_signal_0, 216, -2);
|
||||
lv_obj_set_size(image_signal_0, 48, 40);
|
||||
lv_img_set_src(image_signal_0, &sf_signal0);
|
||||
lv_obj_add_style(image_signal_0, 0, &image_signal_0_s0);
|
||||
|
@ -392,7 +392,7 @@ lv_obj_t* UIFlowPhoto_create(){
|
|||
lv_obj_set_hidden(image_signal_1, true);
|
||||
lv_obj_set_click(image_signal_1, false);
|
||||
lv_obj_set_drag(image_signal_1, false);
|
||||
lv_obj_set_pos(image_signal_1, 216, 0);
|
||||
lv_obj_set_pos(image_signal_1, 216, -2);
|
||||
lv_obj_set_size(image_signal_1, 48, 40);
|
||||
lv_img_set_src(image_signal_1, &sf_signal1);
|
||||
lv_obj_add_style(image_signal_1, 0, &image_signal_1_s0);
|
||||
|
@ -441,7 +441,7 @@ lv_obj_t* UIFlowPhoto_create(){
|
|||
lv_obj_set_hidden(image_signal_2, true);
|
||||
lv_obj_set_click(image_signal_2, false);
|
||||
lv_obj_set_drag(image_signal_2, false);
|
||||
lv_obj_set_pos(image_signal_2, 216, 0);
|
||||
lv_obj_set_pos(image_signal_2, 216, -2);
|
||||
lv_obj_set_size(image_signal_2, 48, 40);
|
||||
lv_img_set_src(image_signal_2, &sf_signal2);
|
||||
lv_obj_add_style(image_signal_2, 0, &image_signal_2_s0);
|
||||
|
@ -490,7 +490,7 @@ lv_obj_t* UIFlowPhoto_create(){
|
|||
lv_obj_set_hidden(image_signal_3, true);
|
||||
lv_obj_set_click(image_signal_3, false);
|
||||
lv_obj_set_drag(image_signal_3, false);
|
||||
lv_obj_set_pos(image_signal_3, 216, 0);
|
||||
lv_obj_set_pos(image_signal_3, 216, -2);
|
||||
lv_obj_set_size(image_signal_3, 48, 40);
|
||||
lv_img_set_src(image_signal_3, &sf_signal3);
|
||||
lv_obj_add_style(image_signal_3, 0, &image_signal_3_s0);
|
||||
|
@ -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,&arialuni_16_1bpp);
|
||||
lv_style_set_text_font(&label_sim_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_18_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,10 +2471,10 @@ 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_4);
|
||||
lv_plugin_label_set_font_type(label_sim, LV_PLUGIN_LANGUAGE_FONT_TYPE_1);
|
||||
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);
|
||||
lv_obj_set_pos(label_sim, 0, 95);
|
||||
lv_obj_set_size(label_sim, 320, 24);
|
||||
lv_obj_add_style(label_sim, 0, &label_sim_s0);
|
||||
|
||||
|
|
|
@ -116,8 +116,8 @@ lv_obj_t* UIFlowWrnMsg_create(){
|
|||
|
||||
static lv_style_t button_msg_bg_s0;
|
||||
lv_style_init(&button_msg_bg_s0);
|
||||
lv_style_set_radius(&button_msg_bg_s0,LV_STATE_DEFAULT,12);
|
||||
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_DEFAULT, color);
|
||||
lv_style_set_radius(&button_msg_bg_s0,LV_STATE_DEFAULT,6);
|
||||
STYLE_COLOR_PROP(0x24, 0x6c, 0x6c, 0x6c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_DEFAULT, color);
|
||||
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_msg_bg_s0, LV_STATE_DEFAULT, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_border_color(&button_msg_bg_s0, LV_STATE_DEFAULT, color);
|
||||
lv_style_set_border_width(&button_msg_bg_s0,LV_STATE_DEFAULT,0);
|
||||
|
@ -126,42 +126,42 @@ lv_obj_t* UIFlowWrnMsg_create(){
|
|||
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_msg_bg_s0, LV_STATE_DEFAULT, color);
|
||||
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_msg_bg_s0, LV_STATE_DEFAULT, color);
|
||||
lv_style_set_value_font(&button_msg_bg_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16);
|
||||
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_CHECKED, color);
|
||||
STYLE_COLOR_PROP(0x24, 0x6c, 0x6c, 0x6c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_CHECKED, color);
|
||||
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_msg_bg_s0, LV_STATE_CHECKED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_border_color(&button_msg_bg_s0, LV_STATE_CHECKED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_outline_color(&button_msg_bg_s0, LV_STATE_CHECKED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_shadow_color(&button_msg_bg_s0, LV_STATE_CHECKED, color);
|
||||
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_msg_bg_s0, LV_STATE_CHECKED, color);
|
||||
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_msg_bg_s0, LV_STATE_CHECKED, color);
|
||||
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_FOCUSED, color);
|
||||
STYLE_COLOR_PROP(0x24, 0x6c, 0x6c, 0x6c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_FOCUSED, color);
|
||||
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_msg_bg_s0, LV_STATE_FOCUSED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_border_color(&button_msg_bg_s0, LV_STATE_FOCUSED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_outline_color(&button_msg_bg_s0, LV_STATE_FOCUSED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_shadow_color(&button_msg_bg_s0, LV_STATE_FOCUSED, color);
|
||||
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_msg_bg_s0, LV_STATE_FOCUSED, color);
|
||||
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_msg_bg_s0, LV_STATE_FOCUSED, color);
|
||||
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_EDITED, color);
|
||||
STYLE_COLOR_PROP(0x24, 0x6c, 0x6c, 0x6c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_EDITED, color);
|
||||
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_msg_bg_s0, LV_STATE_EDITED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_border_color(&button_msg_bg_s0, LV_STATE_EDITED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_outline_color(&button_msg_bg_s0, LV_STATE_EDITED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_shadow_color(&button_msg_bg_s0, LV_STATE_EDITED, color);
|
||||
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_msg_bg_s0, LV_STATE_EDITED, color);
|
||||
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_msg_bg_s0, LV_STATE_EDITED, color);
|
||||
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_HOVERED, color);
|
||||
STYLE_COLOR_PROP(0x24, 0x6c, 0x6c, 0x6c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_HOVERED, color);
|
||||
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_msg_bg_s0, LV_STATE_HOVERED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_border_color(&button_msg_bg_s0, LV_STATE_HOVERED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_outline_color(&button_msg_bg_s0, LV_STATE_HOVERED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_shadow_color(&button_msg_bg_s0, LV_STATE_HOVERED, color);
|
||||
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_msg_bg_s0, LV_STATE_HOVERED, color);
|
||||
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_msg_bg_s0, LV_STATE_HOVERED, color);
|
||||
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_PRESSED, color);
|
||||
STYLE_COLOR_PROP(0x24, 0x6c, 0x6c, 0x6c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_PRESSED, color);
|
||||
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_msg_bg_s0, LV_STATE_PRESSED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_border_color(&button_msg_bg_s0, LV_STATE_PRESSED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_outline_color(&button_msg_bg_s0, LV_STATE_PRESSED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_shadow_color(&button_msg_bg_s0, LV_STATE_PRESSED, color);
|
||||
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_msg_bg_s0, LV_STATE_PRESSED, color);
|
||||
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_msg_bg_s0, LV_STATE_PRESSED, color);
|
||||
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_DISABLED, color);
|
||||
STYLE_COLOR_PROP(0x24, 0x6c, 0x6c, 0x6c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_DISABLED, color);
|
||||
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_msg_bg_s0, LV_STATE_DISABLED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_border_color(&button_msg_bg_s0, LV_STATE_DISABLED, color);
|
||||
STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_outline_color(&button_msg_bg_s0, LV_STATE_DISABLED, color);
|
||||
|
|
Loading…
Reference in New Issue
Block a user