payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed signal level show bug.

Browse Source
This commit is contained in:
xiaojiazhu 2023-10-30 11:28:15 +08:00
parent 177734f48f
commit 3dabb39860
9 changed files with 138 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr
View File

@ -1780,6 +1780,58 @@
}
],
"widget": "Image"
},
{
"auto size": true,
"class": "lv_img",
"click": false,
"drag": false,
"event callback": "",
"geometry": {
"height": 40,
"width": 48,
"x": 216,
"y": 0
},
"hidden": true,
"locked": false,
"name": "image_4g",
"offset": {
"X": 0,
"Y": 0
},
"source": "sf_net4g",
"styles": [
{
"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
}
],
"widget": "Image"
}
]
}

8
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPassword.lvglscr
View File

@ -241,14 +241,14 @@
"widget": "Label"
},
{
"auto size": true,
"auto size": false,
"class": "lv_img",
"click": false,
"drag": false,
"event callback": "",
"geometry": {
"height": 44,
"width": 120,
"height": 53,
"width": 139,
"x": 10,
"y": 12
},
@ -259,7 +259,7 @@
"X": 0,
"Y": 0
},
"source": "default",
"source": "ICON_FACE_ON",
"styles": [
{
"part": 0,

12
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp
View File

@ -2481,18 +2481,6 @@
"Ascii"
]
},
{
"bpp": 1,
"compressed": false,
"custom code range": "",
"file path": "fonts/SF-UI-Text-Bold.otf",
"include language table": true,
"name": "SF-UI-Text-Bold",
"size": 20,
"unicode range names": [
"Ascii"
]
},
{
"bpp": 1,
"compressed": false,

1
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c
View File

@ -541,7 +541,6 @@ lv_plugin_font_t lv_plugin_UIFlowLVGL_font_table[] =
{ &sf_ui_text_medium_18_8bpp },
{ &arialuni_74_1bpp },
{ &sf_ui_text_medium_16_8bpp },
{ &sf_ui_text_bold_20_1bpp },
{ &sf_ui_text_medium_18_1bpp },
{ &sf_ui_text_medium_16_1bpp },
{ &notosans_black_8_1bpp },

10
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h
View File

@ -67,7 +67,6 @@ LV_FONT_DECLARE(sf_ui_text_bold_20_8bpp);
LV_FONT_DECLARE(sf_ui_text_medium_18_8bpp);
LV_FONT_DECLARE(arialuni_74_1bpp);
LV_FONT_DECLARE(sf_ui_text_medium_16_8bpp);
LV_FONT_DECLARE(sf_ui_text_bold_20_1bpp);
LV_FONT_DECLARE(sf_ui_text_medium_18_1bpp);
LV_FONT_DECLARE(sf_ui_text_medium_16_1bpp);
LV_FONT_DECLARE(notosans_black_8_1bpp);
@ -1069,11 +1068,10 @@ LV_IMG_DECLARE(work_mode);
#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_8BPP 13
#define LV_PLUGIN_FONT_ID_ARIALUNI_74_1BPP 14
#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_8BPP 15
#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_20_1BPP 16
#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_1BPP 17
#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_1BPP 18
#define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP 19
#define LV_PLUGIN_FONT_TABLE_SIZE 20
#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_1BPP 16
#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_1BPP 17
#define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP 18
#define LV_PLUGIN_FONT_TABLE_SIZE 19
#define LV_PLUGIN_STRING_ID_STRID_NULL_ 1
#define LV_PLUGIN_STRING_ID_STRID_MODE 2

50
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c
View File

@ -42,6 +42,7 @@ lv_obj_t* image_signal_1_scr_uiflowmovie;
lv_obj_t* image_signal_2_scr_uiflowmovie;
lv_obj_t* image_signal_3_scr_uiflowmovie;
lv_obj_t* image_signal_4_scr_uiflowmovie;
lv_obj_t* image_4g_scr_uiflowmovie;
lv_obj_t* UIFlowMovie_create(){
lv_obj_t *parent = lv_plugin_scr_create();
@ -1796,5 +1797,54 @@ lv_obj_t* UIFlowMovie_create(){
image_signal_4_scr_uiflowmovie = image_signal_4;
static lv_style_t image_4g_s0;
lv_style_init(&image_4g_s0);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_4g_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_4g_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_4g_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_4g_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_4g_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_4g_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_4g_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_4g_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_4g_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_4g_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_4g_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_4g_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_4g_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_4g_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_4g_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_4g_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_4g_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_4g_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_4g_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_4g_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_4g_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_4g_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_4g_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_4g_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_4g_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_4g_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_4g_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_4g_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_4g_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_4g_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_4g_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_4g_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_4g_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_4g_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_4g_s0, LV_STATE_DISABLED, color);
lv_obj_t *image_4g = lv_img_create(parent, NULL);
lv_obj_set_hidden(image_4g, true);
lv_obj_set_click(image_4g, false);
lv_obj_set_drag(image_4g, false);
lv_obj_set_pos(image_4g, 216, 0);
lv_obj_set_size(image_4g, 48, 40);
lv_img_set_src(image_4g, &sf_net4g);
lv_obj_add_style(image_4g, 0, &image_4g_s0);
image_4g_scr_uiflowmovie = image_4g;
return parent;
}

1
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.h
View File

@ -50,6 +50,7 @@ extern lv_obj_t* image_signal_1_scr_uiflowmovie;
extern lv_obj_t* image_signal_2_scr_uiflowmovie;
extern lv_obj_t* image_signal_3_scr_uiflowmovie;
extern lv_obj_t* image_signal_4_scr_uiflowmovie;
extern lv_obj_t* image_4g_scr_uiflowmovie;
/**********************
* GLOBAL PROTOTYPES

48
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c
View File

@ -282,30 +282,30 @@ static void update_4g_module_icon(void)
// Nothing changed.
// printf(" nothing changed.\n");
}
// const int EMPTY_IMAGE = 0;
// lv_plugin_res_id res[] = {
// EMPTY_IMAGE,
// EMPTY_IMAGE,
// LV_PLUGIN_IMG_ID_SF_NET2G,
// LV_PLUGIN_IMG_ID_SF_NET3G,
// LV_PLUGIN_IMG_ID_SF_NET4G
// };
// // printf("NetGeneration:%d\n", puiPara->NetGeneration);
// const int SIM_CARD_NOT_INIT = 0;
// const int NET_GENERATION_2G = 2;
// // const int NET_GENERATION_3G = 3;
// const int NET_GENERATION_4G = 4;
// // puiPara->NetGeneration = NET_GENERATION_4G; // Test
// if (SIM_CARD_NOT_INIT == puiPara->NetGeneration
// || puiPara->NetGeneration < NET_GENERATION_2G
// || puiPara->NetGeneration > NET_GENERATION_4G)
// {
// lv_obj_set_hidden(image_4g_scr_uiflowmovie, true);
// return;
// }
// int index = puiPara->NetGeneration;
// lv_obj_set_hidden(image_4g_scr_uiflowmovie, false);
// lv_plugin_img_set_src(image_4g_scr_uiflowmovie, res[index]);
const int EMPTY_IMAGE = 0;
lv_plugin_res_id res[] = {
EMPTY_IMAGE,
EMPTY_IMAGE,
LV_PLUGIN_IMG_ID_SF_NET2G,
LV_PLUGIN_IMG_ID_SF_NET3G,
LV_PLUGIN_IMG_ID_SF_NET4G
};
// printf("NetGeneration:%d\n", puiPara->NetGeneration);
const int SIM_CARD_NOT_INIT = 0;
const int NET_GENERATION_2G = 2;
// const int NET_GENERATION_3G = 3;
const int NET_GENERATION_4G = 4;
// puiPara->NetGeneration = NET_GENERATION_4G; // Test
if (SIM_CARD_NOT_INIT == puiPara->NetGeneration
|| puiPara->NetGeneration < NET_GENERATION_2G
|| puiPara->NetGeneration > NET_GENERATION_4G)
{
lv_obj_set_hidden(image_4g_scr_uiflowmovie, true);
return;
}
int index = puiPara->NetGeneration;
lv_obj_set_hidden(image_4g_scr_uiflowmovie, false);
lv_plugin_img_set_src(image_4g_scr_uiflowmovie, res[index]);
}
static void update_camera_message(void)

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPassword.c
View File

@ -361,7 +361,9 @@ lv_obj_t* UIFlowPassword_create(){
lv_obj_set_click(image_2, false);
lv_obj_set_drag(image_2, false);
lv_obj_set_pos(image_2, 10, 12);
lv_obj_set_size(image_2, 120, 44);
lv_obj_set_size(image_2, 139, 53);
lv_img_set_auto_size(image_2, false);
lv_img_set_src(image_2, &icon_face_on);
lv_obj_add_style(image_2, 0, &image_2_s0);
image_2_scr_uiflowpassword = image_2;