Fix compile error bug.
This commit is contained in:
parent
eb20eeb39a
commit
8a0b030104
|
@ -1073,11 +1073,11 @@ void UiDateImprint_AttachICON(DS_STAMP_INFOR *stampInfo, HD_VIDEO_FRAME* Img, lv
|
||||||
param_img.dst_region.w = (src_img.dim.w / src_img.dim.h) * stampInfo->Img.ph[0];
|
param_img.dst_region.w = (src_img.dim.w / src_img.dim.h) * stampInfo->Img.ph[0];
|
||||||
param_img.dst_region.h = stampInfo->Img.ph[0];
|
param_img.dst_region.h = stampInfo->Img.ph[0];
|
||||||
DBG_IND("[%s:%d]padding=%d,param_img.dst_region.w=%d,stampInfo->PosY=%d\n", __FUNCTION__, __LINE__, padding, param_img.dst_region.w, stampInfo->PosY);
|
DBG_IND("[%s:%d]padding=%d,param_img.dst_region.w=%d,stampInfo->PosY=%d\n", __FUNCTION__, __LINE__, padding, param_img.dst_region.w, stampInfo->PosY);
|
||||||
if(res_id == LV_PLUGIN_IMG_ID_ICON_10234_GPS)
|
// if(res_id == LV_PLUGIN_IMG_ID_ICON_10234_GPS)
|
||||||
{
|
// {
|
||||||
param_img.dst_region.x = ALIGN_FLOOR_8(*x_curr_ofs - param_img.dst_region.w);
|
// param_img.dst_region.x = ALIGN_FLOOR_8(*x_curr_ofs - param_img.dst_region.w);
|
||||||
}
|
// }
|
||||||
else
|
// else
|
||||||
{
|
{
|
||||||
param_img.dst_region.x = (*x_curr_ofs - padding - param_img.dst_region.w);
|
param_img.dst_region.x = (*x_curr_ofs - padding - param_img.dst_region.w);
|
||||||
}
|
}
|
||||||
|
@ -1442,7 +1442,7 @@ ER UiDateImprint_CopyData(DS_STAMP_INFOR *stampInfo,HD_VIDEO_FRAME* Img, UINT32
|
||||||
UiDateImprint_AttachString(stampInfo, Img, customString, true, padding, &x_curr_ofs);
|
UiDateImprint_AttachString(stampInfo, Img, customString, true, padding, &x_curr_ofs);
|
||||||
}
|
}
|
||||||
|
|
||||||
UiDateImprint_AttachICON(stampInfo, Img, LV_PLUGIN_IMG_ID_ICON_10234_GPS, true, padding, &x_curr_ofs);
|
// UiDateImprint_AttachICON(stampInfo, Img, LV_PLUGIN_IMG_ID_ICON_10234_GPS, true, padding, &x_curr_ofs);
|
||||||
}
|
}
|
||||||
|
|
||||||
//logo stamp
|
//logo stamp
|
||||||
|
|
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 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 it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"event callback": "UIFlowPasswordEventCallback",
|
"event callback": "UIFlowPasswordEventCallback",
|
||||||
"name": "UIFlowPassword",
|
"name": "UIFlowPassword",
|
||||||
"screen color": "0xffffff",
|
"screen color": "0x000000",
|
||||||
"widgets": [
|
"widgets": [
|
||||||
{
|
{
|
||||||
"auto size": true,
|
"auto size": true,
|
||||||
|
|
|
@ -2360,6 +2360,102 @@
|
||||||
"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": 16,
|
||||||
|
"unicode range names": [
|
||||||
|
"Ascii"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"bpp": 1,
|
||||||
|
"compressed": false,
|
||||||
|
"custom code range": "",
|
||||||
|
"file path": "fonts/ARIALUNI.TTF",
|
||||||
|
"include language table": true,
|
||||||
|
"name": "ARIALUNI",
|
||||||
|
"size": 18,
|
||||||
|
"unicode range names": [
|
||||||
|
"Ascii"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"bpp": 1,
|
||||||
|
"compressed": false,
|
||||||
|
"custom code range": "",
|
||||||
|
"file path": "fonts/ARIALUNI.TTF",
|
||||||
|
"include language table": true,
|
||||||
|
"name": "ARIALUNI",
|
||||||
|
"size": 32,
|
||||||
|
"unicode range names": [
|
||||||
|
"Ascii"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"bpp": 1,
|
||||||
|
"compressed": false,
|
||||||
|
"custom code range": "",
|
||||||
|
"file path": "fonts/ARIALUNI.TTF",
|
||||||
|
"include language table": true,
|
||||||
|
"name": "ARIALUNI",
|
||||||
|
"size": 48,
|
||||||
|
"unicode range names": [
|
||||||
|
"Ascii"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"bpp": 1,
|
||||||
|
"compressed": false,
|
||||||
|
"custom code range": "",
|
||||||
|
"file path": "fonts/ARIALUNI.TTF",
|
||||||
|
"include language table": true,
|
||||||
|
"name": "ARIALUNI",
|
||||||
|
"size": 60,
|
||||||
|
"unicode range names": [
|
||||||
|
"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/ARIALUNI.TTF",
|
||||||
|
"include language table": true,
|
||||||
|
"name": "ARIALUNI",
|
||||||
|
"size": 86,
|
||||||
|
"unicode range names": [
|
||||||
|
"Ascii"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"bpp": 1,
|
||||||
|
"compressed": false,
|
||||||
|
"custom code range": "",
|
||||||
|
"file path": "fonts/ARIALUNI.TTF",
|
||||||
|
"include language table": true,
|
||||||
|
"name": "ARIALUNI",
|
||||||
|
"size": 106,
|
||||||
|
"unicode range names": [
|
||||||
|
"Ascii"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"images": [
|
"images": [
|
||||||
|
|
|
@ -436,6 +436,14 @@ lv_plugin_font_t lv_plugin_UIFlowLVGL_font_table[] =
|
||||||
{ ¬osanscjksc_black_16_1bpp },
|
{ ¬osanscjksc_black_16_1bpp },
|
||||||
{ ¬osanscjktc_black_16_1bpp },
|
{ ¬osanscjktc_black_16_1bpp },
|
||||||
{ ¬osans_black_8_1bpp },
|
{ ¬osans_black_8_1bpp },
|
||||||
|
{ &arialuni_16_1bpp },
|
||||||
|
{ &arialuni_18_1bpp },
|
||||||
|
{ &arialuni_32_1bpp },
|
||||||
|
{ &arialuni_48_1bpp },
|
||||||
|
{ &arialuni_60_1bpp },
|
||||||
|
{ &arialuni_74_1bpp },
|
||||||
|
{ &arialuni_86_1bpp },
|
||||||
|
{ &arialuni_106_1bpp },
|
||||||
};
|
};
|
||||||
|
|
||||||
lv_plugin_string_t* lv_plugin_language_table[] = {
|
lv_plugin_string_t* lv_plugin_language_table[] = {
|
||||||
|
|
|
@ -57,6 +57,14 @@ LV_FONT_DECLARE(notosanscjkjp_black_16_1bpp);
|
||||||
LV_FONT_DECLARE(notosanscjksc_black_16_1bpp);
|
LV_FONT_DECLARE(notosanscjksc_black_16_1bpp);
|
||||||
LV_FONT_DECLARE(notosanscjktc_black_16_1bpp);
|
LV_FONT_DECLARE(notosanscjktc_black_16_1bpp);
|
||||||
LV_FONT_DECLARE(notosans_black_8_1bpp);
|
LV_FONT_DECLARE(notosans_black_8_1bpp);
|
||||||
|
LV_FONT_DECLARE(arialuni_16_1bpp);
|
||||||
|
LV_FONT_DECLARE(arialuni_18_1bpp);
|
||||||
|
LV_FONT_DECLARE(arialuni_32_1bpp);
|
||||||
|
LV_FONT_DECLARE(arialuni_48_1bpp);
|
||||||
|
LV_FONT_DECLARE(arialuni_60_1bpp);
|
||||||
|
LV_FONT_DECLARE(arialuni_74_1bpp);
|
||||||
|
LV_FONT_DECLARE(arialuni_86_1bpp);
|
||||||
|
LV_FONT_DECLARE(arialuni_106_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);
|
||||||
|
@ -855,7 +863,15 @@ LV_IMG_DECLARE(sf_camera_network_selection);
|
||||||
#define LV_PLUGIN_FONT_ID_NOTOSANSCJKSC_BLACK_16_1BPP 3
|
#define LV_PLUGIN_FONT_ID_NOTOSANSCJKSC_BLACK_16_1BPP 3
|
||||||
#define LV_PLUGIN_FONT_ID_NOTOSANSCJKTC_BLACK_16_1BPP 4
|
#define LV_PLUGIN_FONT_ID_NOTOSANSCJKTC_BLACK_16_1BPP 4
|
||||||
#define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP 5
|
#define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP 5
|
||||||
#define LV_PLUGIN_FONT_TABLE_SIZE 6
|
#define LV_PLUGIN_FONT_ID_ARIALUNI_16_1BPP 6
|
||||||
|
#define LV_PLUGIN_FONT_ID_ARIALUNI_18_1BPP 7
|
||||||
|
#define LV_PLUGIN_FONT_ID_ARIALUNI_32_1BPP 8
|
||||||
|
#define LV_PLUGIN_FONT_ID_ARIALUNI_48_1BPP 9
|
||||||
|
#define LV_PLUGIN_FONT_ID_ARIALUNI_60_1BPP 10
|
||||||
|
#define LV_PLUGIN_FONT_ID_ARIALUNI_74_1BPP 11
|
||||||
|
#define LV_PLUGIN_FONT_ID_ARIALUNI_86_1BPP 12
|
||||||
|
#define LV_PLUGIN_FONT_ID_ARIALUNI_106_1BPP 13
|
||||||
|
#define LV_PLUGIN_FONT_TABLE_SIZE 14
|
||||||
|
|
||||||
#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
|
||||||
|
|
|
@ -16,7 +16,7 @@ lv_obj_t* UIFlowPassword_create(){
|
||||||
lv_obj_set_event_cb(parent, UIFlowPasswordEventCallback);
|
lv_obj_set_event_cb(parent, UIFlowPasswordEventCallback);
|
||||||
|
|
||||||
lv_color_t color = {0};
|
lv_color_t color = {0};
|
||||||
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00);
|
||||||
_lv_obj_set_style_local_color(parent,0,LV_STYLE_BG_COLOR, color);
|
_lv_obj_set_style_local_color(parent,0,LV_STYLE_BG_COLOR, color);
|
||||||
|
|
||||||
if(color.full== LV_COLOR_TRANSP.full){
|
if(color.full== LV_COLOR_TRANSP.full){
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user