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

Fixed font bug.

Browse Source
This commit is contained in:
xiaojiazhu 2023-10-12 13:44:58 +08:00
parent 3647984f0f
commit ed9c3251cb
10 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr
View File

@ -1061,16 +1061,10 @@
"state": 3 "state": 3
}, },
{ {
"Text": {
"text_font": "montserrat 16 4bpp"
},
"part": 0, "part": 0,
"state": 4 "state": 4
}, },
{ {
"Text": {
"text_font": "montserrat 16 4bpp"
},
"part": 0, "part": 0,
"state": 5 "state": 5
}, },
@ -1174,59 +1168,37 @@
"opa_scale": 120 "opa_scale": 120
}, },
"Text": { "Text": {
"text_color": "0x31404f", "text_color": "0x31404f"
"text_sel_bg_color": "0x00b495",
"text_sel_color": "0x3c3c3c"
}, },
"part": 0, "part": 0,
"state": 0 "state": 0
}, },
{ {
"Text": { "Text": {
"text_color": "0xffffff", "text_color": "0xffffff"
"text_sel_bg_color": "0x01a2b1",
"text_sel_color": "0x3b3e42"
}, },
"part": 0, "part": 0,
"state": 1 "state": 1
}, },
{ {
"Text": {
"text_sel_bg_color": "0x01a2b1",
"text_sel_color": "0x3b3e42"
},
"part": 0, "part": 0,
"state": 2 "state": 2
}, },
{ {
"Text": {
"text_sel_bg_color": "0x01a2b1",
"text_sel_color": "0x3b3e42"
},
"part": 0, "part": 0,
"state": 3 "state": 3
}, },
{ {
"Text": {
"text_sel_bg_color": "0x01a2b1",
"text_sel_color": "0x3b3e42"
},
"part": 0, "part": 0,
"state": 4 "state": 4
}, },
{ {
"Text": {
"text_sel_bg_color": "0x01a2b1",
"text_sel_color": "0x3b3e42"
},
"part": 0, "part": 0,
"state": 5 "state": 5
}, },
{ {
"Text": { "Text": {
"text_color": "0x888888", "text_color": "0x888888"
"text_sel_bg_color": "0x01a2b1",
"text_sel_color": "0x3b3e42"
}, },
"part": 0, "part": 0,
"state": 6 "state": 6

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

@ -2468,6 +2468,30 @@
"unicode range names": [ "unicode range names": [
"Ascii" "Ascii"
] ]
},
{
"bpp": 1,
"compressed": false,
"custom code range": "",
"file path": "fonts/ARIALUNI.TTF",
"include language table": true,
"name": "ARIALUNI",
"size": 74,
"unicode range names": [
"Ascii"
]
},
{
"bpp": 1,
"compressed": false,
"custom code range": "",
"file path": "fonts/NotoSans-Black.ttf",
"include language table": true,
"name": "NotoSans-Black",
"size": 8,
"unicode range names": [
"Ascii"
]
} }
], ],
"images": [ "images": [

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

@ -532,6 +532,8 @@ lv_plugin_font_t lv_plugin_UIFlowLVGL_font_table[] =
{ &sf_ui_text_bold_20_8bpp }, { &sf_ui_text_bold_20_8bpp },
{ &sf_ui_text_medium_18_8bpp }, { &sf_ui_text_medium_18_8bpp },
{ &sf_ui_text_medium_16_8bpp }, { &sf_ui_text_medium_16_8bpp },
{ &arialuni_74_1bpp },
{ &notosans_black_8_1bpp },
}; };
lv_plugin_string_t* lv_plugin_language_table[] = { lv_plugin_string_t* lv_plugin_language_table[] = {

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

@ -66,6 +66,8 @@ LV_FONT_DECLARE(arialuni_106_1bpp);
LV_FONT_DECLARE(sf_ui_text_bold_20_8bpp); LV_FONT_DECLARE(sf_ui_text_bold_20_8bpp);
LV_FONT_DECLARE(sf_ui_text_medium_18_8bpp); LV_FONT_DECLARE(sf_ui_text_medium_18_8bpp);
LV_FONT_DECLARE(sf_ui_text_medium_16_8bpp); LV_FONT_DECLARE(sf_ui_text_medium_16_8bpp);
LV_FONT_DECLARE(arialuni_74_1bpp);
LV_FONT_DECLARE(notosans_black_8_1bpp);
void message_box_wrnmsg_event_callback(lv_obj_t* obj, lv_event_t event); void message_box_wrnmsg_event_callback(lv_obj_t* obj, lv_event_t event);
void button_del_event_callback(lv_obj_t* obj, lv_event_t event); void button_del_event_callback(lv_obj_t* obj, lv_event_t event);
@ -1047,7 +1049,9 @@ LV_IMG_DECLARE(sy_redline2);
#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_20_8BPP 12 #define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_20_8BPP 12
#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_8BPP 13 #define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_8BPP 13
#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_8BPP 14 #define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_8BPP 14
#define LV_PLUGIN_FONT_TABLE_SIZE 15 #define LV_PLUGIN_FONT_ID_ARIALUNI_74_1BPP 15
#define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP 16
#define LV_PLUGIN_FONT_TABLE_SIZE 17
#define LV_PLUGIN_STRING_ID_STRID_NULL_ 1 #define LV_PLUGIN_STRING_ID_STRID_NULL_ 1
#define LV_PLUGIN_STRING_ID_STRID_MODE 2 #define LV_PLUGIN_STRING_ID_STRID_MODE 2

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

@ -940,11 +940,11 @@ enum _MENU_IDF {
IDF_IPP_ISO = FL_IPP_ISO, IDF_IPP_ISO = FL_IPP_ISO,
// Setting QR page // Setting QR page
IDF_NETWORK_SELECTION = FL_NULL, IDF_NETWORK_SELECTION = FL_NETWORK_SELECTION,
IDF_QR_PICTURE = FL_NULL, IDF_QR_PICTURE = FL_QR_PICTURE,
IDF_PASSWORD = FL_NULL, IDF_PASSWORD = FL_PASSWORD,
IDF_CAMERA_INFO = FL_NULL, IDF_CAMERA_INFO = FL_CAMERA_INFO,
IDF_CAMERA_NAME = FL_NULL, IDF_CAMERA_NAME = FL_CAMERA_NAME,
// Setting GENERAL page // Setting GENERAL page
IDF_CAMERA_MODE = FL_NULL, IDF_CAMERA_MODE = FL_NULL,

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

@ -42,6 +42,7 @@ TMDEF_EMNU(gQrMenu, QR, Qr_MenuCallback)
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
int Qr_MenuCallback(UINT32 uiMessage, UINT32 uiParam) int Qr_MenuCallback(UINT32 uiMessage, UINT32 uiParam)
{ {
printf(" ====================================================== \n");
UINT16 uwItemId; UINT16 uwItemId;
// UINT16 uwOption; // UINT16 uwOption;
if (uiMessage == TMM_CONFIRM_OPTION) if (uiMessage == TMM_CONFIRM_OPTION)

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

@ -286,6 +286,7 @@ void MenuItem_OnOpen(lv_obj_t* obj)
pNextMenu = &gMovieMenu; pNextMenu = &gMovieMenu;
#endif #endif
pNextMenu = &gQrMenu; // TODO: test
//MenuCommonItem_SetCurrentMenu(&gCommonMenu); //MenuCommonItem_SetCurrentMenu(&gCommonMenu);
MenuCommonItem_SetCurrentMenu(pNextMenu); MenuCommonItem_SetCurrentMenu(pNextMenu);
pMenu = MenuCommonItem_GetCurrentMenu(); pMenu = MenuCommonItem_GetCurrentMenu();

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

@ -1096,6 +1096,7 @@ lv_obj_t* UIFlowPhoto_create(){
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_2_s0, LV_STATE_CHECKED, color);
lv_style_set_text_font(&label_2_s0,LV_STATE_CHECKED,&lv_font_montserrat_16);
STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_FOCUSED, color);
@ -1114,14 +1115,12 @@ lv_obj_t* UIFlowPhoto_create(){
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_2_s0, LV_STATE_HOVERED, color);
lv_style_set_text_font(&label_2_s0,LV_STATE_HOVERED,&lv_font_montserrat_16);
STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_2_s0, LV_STATE_PRESSED, color);
lv_style_set_text_font(&label_2_s0,LV_STATE_PRESSED,&lv_font_montserrat_16);
STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_DISABLED, color);
@ -1228,6 +1227,7 @@ lv_obj_t* UIFlowPhoto_create(){
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_3_s0, LV_STATE_CHECKED, color);
lv_style_set_text_font(&label_3_s0,LV_STATE_CHECKED,&lv_font_montserrat_16);
STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_FOCUSED, color);
@ -1246,14 +1246,12 @@ lv_obj_t* UIFlowPhoto_create(){
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_HOVERED, color);
lv_style_set_text_font(&label_3_s0,LV_STATE_HOVERED,&lv_font_montserrat_16);
STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_PRESSED, color);
lv_style_set_text_font(&label_3_s0,LV_STATE_PRESSED,&lv_font_montserrat_16);
STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_DISABLED, color);

7
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
View File

@ -213,6 +213,13 @@ typedef enum {
FL_MovieAudioRecIndex, FL_MovieAudioRecIndex,
FL_MovieAudioRec, FL_MovieAudioRec,
// QR page
FL_NETWORK_SELECTION,
FL_QR_PICTURE,
FL_PASSWORD,
FL_CAMERA_INFO,
FL_CAMERA_NAME,
//Setup //Setup
FL_LCD_OFF, FL_LCD_OFF,
FL_BrightAdjIndex, FL_BrightAdjIndex,