Improve setting screen.
This commit is contained in:
parent
b43e32fb3d
commit
57e212d083
|
@ -240,6 +240,9 @@ SRC += \
|
||||||
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/arialuni_74_1bpp.c \
|
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/arialuni_74_1bpp.c \
|
||||||
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/arialuni_86_1bpp.c \
|
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/arialuni_86_1bpp.c \
|
||||||
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/arialuni_106_1bpp.c \
|
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/arialuni_106_1bpp.c \
|
||||||
|
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/sf_ui_text_medium_18_1bpp.c \
|
||||||
|
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/sf_ui_text_medium_16_1bpp.c \
|
||||||
|
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/sf_ui_text_bold_20_1bpp.c \
|
||||||
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c \
|
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c \
|
||||||
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c \
|
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c \
|
||||||
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c \
|
./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c \
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -979,7 +979,7 @@
|
||||||
"event callback": "",
|
"event callback": "",
|
||||||
"geometry": {
|
"geometry": {
|
||||||
"height": 40,
|
"height": 40,
|
||||||
"width": 32,
|
"width": 27,
|
||||||
"x": 78,
|
"x": 78,
|
||||||
"y": 0
|
"y": 0
|
||||||
},
|
},
|
||||||
|
@ -1150,7 +1150,7 @@
|
||||||
"event callback": "",
|
"event callback": "",
|
||||||
"geometry": {
|
"geometry": {
|
||||||
"height": 40,
|
"height": 40,
|
||||||
"width": 32,
|
"width": 27,
|
||||||
"x": 78,
|
"x": 78,
|
||||||
"y": 0
|
"y": 0
|
||||||
},
|
},
|
||||||
|
@ -1321,7 +1321,7 @@
|
||||||
"event callback": "",
|
"event callback": "",
|
||||||
"geometry": {
|
"geometry": {
|
||||||
"height": 40,
|
"height": 40,
|
||||||
"width": 32,
|
"width": 27,
|
||||||
"x": 78,
|
"x": 78,
|
||||||
"y": 0
|
"y": 0
|
||||||
},
|
},
|
||||||
|
@ -1492,7 +1492,7 @@
|
||||||
"event callback": "",
|
"event callback": "",
|
||||||
"geometry": {
|
"geometry": {
|
||||||
"height": 40,
|
"height": 40,
|
||||||
"width": 32,
|
"width": 27,
|
||||||
"x": 78,
|
"x": 78,
|
||||||
"y": 0
|
"y": 0
|
||||||
},
|
},
|
||||||
|
@ -1663,7 +1663,7 @@
|
||||||
"event callback": "",
|
"event callback": "",
|
||||||
"geometry": {
|
"geometry": {
|
||||||
"height": 40,
|
"height": 40,
|
||||||
"width": 32,
|
"width": 27,
|
||||||
"x": 78,
|
"x": 78,
|
||||||
"y": 0
|
"y": 0
|
||||||
},
|
},
|
||||||
|
|
|
@ -1033,16 +1033,12 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Text": {
|
"Text": {
|
||||||
"text_color": "0xffffff",
|
"text_color": "0xffffff"
|
||||||
"text_font": "montserrat 16 4bpp"
|
|
||||||
},
|
},
|
||||||
"part": 0,
|
"part": 0,
|
||||||
"state": 1
|
"state": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Text": {
|
|
||||||
"text_font": "montserrat 16 4bpp"
|
|
||||||
},
|
|
||||||
"part": 0,
|
"part": 0,
|
||||||
"state": 2
|
"state": 2
|
||||||
},
|
},
|
||||||
|
|
|
@ -2492,6 +2492,42 @@
|
||||||
"unicode range names": [
|
"unicode range names": [
|
||||||
"Ascii"
|
"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,
|
||||||
|
"custom code range": "",
|
||||||
|
"file path": "fonts/SF-UI-Text-Medium.otf",
|
||||||
|
"include language table": true,
|
||||||
|
"name": "SF-UI-Text-Medium",
|
||||||
|
"size": 18,
|
||||||
|
"unicode range names": [
|
||||||
|
"Ascii"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"bpp": 1,
|
||||||
|
"compressed": false,
|
||||||
|
"custom code range": "",
|
||||||
|
"file path": "fonts/SF-UI-Text-Medium.otf",
|
||||||
|
"include language table": true,
|
||||||
|
"name": "SF-UI-Text-Medium",
|
||||||
|
"size": 16,
|
||||||
|
"unicode range names": [
|
||||||
|
"Ascii"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"images": [
|
"images": [
|
||||||
|
@ -4670,6 +4706,11 @@
|
||||||
"filename": "icons/sf_menu_bg.bmp",
|
"filename": "icons/sf_menu_bg.bmp",
|
||||||
"name": "sf_menu_bg"
|
"name": "sf_menu_bg"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"colorFormat": "Indexed 256 in RGB332",
|
||||||
|
"filename": "icons/sf_menu_option_select.bmp",
|
||||||
|
"name": "sf_menu_option_select"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"colorFormat": "Indexed 256 in RGB332",
|
"colorFormat": "Indexed 256 in RGB332",
|
||||||
"filename": "icons/sf_menu_release.bmp",
|
"filename": "icons/sf_menu_release.bmp",
|
||||||
|
@ -4885,6 +4926,21 @@
|
||||||
"filename": "icons/sy_bg_msg2.bmp",
|
"filename": "icons/sy_bg_msg2.bmp",
|
||||||
"name": "sy_bg_msg2"
|
"name": "sy_bg_msg2"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"colorFormat": "Indexed 256 in RGB332",
|
||||||
|
"filename": "icons/sy_bg_tc1.bmp",
|
||||||
|
"name": "sy_bg_tc1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"colorFormat": "Indexed 256 in RGB332",
|
||||||
|
"filename": "icons/sy_bg_tc2.bmp",
|
||||||
|
"name": "sy_bg_tc2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"colorFormat": "Indexed 256 in RGB332",
|
||||||
|
"filename": "icons/sy_bg_tc3.bmp",
|
||||||
|
"name": "sy_bg_tc3"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"colorFormat": "Indexed 256 in RGB332",
|
"colorFormat": "Indexed 256 in RGB332",
|
||||||
"filename": "icons/sy_luzhi.bmp",
|
"filename": "icons/sy_luzhi.bmp",
|
||||||
|
|
|
@ -473,6 +473,7 @@ lv_plugin_img_t lv_plugin_UIFlowLVGL_img_table[] =
|
||||||
{ &sf_left },
|
{ &sf_left },
|
||||||
{ &sf_list_selected },
|
{ &sf_list_selected },
|
||||||
{ &sf_menu_bg },
|
{ &sf_menu_bg },
|
||||||
|
{ &sf_menu_option_select },
|
||||||
{ &sf_menu_release },
|
{ &sf_menu_release },
|
||||||
{ &sf_menu_select },
|
{ &sf_menu_select },
|
||||||
{ &sf_mode_still_video },
|
{ &sf_mode_still_video },
|
||||||
|
@ -516,6 +517,9 @@ lv_plugin_img_t lv_plugin_UIFlowLVGL_img_table[] =
|
||||||
{ &sy_bg_32x28 },
|
{ &sy_bg_32x28 },
|
||||||
{ &sy_bg_msg },
|
{ &sy_bg_msg },
|
||||||
{ &sy_bg_msg2 },
|
{ &sy_bg_msg2 },
|
||||||
|
{ &sy_bg_tc1 },
|
||||||
|
{ &sy_bg_tc2 },
|
||||||
|
{ &sy_bg_tc3 },
|
||||||
{ &sy_luzhi },
|
{ &sy_luzhi },
|
||||||
{ &sy_redline },
|
{ &sy_redline },
|
||||||
{ &sy_redline2 },
|
{ &sy_redline2 },
|
||||||
|
@ -541,6 +545,9 @@ lv_plugin_font_t lv_plugin_UIFlowLVGL_font_table[] =
|
||||||
{ &arialuni_74_1bpp },
|
{ &arialuni_74_1bpp },
|
||||||
{ &sf_ui_text_medium_16_8bpp },
|
{ &sf_ui_text_medium_16_8bpp },
|
||||||
{ ¬osans_black_8_1bpp },
|
{ ¬osans_black_8_1bpp },
|
||||||
|
{ &sf_ui_text_bold_20_1bpp },
|
||||||
|
{ &sf_ui_text_medium_18_1bpp },
|
||||||
|
{ &sf_ui_text_medium_16_1bpp },
|
||||||
};
|
};
|
||||||
|
|
||||||
lv_plugin_string_t* lv_plugin_language_table[] = {
|
lv_plugin_string_t* lv_plugin_language_table[] = {
|
||||||
|
|
|
@ -68,6 +68,9 @@ LV_FONT_DECLARE(sf_ui_text_medium_18_8bpp);
|
||||||
LV_FONT_DECLARE(arialuni_74_1bpp);
|
LV_FONT_DECLARE(arialuni_74_1bpp);
|
||||||
LV_FONT_DECLARE(sf_ui_text_medium_16_8bpp);
|
LV_FONT_DECLARE(sf_ui_text_medium_16_8bpp);
|
||||||
LV_FONT_DECLARE(notosans_black_8_1bpp);
|
LV_FONT_DECLARE(notosans_black_8_1bpp);
|
||||||
|
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);
|
||||||
|
|
||||||
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);
|
||||||
|
@ -517,6 +520,7 @@ LV_IMG_DECLARE(sf_image_size);
|
||||||
LV_IMG_DECLARE(sf_left);
|
LV_IMG_DECLARE(sf_left);
|
||||||
LV_IMG_DECLARE(sf_list_selected);
|
LV_IMG_DECLARE(sf_list_selected);
|
||||||
LV_IMG_DECLARE(sf_menu_bg);
|
LV_IMG_DECLARE(sf_menu_bg);
|
||||||
|
LV_IMG_DECLARE(sf_menu_option_select);
|
||||||
LV_IMG_DECLARE(sf_menu_release);
|
LV_IMG_DECLARE(sf_menu_release);
|
||||||
LV_IMG_DECLARE(sf_menu_select);
|
LV_IMG_DECLARE(sf_menu_select);
|
||||||
LV_IMG_DECLARE(sf_mode_still_video);
|
LV_IMG_DECLARE(sf_mode_still_video);
|
||||||
|
@ -560,6 +564,9 @@ LV_IMG_DECLARE(sy_bg_102x28);
|
||||||
LV_IMG_DECLARE(sy_bg_32x28);
|
LV_IMG_DECLARE(sy_bg_32x28);
|
||||||
LV_IMG_DECLARE(sy_bg_msg);
|
LV_IMG_DECLARE(sy_bg_msg);
|
||||||
LV_IMG_DECLARE(sy_bg_msg2);
|
LV_IMG_DECLARE(sy_bg_msg2);
|
||||||
|
LV_IMG_DECLARE(sy_bg_tc1);
|
||||||
|
LV_IMG_DECLARE(sy_bg_tc2);
|
||||||
|
LV_IMG_DECLARE(sy_bg_tc3);
|
||||||
LV_IMG_DECLARE(sy_luzhi);
|
LV_IMG_DECLARE(sy_luzhi);
|
||||||
LV_IMG_DECLARE(sy_redline);
|
LV_IMG_DECLARE(sy_redline);
|
||||||
LV_IMG_DECLARE(sy_redline2);
|
LV_IMG_DECLARE(sy_redline2);
|
||||||
|
@ -1000,54 +1007,58 @@ LV_IMG_DECLARE(work_mode);
|
||||||
#define LV_PLUGIN_IMG_ID_SF_LEFT 433
|
#define LV_PLUGIN_IMG_ID_SF_LEFT 433
|
||||||
#define LV_PLUGIN_IMG_ID_SF_LIST_SELECTED 434
|
#define LV_PLUGIN_IMG_ID_SF_LIST_SELECTED 434
|
||||||
#define LV_PLUGIN_IMG_ID_SF_MENU_BG 435
|
#define LV_PLUGIN_IMG_ID_SF_MENU_BG 435
|
||||||
#define LV_PLUGIN_IMG_ID_SF_MENU_RELEASE 436
|
#define LV_PLUGIN_IMG_ID_SF_MENU_OPTION_SELECT 436
|
||||||
#define LV_PLUGIN_IMG_ID_SF_MENU_SELECT 437
|
#define LV_PLUGIN_IMG_ID_SF_MENU_RELEASE 437
|
||||||
#define LV_PLUGIN_IMG_ID_SF_MODE_STILL_VIDEO 438
|
#define LV_PLUGIN_IMG_ID_SF_MENU_SELECT 438
|
||||||
#define LV_PLUGIN_IMG_ID_SF_MODULE_FW_UPGRADE 439
|
#define LV_PLUGIN_IMG_ID_SF_MODE_STILL_VIDEO 439
|
||||||
#define LV_PLUGIN_IMG_ID_SF_NET2G 440
|
#define LV_PLUGIN_IMG_ID_SF_MODULE_FW_UPGRADE 440
|
||||||
#define LV_PLUGIN_IMG_ID_SF_NET3G 441
|
#define LV_PLUGIN_IMG_ID_SF_NET2G 441
|
||||||
#define LV_PLUGIN_IMG_ID_SF_NET4G 442
|
#define LV_PLUGIN_IMG_ID_SF_NET3G 442
|
||||||
#define LV_PLUGIN_IMG_ID_SF_NEXT 443
|
#define LV_PLUGIN_IMG_ID_SF_NET4G 443
|
||||||
#define LV_PLUGIN_IMG_ID_SF_NEXT1 444
|
#define LV_PLUGIN_IMG_ID_SF_NEXT 444
|
||||||
#define LV_PLUGIN_IMG_ID_SF_NEXT2 445
|
#define LV_PLUGIN_IMG_ID_SF_NEXT1 445
|
||||||
#define LV_PLUGIN_IMG_ID_SF_OFF 446
|
#define LV_PLUGIN_IMG_ID_SF_NEXT2 446
|
||||||
#define LV_PLUGIN_IMG_ID_SF_ON 447
|
#define LV_PLUGIN_IMG_ID_SF_OFF 447
|
||||||
#define LV_PLUGIN_IMG_ID_SF_OPERATING_TIME 448
|
#define LV_PLUGIN_IMG_ID_SF_ON 448
|
||||||
#define LV_PLUGIN_IMG_ID_SF_PASSWORD 449
|
#define LV_PLUGIN_IMG_ID_SF_OPERATING_TIME 449
|
||||||
#define LV_PLUGIN_IMG_ID_SF_PICTURE_UPON_DAILY_REPORT 450
|
#define LV_PLUGIN_IMG_ID_SF_PASSWORD 450
|
||||||
#define LV_PLUGIN_IMG_ID_SF_PLAY 451
|
#define LV_PLUGIN_IMG_ID_SF_PICTURE_UPON_DAILY_REPORT 451
|
||||||
#define LV_PLUGIN_IMG_ID_SF_QR 452
|
#define LV_PLUGIN_IMG_ID_SF_PLAY 452
|
||||||
#define LV_PLUGIN_IMG_ID_SF_RESET 453
|
#define LV_PLUGIN_IMG_ID_SF_QR 453
|
||||||
#define LV_PLUGIN_IMG_ID_SF_RIGHT 454
|
#define LV_PLUGIN_IMG_ID_SF_RESET 454
|
||||||
#define LV_PLUGIN_IMG_ID_SF_SEND_TYPE 455
|
#define LV_PLUGIN_IMG_ID_SF_RIGHT 455
|
||||||
#define LV_PLUGIN_IMG_ID_SF_SENSITVITY 456
|
#define LV_PLUGIN_IMG_ID_SF_SEND_TYPE 456
|
||||||
#define LV_PLUGIN_IMG_ID_SF_SHOOT_1 457
|
#define LV_PLUGIN_IMG_ID_SF_SENSITVITY 457
|
||||||
#define LV_PLUGIN_IMG_ID_SF_SIGNAL0 458
|
#define LV_PLUGIN_IMG_ID_SF_SHOOT_1 458
|
||||||
#define LV_PLUGIN_IMG_ID_SF_SIGNAL1 459
|
#define LV_PLUGIN_IMG_ID_SF_SIGNAL0 459
|
||||||
#define LV_PLUGIN_IMG_ID_SF_SIGNAL2 460
|
#define LV_PLUGIN_IMG_ID_SF_SIGNAL1 460
|
||||||
#define LV_PLUGIN_IMG_ID_SF_SIGNAL3 461
|
#define LV_PLUGIN_IMG_ID_SF_SIGNAL2 461
|
||||||
#define LV_PLUGIN_IMG_ID_SF_SIGNAL4 462
|
#define LV_PLUGIN_IMG_ID_SF_SIGNAL3 462
|
||||||
#define LV_PLUGIN_IMG_ID_SF_SMS_CTRL 463
|
#define LV_PLUGIN_IMG_ID_SF_SIGNAL4 463
|
||||||
#define LV_PLUGIN_IMG_ID_SF_STOP 464
|
#define LV_PLUGIN_IMG_ID_SF_SMS_CTRL 464
|
||||||
#define LV_PLUGIN_IMG_ID_SF_TAB_RELEASE 465
|
#define LV_PLUGIN_IMG_ID_SF_STOP 465
|
||||||
#define LV_PLUGIN_IMG_ID_SF_TAB_SELECT 466
|
#define LV_PLUGIN_IMG_ID_SF_TAB_RELEASE 466
|
||||||
#define LV_PLUGIN_IMG_ID_SF_VIDEO_LENGTH 467
|
#define LV_PLUGIN_IMG_ID_SF_TAB_SELECT 467
|
||||||
#define LV_PLUGIN_IMG_ID_SF_VIDEO_SIZE 468
|
#define LV_PLUGIN_IMG_ID_SF_VIDEO_LENGTH 468
|
||||||
#define LV_PLUGIN_IMG_ID_SF_WARNING_BG 469
|
#define LV_PLUGIN_IMG_ID_SF_VIDEO_SIZE 469
|
||||||
#define LV_PLUGIN_IMG_ID_SF_WARNING_NOT_SELECT 470
|
#define LV_PLUGIN_IMG_ID_SF_WARNING_BG 470
|
||||||
#define LV_PLUGIN_IMG_ID_SF_WARNING_SELECTED 471
|
#define LV_PLUGIN_IMG_ID_SF_WARNING_NOT_SELECT 471
|
||||||
#define LV_PLUGIN_IMG_ID_SF_WIFI_CONNECTED 472
|
#define LV_PLUGIN_IMG_ID_SF_WARNING_SELECTED 472
|
||||||
#define LV_PLUGIN_IMG_ID_SF_WIFI_UNCONNECTED 473
|
#define LV_PLUGIN_IMG_ID_SF_WIFI_CONNECTED 473
|
||||||
#define LV_PLUGIN_IMG_ID_SF_WIFI_UNSUPPORT 474
|
#define LV_PLUGIN_IMG_ID_SF_WIFI_UNCONNECTED 474
|
||||||
#define LV_PLUGIN_IMG_ID_SY_BG_102X28 475
|
#define LV_PLUGIN_IMG_ID_SF_WIFI_UNSUPPORT 475
|
||||||
#define LV_PLUGIN_IMG_ID_SY_BG_32X28 476
|
#define LV_PLUGIN_IMG_ID_SY_BG_102X28 476
|
||||||
#define LV_PLUGIN_IMG_ID_SY_BG_MSG 477
|
#define LV_PLUGIN_IMG_ID_SY_BG_32X28 477
|
||||||
#define LV_PLUGIN_IMG_ID_SY_BG_MSG2 478
|
#define LV_PLUGIN_IMG_ID_SY_BG_MSG 478
|
||||||
#define LV_PLUGIN_IMG_ID_SY_LUZHI 479
|
#define LV_PLUGIN_IMG_ID_SY_BG_MSG2 479
|
||||||
#define LV_PLUGIN_IMG_ID_SY_REDLINE 480
|
#define LV_PLUGIN_IMG_ID_SY_BG_TC1 480
|
||||||
#define LV_PLUGIN_IMG_ID_SY_REDLINE2 481
|
#define LV_PLUGIN_IMG_ID_SY_BG_TC2 481
|
||||||
#define LV_PLUGIN_IMG_ID_WORK_MODE 482
|
#define LV_PLUGIN_IMG_ID_SY_BG_TC3 482
|
||||||
#define LV_PLUGIN_IMG_TABLE_SIZE 483
|
#define LV_PLUGIN_IMG_ID_SY_LUZHI 483
|
||||||
|
#define LV_PLUGIN_IMG_ID_SY_REDLINE 484
|
||||||
|
#define LV_PLUGIN_IMG_ID_SY_REDLINE2 485
|
||||||
|
#define LV_PLUGIN_IMG_ID_WORK_MODE 486
|
||||||
|
#define LV_PLUGIN_IMG_TABLE_SIZE 487
|
||||||
|
|
||||||
#define LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16 1
|
#define LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16 1
|
||||||
#define LV_PLUGIN_FONT_ID_NOTOSANSCJKJP_BLACK_16_1BPP 2
|
#define LV_PLUGIN_FONT_ID_NOTOSANSCJKJP_BLACK_16_1BPP 2
|
||||||
|
@ -1065,7 +1076,10 @@ LV_IMG_DECLARE(work_mode);
|
||||||
#define LV_PLUGIN_FONT_ID_ARIALUNI_74_1BPP 14
|
#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_MEDIUM_16_8BPP 15
|
||||||
#define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP 16
|
#define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP 16
|
||||||
#define LV_PLUGIN_FONT_TABLE_SIZE 17
|
#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_20_1BPP 17
|
||||||
|
#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_1BPP 18
|
||||||
|
#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_1BPP 19
|
||||||
|
#define LV_PLUGIN_FONT_TABLE_SIZE 20
|
||||||
|
|
||||||
#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
|
||||||
|
|
|
@ -197,6 +197,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
|
||||||
lv_obj_set_size(image_button_option_1, 320, 40);
|
lv_obj_set_size(image_button_option_1, 320, 40);
|
||||||
lv_imgbtn_set_state(image_button_option_1, LV_BTN_STATE_RELEASED);
|
lv_imgbtn_set_state(image_button_option_1, LV_BTN_STATE_RELEASED);
|
||||||
lv_imgbtn_set_checkable(image_button_option_1, false);
|
lv_imgbtn_set_checkable(image_button_option_1, false);
|
||||||
|
lv_imgbtn_set_src(image_button_option_1, LV_BTN_STATE_RELEASED, &sf_menu_option_select);
|
||||||
lv_imgbtn_set_src(image_button_option_1, LV_BTN_STATE_PRESSED, &sf_menu_release);
|
lv_imgbtn_set_src(image_button_option_1, LV_BTN_STATE_PRESSED, &sf_menu_release);
|
||||||
lv_imgbtn_set_src(image_button_option_1, LV_BTN_STATE_DISABLED, &sf_menu_release);
|
lv_imgbtn_set_src(image_button_option_1, LV_BTN_STATE_DISABLED, &sf_menu_release);
|
||||||
lv_btn_set_layout(image_button_option_1, LV_LAYOUT_OFF);
|
lv_btn_set_layout(image_button_option_1, LV_LAYOUT_OFF);
|
||||||
|
@ -360,6 +361,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
|
||||||
lv_obj_set_size(image_button_option_2, 320, 40);
|
lv_obj_set_size(image_button_option_2, 320, 40);
|
||||||
lv_imgbtn_set_state(image_button_option_2, LV_BTN_STATE_RELEASED);
|
lv_imgbtn_set_state(image_button_option_2, LV_BTN_STATE_RELEASED);
|
||||||
lv_imgbtn_set_checkable(image_button_option_2, false);
|
lv_imgbtn_set_checkable(image_button_option_2, false);
|
||||||
|
lv_imgbtn_set_src(image_button_option_2, LV_BTN_STATE_RELEASED, &sf_menu_option_select);
|
||||||
lv_imgbtn_set_src(image_button_option_2, LV_BTN_STATE_PRESSED, &sf_menu_release);
|
lv_imgbtn_set_src(image_button_option_2, LV_BTN_STATE_PRESSED, &sf_menu_release);
|
||||||
lv_imgbtn_set_src(image_button_option_2, LV_BTN_STATE_DISABLED, &sf_menu_release);
|
lv_imgbtn_set_src(image_button_option_2, LV_BTN_STATE_DISABLED, &sf_menu_release);
|
||||||
lv_btn_set_layout(image_button_option_2, LV_LAYOUT_OFF);
|
lv_btn_set_layout(image_button_option_2, LV_LAYOUT_OFF);
|
||||||
|
@ -523,6 +525,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
|
||||||
lv_obj_set_size(image_button_option_3, 320, 40);
|
lv_obj_set_size(image_button_option_3, 320, 40);
|
||||||
lv_imgbtn_set_state(image_button_option_3, LV_BTN_STATE_RELEASED);
|
lv_imgbtn_set_state(image_button_option_3, LV_BTN_STATE_RELEASED);
|
||||||
lv_imgbtn_set_checkable(image_button_option_3, false);
|
lv_imgbtn_set_checkable(image_button_option_3, false);
|
||||||
|
lv_imgbtn_set_src(image_button_option_3, LV_BTN_STATE_RELEASED, &sf_menu_option_select);
|
||||||
lv_imgbtn_set_src(image_button_option_3, LV_BTN_STATE_PRESSED, &sf_menu_release);
|
lv_imgbtn_set_src(image_button_option_3, LV_BTN_STATE_PRESSED, &sf_menu_release);
|
||||||
lv_imgbtn_set_src(image_button_option_3, LV_BTN_STATE_DISABLED, &sf_menu_release);
|
lv_imgbtn_set_src(image_button_option_3, LV_BTN_STATE_DISABLED, &sf_menu_release);
|
||||||
lv_btn_set_layout(image_button_option_3, LV_LAYOUT_OFF);
|
lv_btn_set_layout(image_button_option_3, LV_LAYOUT_OFF);
|
||||||
|
@ -686,6 +689,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
|
||||||
lv_obj_set_size(image_button_option_4, 320, 40);
|
lv_obj_set_size(image_button_option_4, 320, 40);
|
||||||
lv_imgbtn_set_state(image_button_option_4, LV_BTN_STATE_RELEASED);
|
lv_imgbtn_set_state(image_button_option_4, LV_BTN_STATE_RELEASED);
|
||||||
lv_imgbtn_set_checkable(image_button_option_4, false);
|
lv_imgbtn_set_checkable(image_button_option_4, false);
|
||||||
|
lv_imgbtn_set_src(image_button_option_4, LV_BTN_STATE_RELEASED, &sf_menu_option_select);
|
||||||
lv_imgbtn_set_src(image_button_option_4, LV_BTN_STATE_PRESSED, &sf_menu_release);
|
lv_imgbtn_set_src(image_button_option_4, LV_BTN_STATE_PRESSED, &sf_menu_release);
|
||||||
lv_imgbtn_set_src(image_button_option_4, LV_BTN_STATE_DISABLED, &sf_menu_release);
|
lv_imgbtn_set_src(image_button_option_4, LV_BTN_STATE_DISABLED, &sf_menu_release);
|
||||||
lv_btn_set_layout(image_button_option_4, LV_LAYOUT_OFF);
|
lv_btn_set_layout(image_button_option_4, LV_LAYOUT_OFF);
|
||||||
|
@ -849,6 +853,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
|
||||||
lv_obj_set_size(image_button_option_5, 320, 40);
|
lv_obj_set_size(image_button_option_5, 320, 40);
|
||||||
lv_imgbtn_set_state(image_button_option_5, LV_BTN_STATE_RELEASED);
|
lv_imgbtn_set_state(image_button_option_5, LV_BTN_STATE_RELEASED);
|
||||||
lv_imgbtn_set_checkable(image_button_option_5, false);
|
lv_imgbtn_set_checkable(image_button_option_5, false);
|
||||||
|
lv_imgbtn_set_src(image_button_option_5, LV_BTN_STATE_RELEASED, &sf_menu_option_select);
|
||||||
lv_imgbtn_set_src(image_button_option_5, LV_BTN_STATE_PRESSED, &sf_menu_release);
|
lv_imgbtn_set_src(image_button_option_5, LV_BTN_STATE_PRESSED, &sf_menu_release);
|
||||||
lv_imgbtn_set_src(image_button_option_5, LV_BTN_STATE_DISABLED, &sf_menu_release);
|
lv_imgbtn_set_src(image_button_option_5, LV_BTN_STATE_DISABLED, &sf_menu_release);
|
||||||
lv_btn_set_layout(image_button_option_5, LV_LAYOUT_OFF);
|
lv_btn_set_layout(image_button_option_5, LV_LAYOUT_OFF);
|
||||||
|
|
|
@ -1096,14 +1096,12 @@ 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);
|
||||||
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_FOCUSED, color);
|
||||||
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_FOCUSED, color);
|
||||||
STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_2_s0, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_2_s0, LV_STATE_FOCUSED, color);
|
||||||
lv_style_set_text_font(&label_2_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16);
|
|
||||||
STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_FOCUSED, color);
|
||||||
STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_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_EDITED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_EDITED, color);
|
||||||
|
@ -1117,20 +1115,19 @@ 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);
|
||||||
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_DISABLED, color);
|
||||||
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_DISABLED, color);
|
||||||
STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_text_color(&label_2_s0, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_text_color(&label_2_s0, LV_STATE_DISABLED, color);
|
||||||
|
lv_style_set_text_font(&label_2_s0,LV_STATE_DISABLED,&lv_font_montserrat_16);
|
||||||
STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_DISABLED, color);
|
||||||
STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_DISABLED, color);
|
||||||
lv_obj_t *label_2 = lv_label_create(button_2, NULL);
|
lv_obj_t *label_2 = lv_label_create(button_2, NULL);
|
||||||
|
@ -1225,7 +1222,7 @@ lv_obj_t* UIFlowPhoto_create(){
|
||||||
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_DEFAULT, color);
|
||||||
STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_DEFAULT, color);
|
||||||
STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_DEFAULT, color);
|
||||||
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_DEFAULT, color);
|
||||||
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_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_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(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);
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 50 KiB |
Loading…
Reference in New Issue
Block a user