清除屏幕的页面切换版本
This commit is contained in:
@@ -2,14 +2,14 @@
|
||||
<CodeBlocks_layout_file>
|
||||
<FileVersion major="1" minor="0" />
|
||||
<ActiveTarget name="Debug" />
|
||||
<File name="main.c" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="0" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="lvgl\lvgl.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="0" topLine="27" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="main.c" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1284" topLine="25" />
|
||||
</Cursor>
|
||||
</File>
|
||||
</CodeBlocks_layout_file>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*******************************************************************************
|
||||
* Size: 24 px
|
||||
* Bpp: 4
|
||||
* Opts: --bpp 4 --size 24 --no-compress --font simhei.ttf --symbols 您有新的留言更多通知今天人敲门语言时间锁恢复出厂设备绑定关于置开方向常模式自动反哨兵老化测试中文正翻转经过门前将清空所用户数据确定继续认取消请打开手机添加二维码放在镜头前扫描成功失败年月日分秒完当检测新版本接听拒绝挂断信息前已是最星期一三四五六天稍等 --range 32-127 --format lvgl -o lv_font_heiti24.c
|
||||
* Opts: --bpp 4 --size 24 --no-compress --font simhei.ttf --symbols 您有新的留言更多通知今天人敲门语言时间锁恢复出厂设备绑定关于置开方向常模式自动反哨兵老化测试中文正翻转经过门前将清空所用户数据确定继续认取消请打开手机添加二维码放在镜头前扫描成功失败年月日分秒完当检测新版本接听拒绝挂断信息前已是最星期一三四五六到否需要异更网络配置稍等？ --range 32-127 --format lvgl -o lv_font_heiti24.c
|
||||
******************************************************************************/
|
||||
|
||||
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
|
||||
@@ -1484,6 +1484,40 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0,
|
||||
|
||||
/* U+5230 "到" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x8, 0xa2, 0x6, 0x55, 0x55, 0x55, 0x55,
|
||||
0x55, 0x50, 0x0, 0x0, 0xd, 0xf2, 0x1f, 0xff,
|
||||
0xff, 0xff, 0xff, 0xff, 0xd0, 0x0, 0x0, 0xd,
|
||||
0xf1, 0x5, 0x54, 0x5f, 0x84, 0x44, 0x45, 0x40,
|
||||
0x7a, 0x20, 0xd, 0xf1, 0x0, 0x0, 0x6f, 0xf2,
|
||||
0x0, 0x0, 0x0, 0xbf, 0x20, 0xd, 0xf1, 0x0,
|
||||
0x0, 0xef, 0x50, 0x3d, 0x60, 0x0, 0xbf, 0x10,
|
||||
0xd, 0xf1, 0x0, 0x9, 0xf7, 0x0, 0x4f, 0xf2,
|
||||
0x0, 0xbf, 0x10, 0xd, 0xf1, 0x0, 0x7f, 0xb0,
|
||||
0x0, 0x9, 0xfd, 0x0, 0xbf, 0x10, 0xd, 0xf1,
|
||||
0x1c, 0xff, 0x66, 0x78, 0x9a, 0xff, 0x90, 0xbf,
|
||||
0x10, 0xd, 0xf1, 0xf, 0xff, 0xff, 0xff, 0xfe,
|
||||
0xdf, 0xf3, 0xbf, 0x10, 0xd, 0xf1, 0x8, 0x75,
|
||||
0x49, 0xf9, 0x0, 0x9, 0x40, 0xbf, 0x10, 0xd,
|
||||
0xf1, 0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0,
|
||||
0xbf, 0x10, 0xd, 0xf1, 0x0, 0x0, 0x7, 0xf8,
|
||||
0x0, 0x0, 0x0, 0xbf, 0x10, 0xd, 0xf1, 0xb,
|
||||
0xbb, 0xbd, 0xfd, 0xbb, 0xbc, 0x0, 0xbf, 0x10,
|
||||
0xd, 0xf1, 0xe, 0xdd, 0xde, 0xfe, 0xdd, 0xef,
|
||||
0x0, 0xbf, 0x10, 0xd, 0xf1, 0x0, 0x0, 0x7,
|
||||
0xf8, 0x0, 0x0, 0x0, 0xbf, 0x10, 0xd, 0xf1,
|
||||
0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0xcf,
|
||||
0x20, 0xd, 0xf1, 0x0, 0x0, 0x7, 0xf8, 0x0,
|
||||
0x24, 0x71, 0x1, 0x0, 0xd, 0xf1, 0x2, 0x34,
|
||||
0x6b, 0xfe, 0xdf, 0xff, 0xf0, 0x0, 0x0, 0xd,
|
||||
0xf0, 0x6f, 0xff, 0xff, 0xff, 0xdb, 0x96, 0x40,
|
||||
0x0, 0x0, 0x2f, 0xf0, 0x3f, 0xeb, 0x85, 0x20,
|
||||
0x0, 0x0, 0x0, 0x0, 0xef, 0xff, 0xd0, 0x2,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9f,
|
||||
0xfb, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x12, 0x0, 0x0,
|
||||
|
||||
/* U+524D "前" */
|
||||
0x0, 0x0, 0x0, 0x18, 0x90, 0x0, 0x0, 0x0,
|
||||
0xb7, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1e,
|
||||
@@ -1784,6 +1818,40 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
||||
0x0, 0xa, 0xff, 0xfd, 0x1, 0xec, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x4f, 0xda, 0x20,
|
||||
|
||||
/* U+5426 "否" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x2f, 0xff, 0xff, 0xff,
|
||||
0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x0, 0x1,
|
||||
0xba, 0xaa, 0xaa, 0xaa, 0xef, 0xfa, 0xaa, 0xaa,
|
||||
0xab, 0x90, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f,
|
||||
0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x6f, 0xfc, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x9f, 0xff, 0xc0,
|
||||
0xa, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4,
|
||||
0xdf, 0xfb, 0xfc, 0x4, 0xff, 0xe7, 0x0, 0x0,
|
||||
0x0, 0x0, 0x2a, 0xff, 0xd4, 0x4f, 0xc0, 0x5,
|
||||
0xdf, 0xfe, 0x70, 0x0, 0x3, 0xaf, 0xff, 0x80,
|
||||
0x4, 0xfc, 0x0, 0x0, 0x6e, 0xff, 0xe6, 0x7,
|
||||
0xff, 0xf9, 0x10, 0x0, 0x4f, 0xc0, 0x0, 0x0,
|
||||
0x7, 0xff, 0xd0, 0xd, 0xa2, 0x0, 0x0, 0x4,
|
||||
0xfc, 0x0, 0x0, 0x0, 0x2, 0xb4, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x5f, 0xc0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x4, 0xff, 0xff, 0xff, 0xff,
|
||||
0xff, 0xff, 0xff, 0xa0, 0x0, 0x0, 0x0, 0x3f,
|
||||
0xea, 0xaa, 0xaa, 0xaa, 0xaa, 0xac, 0xfa, 0x0,
|
||||
0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x5f, 0xa0, 0x0, 0x0, 0x0, 0x3f, 0xc0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x5, 0xfa, 0x0, 0x0,
|
||||
0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x5f, 0xa0, 0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x5, 0xfa, 0x0, 0x0, 0x0,
|
||||
0x3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
||||
0xa0, 0x0, 0x0, 0x0, 0x3f, 0xea, 0xaa, 0xaa,
|
||||
0xaa, 0xaa, 0xac, 0xfa, 0x0, 0x0, 0x0, 0x3,
|
||||
0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0xa0,
|
||||
0x0, 0x0, 0x0, 0x3, 0x20, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
|
||||
/* U+542C "听" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
@@ -2355,6 +2423,39 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
||||
0xff, 0x0, 0x0, 0x0, 0x0, 0x7a, 0x0, 0x0,
|
||||
0x0, 0x0, 0x2, 0xff, 0x0, 0x0, 0x0,
|
||||
|
||||
/* U+5F02 "异" */
|
||||
0x0, 0xd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
||||
0xff, 0x20, 0x0, 0x0, 0xd, 0xf7, 0x77, 0x77,
|
||||
0x77, 0x77, 0x77, 0xdf, 0x0, 0x0, 0x0, 0xc,
|
||||
0xf1, 0x0, 0x0, 0x0, 0x0, 0x0, 0xcf, 0x0,
|
||||
0x0, 0x0, 0xc, 0xf1, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0xcf, 0x0, 0x0, 0x0, 0xc, 0xff, 0xff,
|
||||
0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x0, 0x0,
|
||||
0xc, 0xf7, 0x77, 0x77, 0x78, 0x88, 0x88, 0x88,
|
||||
0x10, 0x0, 0x0, 0xc, 0xf1, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x37, 0x10, 0x0, 0xc, 0xf2,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6f, 0x90,
|
||||
0x0, 0xb, 0xfe, 0xa9, 0x99, 0x99, 0x99, 0x99,
|
||||
0x99, 0xef, 0x20, 0x0, 0x3, 0xce, 0xee, 0xee,
|
||||
0xee, 0xee, 0xee, 0xee, 0xd7, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x7d, 0x80, 0x0, 0x0,
|
||||
0xef, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
|
||||
0x70, 0x0, 0x0, 0xdf, 0x10, 0x0, 0x0, 0x9c,
|
||||
0xbb, 0xbb, 0xdf, 0xdb, 0xbb, 0xbb, 0xff, 0xbb,
|
||||
0xbc, 0xc6, 0xae, 0xed, 0xdd, 0xff, 0xed, 0xdd,
|
||||
0xdd, 0xff, 0xdd, 0xde, 0xe7, 0x0, 0x0, 0x0,
|
||||
0xdf, 0x0, 0x0, 0x0, 0xdf, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x5, 0xfa, 0x0, 0x0, 0x0, 0xdf,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0xf2, 0x0,
|
||||
0x0, 0x0, 0xdf, 0x0, 0x0, 0x0, 0x0, 0x28,
|
||||
0xff, 0x60, 0x0, 0x0, 0x0, 0xdf, 0x0, 0x0,
|
||||
0x0, 0x1d, 0xff, 0xe4, 0x0, 0x0, 0x0, 0x0,
|
||||
0xdf, 0x10, 0x0, 0x0, 0x6, 0xe7, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0xef, 0x10, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0,
|
||||
|
||||
/* U+5F0F "式" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0xa, 0x92, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
@@ -4215,6 +4316,43 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
|
||||
/* U+7EDC "络" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x32, 0x0,
|
||||
0x0, 0x0, 0x5f, 0xd0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x9f, 0x70, 0x0, 0x0, 0xaf, 0x70,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xef, 0x20,
|
||||
0x0, 0x0, 0xff, 0x98, 0x88, 0x88, 0x85, 0x0,
|
||||
0x0, 0x5, 0xf8, 0x0, 0x0, 0x7, 0xff, 0xff,
|
||||
0xff, 0xff, 0xf2, 0x0, 0x0, 0xc, 0xf1, 0x7,
|
||||
0x10, 0x1f, 0xfe, 0x0, 0x0, 0x6f, 0xa0, 0x0,
|
||||
0x0, 0x4f, 0x70, 0x1f, 0xf1, 0x9f, 0xdf, 0x70,
|
||||
0x1, 0xef, 0x10, 0x0, 0x1, 0xee, 0x0, 0x8f,
|
||||
0x85, 0xfc, 0xe, 0xf2, 0xb, 0xf6, 0x0, 0x0,
|
||||
0xc, 0xfb, 0x77, 0xfe, 0xa, 0xf2, 0x6, 0xfc,
|
||||
0x9f, 0xa0, 0x0, 0x0, 0xe, 0xff, 0xef, 0xf5,
|
||||
0x0, 0x20, 0x0, 0xbf, 0xfc, 0x0, 0x0, 0x0,
|
||||
0x4, 0x30, 0x1f, 0xc0, 0x0, 0x0, 0x4, 0xef,
|
||||
0xfd, 0x40, 0x0, 0x0, 0x0, 0x0, 0x9f, 0x30,
|
||||
0x0, 0x6, 0xdf, 0xe6, 0x8f, 0xfd, 0x83, 0x0,
|
||||
0x0, 0x3, 0xf9, 0x0, 0x1b, 0xff, 0xf9, 0x10,
|
||||
0x1, 0x9f, 0xff, 0xf2, 0x0, 0x1d, 0xe1, 0x14,
|
||||
0x3a, 0xfd, 0x87, 0x77, 0x77, 0x78, 0xdd, 0xc0,
|
||||
0x2, 0xdf, 0xef, 0xff, 0x81, 0xa, 0xff, 0xff,
|
||||
0xff, 0xff, 0xb0, 0x10, 0x0, 0xff, 0xfc, 0x97,
|
||||
0x30, 0x9, 0xf1, 0x0, 0x0, 0x1f, 0xa0, 0x0,
|
||||
0x0, 0x42, 0x0, 0x0, 0x0, 0x9, 0xf1, 0x0,
|
||||
0x0, 0x1f, 0x90, 0x0, 0x0, 0x0, 0x0, 0x4,
|
||||
0x80, 0x9, 0xf1, 0x0, 0x0, 0x1f, 0x90, 0x0,
|
||||
0x0, 0x4, 0x7b, 0xff, 0xf0, 0x9, 0xf1, 0x0,
|
||||
0x0, 0x1f, 0x90, 0x0, 0x4, 0xff, 0xfe, 0xa5,
|
||||
0x10, 0x9, 0xff, 0xff, 0xff, 0xff, 0x90, 0x0,
|
||||
0x0, 0xda, 0x50, 0x0, 0x0, 0xa, 0xf9, 0x88,
|
||||
0x88, 0x9f, 0xa0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0xa, 0xf1, 0x0, 0x0, 0x1f, 0xa0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x30, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0,
|
||||
|
||||
/* U+7EDD "绝" */
|
||||
0x0, 0x0, 0x11, 0x0, 0x0, 0x0, 0x18, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xe6, 0x0,
|
||||
@@ -4353,6 +4491,35 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
||||
0x66, 0x20, 0x0, 0x0, 0x0, 0x0, 0xa, 0xf1,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
|
||||
/* U+7F51 "网" */
|
||||
0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
|
||||
0x88, 0x88, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff,
|
||||
0xff, 0xff, 0xff, 0xfe, 0xdf, 0x10, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x1, 0xfd, 0xcf, 0x10,
|
||||
0x0, 0x0, 0x30, 0x0, 0x0, 0x2, 0x1, 0xfc,
|
||||
0xcf, 0x11, 0x30, 0x0, 0xfe, 0x20, 0x0, 0x2f,
|
||||
0x91, 0xfc, 0xcf, 0x3f, 0xe0, 0x3, 0xfc, 0x3,
|
||||
0x0, 0x6f, 0xa1, 0xfc, 0xcf, 0x17, 0xf7, 0x7,
|
||||
0xf5, 0xbf, 0x30, 0xaf, 0x31, 0xfc, 0xcf, 0x10,
|
||||
0xdf, 0x2c, 0xf0, 0x5f, 0xb0, 0xed, 0x1, 0xfc,
|
||||
0xcf, 0x10, 0x3f, 0xbf, 0xa0, 0xb, 0xf8, 0xf8,
|
||||
0x1, 0xfc, 0xcf, 0x10, 0xa, 0xff, 0x40, 0x2,
|
||||
0xff, 0xf2, 0x1, 0xfc, 0xcf, 0x10, 0x2, 0xff,
|
||||
0x0, 0x0, 0x9f, 0xc0, 0x1, 0xfc, 0xcf, 0x10,
|
||||
0x6, 0xff, 0x70, 0x0, 0x9f, 0xe0, 0x1, 0xfc,
|
||||
0xcf, 0x10, 0xe, 0xee, 0xf2, 0x2, 0xff, 0xf7,
|
||||
0x1, 0xfc, 0xcf, 0x10, 0x8f, 0x67, 0xfb, 0xc,
|
||||
0xf6, 0xff, 0x11, 0xfc, 0xcf, 0x12, 0xfd, 0x0,
|
||||
0xc3, 0x7f, 0xb0, 0x9f, 0x91, 0xfc, 0xcf, 0x1b,
|
||||
0xf4, 0x0, 0x5, 0xff, 0x10, 0x1f, 0xc1, 0xfc,
|
||||
0xcf, 0x6f, 0xb0, 0x0, 0x1e, 0xf5, 0x0, 0x1,
|
||||
0x1, 0xfc, 0xcf, 0x13, 0x10, 0x0, 0x0, 0x60,
|
||||
0x0, 0x0, 0x1, 0xfc, 0xdf, 0x10, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x5, 0xfc, 0xdf, 0x10,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0xc, 0xff, 0xfa,
|
||||
0xff, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4,
|
||||
0xeb, 0x81,
|
||||
|
||||
/* U+7F6E "置" */
|
||||
0x0, 0x45, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
|
||||
0x55, 0x53, 0x0, 0x0, 0xcf, 0xee, 0xee, 0xfe,
|
||||
@@ -4481,6 +4648,41 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
||||
0x0, 0x0, 0x0, 0xb, 0xf2, 0xf, 0xd0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0xb, 0xf2,
|
||||
|
||||
/* U+8981 "要" */
|
||||
0x5, 0x99, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
|
||||
0x88, 0x88, 0x99, 0x30, 0x7, 0xee, 0xdd, 0xdd,
|
||||
0xef, 0xed, 0xde, 0xfe, 0xdd, 0xdd, 0xee, 0x40,
|
||||
0x0, 0x0, 0x0, 0x0, 0x7f, 0x50, 0x5, 0xf6,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x7f, 0x50, 0x5, 0xf6, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
||||
0xff, 0xff, 0x90, 0x0, 0x0, 0x9, 0xfa, 0x88,
|
||||
0xcf, 0xb8, 0x8b, 0xfb, 0x88, 0xaf, 0x90, 0x0,
|
||||
0x0, 0x8, 0xf4, 0x0, 0x7f, 0x50, 0x5, 0xf6,
|
||||
0x0, 0x4f, 0x80, 0x0, 0x0, 0x8, 0xf4, 0x0,
|
||||
0x7f, 0x50, 0x5, 0xf6, 0x0, 0x4f, 0x80, 0x0,
|
||||
0x0, 0x9, 0xf8, 0x66, 0xaf, 0x96, 0x69, 0xfa,
|
||||
0x66, 0x8f, 0x90, 0x0, 0x0, 0x9, 0xff, 0xff,
|
||||
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x90, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x1, 0xe7, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0xb, 0xfa, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10,
|
||||
0x4f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
||||
0xff, 0xff, 0xff, 0xf1, 0x29, 0x98, 0x88, 0x8b,
|
||||
0xfe, 0x88, 0x88, 0x9f, 0xf8, 0x88, 0x99, 0xa0,
|
||||
0x0, 0x0, 0x0, 0x3f, 0xe3, 0x0, 0x0, 0x9f,
|
||||
0x60, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xef,
|
||||
0xc6, 0x20, 0x6, 0xfb, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x4, 0x8c, 0xff, 0xfe, 0xaf, 0xd1,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x3, 0x8f, 0xff, 0xfb, 0x62, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x4a, 0xff, 0x95, 0xaf,
|
||||
0xff, 0xd8, 0x30, 0x0, 0x3, 0x88, 0x9b, 0xdf,
|
||||
0xff, 0x92, 0x0, 0x0, 0x4a, 0xff, 0xfd, 0x20,
|
||||
0x0, 0xcf, 0xff, 0xd9, 0x50, 0x0, 0x0, 0x0,
|
||||
0x0, 0x17, 0xd6, 0x0, 0x0, 0x24, 0x20, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
|
||||
/* U+8A00 "言" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x1, 0x60, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff,
|
||||
@@ -4834,6 +5036,40 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0,
|
||||
|
||||
/* U+914D "配" */
|
||||
0x2c, 0xcb, 0xbb, 0xbb, 0xbc, 0xcc, 0x2e, 0xdd,
|
||||
0xdd, 0xdd, 0xd2, 0x2, 0xee, 0xde, 0xfd, 0xff,
|
||||
0xde, 0xe2, 0xdc, 0xcc, 0xcc, 0xef, 0x20, 0x0,
|
||||
0x0, 0x8e, 0x9, 0xe0, 0x0, 0x0, 0x0, 0x0,
|
||||
0xa, 0xf2, 0x0, 0x0, 0x8, 0xe0, 0x9e, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0xaf, 0x20, 0x3, 0x55,
|
||||
0xae, 0x5b, 0xf5, 0x55, 0x0, 0x0, 0x0, 0xa,
|
||||
0xf2, 0x0, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xf0,
|
||||
0x0, 0x0, 0x0, 0xaf, 0x20, 0x9, 0xf2, 0x9e,
|
||||
0x19, 0xd1, 0xcf, 0x0, 0x0, 0x0, 0xa, 0xf2,
|
||||
0x0, 0x8f, 0x19, 0xd0, 0x9d, 0xc, 0xe0, 0x0,
|
||||
0x0, 0x0, 0xaf, 0x20, 0x8, 0xf1, 0xac, 0x9,
|
||||
0xd0, 0xce, 0x1, 0xff, 0xff, 0xff, 0xf3, 0x0,
|
||||
0x8f, 0x1d, 0xb0, 0x9d, 0xc, 0xe0, 0xf, 0xd8,
|
||||
0x88, 0x88, 0x10, 0x8, 0xf3, 0xf8, 0x9, 0xf5,
|
||||
0xde, 0x0, 0xfa, 0x0, 0x0, 0x0, 0x0, 0x8f,
|
||||
0xaf, 0x40, 0x6f, 0xff, 0xe0, 0xf, 0xa0, 0x0,
|
||||
0x0, 0x0, 0x8, 0xfa, 0xd0, 0x0, 0x34, 0xde,
|
||||
0x0, 0xfa, 0x0, 0x0, 0x0, 0x0, 0x8f, 0x10,
|
||||
0x0, 0x0, 0xc, 0xe0, 0xf, 0xa0, 0x0, 0x0,
|
||||
0x0, 0x8, 0xf6, 0x66, 0x66, 0x66, 0xde, 0x0,
|
||||
0xfa, 0x0, 0x0, 0x0, 0x0, 0x8f, 0xff, 0xff,
|
||||
0xff, 0xff, 0xe0, 0xf, 0xa0, 0x0, 0x0, 0x0,
|
||||
0x8, 0xf1, 0x0, 0x0, 0x0, 0xce, 0x0, 0xfa,
|
||||
0x0, 0x0, 0x22, 0x0, 0x8f, 0x77, 0x77, 0x77,
|
||||
0x7e, 0xe0, 0xf, 0xa0, 0x0, 0x6, 0xf8, 0x8,
|
||||
0xff, 0xff, 0xff, 0xff, 0xfe, 0x0, 0xfb, 0x0,
|
||||
0x0, 0x8f, 0x60, 0x9f, 0x10, 0x0, 0x0, 0xc,
|
||||
0xf0, 0xf, 0xf9, 0x88, 0x8f, 0xf1, 0x9, 0xf1,
|
||||
0x0, 0x0, 0x0, 0xcf, 0x0, 0x8f, 0xff, 0xff,
|
||||
0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x1, 0x11, 0x10, 0x0,
|
||||
|
||||
/* U+9501 "锁" */
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2,
|
||||
0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2f, 0x90,
|
||||
@@ -4968,7 +5204,55 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
||||
0xef, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa,
|
||||
0xff, 0xfa, 0xff, 0x20, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x5, 0xff, 0xb2, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x1, 0x41, 0x0
|
||||
0x0, 0x0, 0x0, 0x1, 0x41, 0x0,
|
||||
|
||||
/* U+9700 "需" */
|
||||
0x0, 0x1, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x1, 0x0, 0x0, 0x1f, 0xff, 0xff, 0xff,
|
||||
0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x0, 0x7,
|
||||
0x66, 0x66, 0x66, 0xdf, 0x66, 0x66, 0x66, 0x67,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xbf, 0x10,
|
||||
0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xff, 0xff,
|
||||
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf,
|
||||
0xd6, 0x66, 0x66, 0x66, 0xdf, 0x66, 0x66, 0x66,
|
||||
0x66, 0xfb, 0xf, 0xc0, 0x0, 0x0, 0x0, 0xbf,
|
||||
0x10, 0x22, 0x22, 0x1, 0xfb, 0x1f, 0xc0, 0xef,
|
||||
0xff, 0x70, 0xbf, 0x17, 0xff, 0xff, 0x1, 0xfb,
|
||||
0x7, 0x50, 0x34, 0x44, 0x20, 0xbf, 0x11, 0x22,
|
||||
0x22, 0x0, 0x75, 0x0, 0x1, 0x77, 0x77, 0x20,
|
||||
0xbf, 0x13, 0xaa, 0xaa, 0x0, 0x0, 0x0, 0x3,
|
||||
0xdd, 0xdd, 0x50, 0xbf, 0x23, 0xaa, 0xaa, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0xd, 0xff, 0xff, 0xff,
|
||||
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0x6,
|
||||
0x87, 0x77, 0x77, 0x77, 0xfd, 0x77, 0x77, 0x77,
|
||||
0x77, 0x85, 0x0, 0x0, 0x0, 0x0, 0x4, 0xf6,
|
||||
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff,
|
||||
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x40,
|
||||
0x0, 0x7f, 0x87, 0x79, 0xfb, 0x77, 0x8f, 0xd7,
|
||||
0x77, 0xcf, 0x30, 0x0, 0x6f, 0x20, 0x4, 0xf7,
|
||||
0x0, 0x2f, 0xb0, 0x0, 0xaf, 0x30, 0x0, 0x6f,
|
||||
0x20, 0x4, 0xf7, 0x0, 0x2f, 0xb0, 0x0, 0xaf,
|
||||
0x30, 0x0, 0x6f, 0x20, 0x4, 0xf7, 0x0, 0x2f,
|
||||
0xb0, 0x0, 0xbf, 0x30, 0x0, 0x7f, 0x20, 0x4,
|
||||
0xf7, 0x0, 0x2f, 0xb0, 0x6d, 0xff, 0x20, 0x0,
|
||||
0x7f, 0x20, 0x0, 0x31, 0x0, 0x3, 0x20, 0x1f,
|
||||
0xd7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x1, 0x0, 0x0,
|
||||
|
||||
/* U+FF1F "？" */
|
||||
0x0, 0x1, 0x32, 0x0, 0x0, 0x1, 0xaf, 0xff,
|
||||
0xc1, 0x0, 0xc, 0xfb, 0x8b, 0xfc, 0x0, 0x3f,
|
||||
0xb0, 0x0, 0xaf, 0x50, 0x6f, 0x60, 0x0, 0x4f,
|
||||
0x80, 0x37, 0x20, 0x0, 0x6f, 0x60, 0x0, 0x0,
|
||||
0x0, 0xcf, 0x20, 0x0, 0x0, 0x9, 0xf9, 0x0,
|
||||
0x0, 0x0, 0x6f, 0xd0, 0x0, 0x0, 0x1, 0xee,
|
||||
0x10, 0x0, 0x0, 0x7, 0xf5, 0x0, 0x0, 0x0,
|
||||
0xc, 0xe0, 0x0, 0x0, 0x0, 0xf, 0xb0, 0x0,
|
||||
0x0, 0x0, 0x4, 0x30, 0x0, 0x0, 0x0, 0x0,
|
||||
0x0, 0x0, 0x0, 0x0, 0x4b, 0xb2, 0x0, 0x0,
|
||||
0x0, 0x6f, 0xf3, 0x0, 0x0, 0x0, 0x6f, 0xf3,
|
||||
0x0, 0x0
|
||||
};
|
||||
|
||||
|
||||
@@ -5087,108 +5371,117 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
||||
{.bitmap_index = 8983, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 9236, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
|
||||
{.bitmap_index = 9456, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 9721, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 9985, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 10238, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 10491, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 10744, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 10986, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 11228, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 11470, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 11712, .adv_w = 384, .box_w = 21, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
|
||||
{.bitmap_index = 11943, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 12196, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 12449, .adv_w = 384, .box_w = 20, .box_h = 21, .ofs_x = 2, .ofs_y = -3},
|
||||
{.bitmap_index = 12659, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 12912, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 13165, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 13430, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
|
||||
{.bitmap_index = 13672, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 13924, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 14177, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 9721, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 9974, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 10238, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 10491, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 10744, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 10997, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 11239, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 11481, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 11723, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 11965, .adv_w = 384, .box_w = 21, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
|
||||
{.bitmap_index = 12196, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 12449, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 12702, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 12955, .adv_w = 384, .box_w = 20, .box_h = 21, .ofs_x = 2, .ofs_y = -3},
|
||||
{.bitmap_index = 13165, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 13418, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 13671, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 13936, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
|
||||
{.bitmap_index = 14178, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 14430, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 14683, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 14959, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 15235, .adv_w = 384, .box_w = 21, .box_h = 20, .ofs_x = 2, .ofs_y = -2},
|
||||
{.bitmap_index = 15445, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 15687, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 15940, .adv_w = 384, .box_w = 22, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 16171, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 16424, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
|
||||
{.bitmap_index = 16644, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 16909, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 17151, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 17416, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 17692, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 17934, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 18176, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 18418, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 18683, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 18948, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 19201, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 19477, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 19742, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 20018, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 20294, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 20570, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 20835, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 21100, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 21353, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 21606, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 21882, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 22135, .adv_w = 384, .box_w = 17, .box_h = 21, .ofs_x = 4, .ofs_y = -2},
|
||||
{.bitmap_index = 22314, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 22579, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 22832, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 23085, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 23327, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 23569, .adv_w = 384, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 23778, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 24043, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 24308, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 24550, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 24826, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 25090, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 25366, .adv_w = 384, .box_w = 21, .box_h = 20, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 25576, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 25841, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 26117, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 26393, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 26646, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 26888, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 27108, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 27350, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
|
||||
{.bitmap_index = 27580, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 27833, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 28086, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 28351, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 28615, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 28891, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 29167, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 29455, .adv_w = 384, .box_w = 22, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 29686, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 29939, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 30192, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 30434, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 30710, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 30963, .adv_w = 384, .box_w = 22, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 31194, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 31459, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 31712, .adv_w = 384, .box_w = 18, .box_h = 22, .ofs_x = 3, .ofs_y = -2},
|
||||
{.bitmap_index = 31910, .adv_w = 384, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 32141, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 32406, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 32659, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 32924, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 33200, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 33453, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 33729, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 33994, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 34259, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 34524, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 34800, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 35076, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
|
||||
{.bitmap_index = 35306, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3}
|
||||
{.bitmap_index = 14683, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 14936, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 15189, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 15465, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 15741, .adv_w = 384, .box_w = 21, .box_h = 20, .ofs_x = 2, .ofs_y = -2},
|
||||
{.bitmap_index = 15951, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 16193, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 16446, .adv_w = 384, .box_w = 22, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 16677, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 16919, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 17172, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
|
||||
{.bitmap_index = 17392, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 17657, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 17899, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 18164, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 18440, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 18682, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 18924, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 19166, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 19431, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 19696, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 19949, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 20225, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 20490, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 20766, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 21042, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 21318, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 21583, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 21848, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 22101, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 22354, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 22630, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 22883, .adv_w = 384, .box_w = 17, .box_h = 21, .ofs_x = 4, .ofs_y = -2},
|
||||
{.bitmap_index = 23062, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 23327, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 23580, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 23833, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 24075, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 24317, .adv_w = 384, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 24526, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 24791, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 25056, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 25298, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 25574, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 25838, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 26114, .adv_w = 384, .box_w = 21, .box_h = 20, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 26324, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 26589, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 26865, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 27141, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 27394, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 27636, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 27856, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 28098, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
|
||||
{.bitmap_index = 28328, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 28581, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 28834, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 29099, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 29363, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 29639, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 29915, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 30203, .adv_w = 384, .box_w = 22, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 30434, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 30687, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 30963, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 31216, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 31458, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 31734, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 31987, .adv_w = 384, .box_w = 20, .box_h = 21, .ofs_x = 2, .ofs_y = -2},
|
||||
{.bitmap_index = 32197, .adv_w = 384, .box_w = 22, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 32428, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 32693, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 32946, .adv_w = 384, .box_w = 18, .box_h = 22, .ofs_x = 3, .ofs_y = -2},
|
||||
{.bitmap_index = 33144, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 33408, .adv_w = 384, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 33639, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 33904, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 34157, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 34422, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 34698, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 34951, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 35227, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 35492, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 35757, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 36022, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 36275, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 36551, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 36827, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
|
||||
{.bitmap_index = 37057, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
|
||||
{.bitmap_index = 37287, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 37540, .adv_w = 384, .box_w = 10, .box_h = 18, .ofs_x = 3, .ofs_y = 0}
|
||||
};
|
||||
|
||||
/*---------------------
|
||||
@@ -5197,20 +5490,21 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
||||
|
||||
static const uint16_t unicode_list_1[] = {
|
||||
0x0, 0x9, 0x2d, 0x8c, 0x8e, 0x94, 0xba, 0xca,
|
||||
0x1e1, 0x36d, 0x373, 0x375, 0x3fa, 0x406, 0x44d, 0x49f,
|
||||
0x4a0, 0x4a8, 0x516, 0x582, 0x5cd, 0x5d6, 0x611, 0x62c,
|
||||
0x6e8, 0x8db, 0x928, 0xb07, 0xb0d, 0xb1a, 0xb29, 0xb31,
|
||||
0xb34, 0xd8c, 0xd9a, 0xe06, 0xff2, 0x1038, 0x1074, 0x1100,
|
||||
0x110f, 0x1153, 0x1262, 0x126f, 0x12a8, 0x1410, 0x1437, 0x1440,
|
||||
0x144b, 0x1453, 0x146b, 0x14d2, 0x1502, 0x156e, 0x15a5, 0x15cf,
|
||||
0x173e, 0x1770, 0x1772, 0x1787, 0x17ad, 0x17b0, 0x17b9, 0x17e5,
|
||||
0x17f6, 0x181f, 0x182f, 0x18f4, 0x1900, 0x1908, 0x1909, 0x191f,
|
||||
0x192c, 0x193a, 0x1ac0, 0x1c21, 0x1d63, 0x1f4b, 0x1f88, 0x1ffb,
|
||||
0x2005, 0x2448, 0x2728, 0x2759, 0x2884, 0x29e5, 0x2a01, 0x2a6e,
|
||||
0x2bd2, 0x2c0d, 0x2c7a, 0x2d49, 0x30cf, 0x30d1, 0x30dd, 0x30e7,
|
||||
0x30ed, 0x30f4, 0x316e, 0x31fb, 0x3201, 0x33ea, 0x3c00, 0x3da4,
|
||||
0x3dbe, 0x3dd5, 0x3ded, 0x3df7, 0x3f25, 0x416c, 0x41c7, 0x421a,
|
||||
0x4701, 0x475c, 0x47e8, 0x47f4
|
||||
0x1e1, 0x36d, 0x373, 0x375, 0x3fa, 0x406, 0x430, 0x44d,
|
||||
0x49f, 0x4a0, 0x4a8, 0x516, 0x582, 0x5cd, 0x5d6, 0x611,
|
||||
0x626, 0x62c, 0x6e8, 0x8db, 0x928, 0xb07, 0xb0d, 0xb1a,
|
||||
0xb29, 0xb31, 0xb34, 0xd8c, 0xd9a, 0xe06, 0xff2, 0x1038,
|
||||
0x1074, 0x1100, 0x1102, 0x110f, 0x1153, 0x1262, 0x126f, 0x12a8,
|
||||
0x1410, 0x1437, 0x1440, 0x144b, 0x1453, 0x146b, 0x14d2, 0x1502,
|
||||
0x156e, 0x15a5, 0x15cf, 0x173e, 0x1770, 0x1772, 0x1787, 0x17ad,
|
||||
0x17b0, 0x17b9, 0x17e5, 0x17f6, 0x181f, 0x182f, 0x18f4, 0x1900,
|
||||
0x1908, 0x1909, 0x191f, 0x192c, 0x193a, 0x1ac0, 0x1c21, 0x1d63,
|
||||
0x1f4b, 0x1f88, 0x1ffb, 0x2005, 0x2448, 0x2728, 0x2759, 0x2884,
|
||||
0x29e5, 0x2a01, 0x2a6e, 0x2bd2, 0x2c0d, 0x2c7a, 0x2d49, 0x30cf,
|
||||
0x30d1, 0x30dc, 0x30dd, 0x30e7, 0x30ed, 0x30f4, 0x3151, 0x316e,
|
||||
0x31fb, 0x3201, 0x33ea, 0x3b81, 0x3c00, 0x3da4, 0x3dbe, 0x3dd5,
|
||||
0x3ded, 0x3df7, 0x3f25, 0x416c, 0x41c7, 0x421a, 0x434d, 0x4701,
|
||||
0x475c, 0x47e8, 0x47f4, 0x4900, 0xb11f
|
||||
};
|
||||
|
||||
/*Collect the unicode lists and glyph_id offsets*/
|
||||
@@ -5221,8 +5515,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
|
||||
},
|
||||
{
|
||||
.range_start = 19968, .range_length = 18421, .glyph_id_start = 96,
|
||||
.unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 116, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
|
||||
.range_start = 19968, .range_length = 45344, .glyph_id_start = 96,
|
||||
.unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 125, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -15,15 +15,16 @@
|
||||
#include "lv_drivers/win32drv/win32drv.h"
|
||||
#include <windows.h>
|
||||
|
||||
/*******************************字体加载**********************************/
|
||||
LV_FONT_DECLARE(lv_font_heiti24)
|
||||
LV_FONT_DECLARE(lv_font_heiti100)
|
||||
|
||||
|
||||
/*******************************屏幕定义、参数**********************************/
|
||||
#define top() lv_scr_act()
|
||||
|
||||
#define scr_act_width() lv_obj_get_width(lv_scr_act())
|
||||
#define scr_act_height() lv_obj_get_height(lv_scr_act())
|
||||
|
||||
/*******************************外部图片定义**********************************/
|
||||
#define return_img "E:return.png"
|
||||
#define home_img "E:home.png"
|
||||
#define vol_img "E:vol.png"
|
||||
@@ -39,72 +40,85 @@ LV_FONT_DECLARE(lv_font_heiti100)
|
||||
#define record_img "E:record.png"
|
||||
#define onrecord_img "E:onrecord.png"
|
||||
|
||||
|
||||
static void hal_init(void);
|
||||
|
||||
/*******************************经常使用到的部件采用样式初始化**********************************/
|
||||
static lv_style_t btn_style;
|
||||
static lv_style_t btn_text_style;
|
||||
static lv_style_t scr_style;
|
||||
static lv_style_t return_style;
|
||||
static lv_style_t label_style;
|
||||
static lv_style_t list_style;
|
||||
|
||||
|
||||
/*******************************按键**********************************/
|
||||
static lv_obj_t *btn_set;
|
||||
static lv_obj_t *btn_notif;
|
||||
static lv_obj_t *btn_notify;
|
||||
static lv_obj_t *btn_msg;
|
||||
static lv_obj_t *btn_dial;
|
||||
static lv_obj_t *slider_vol;
|
||||
static lv_obj_t *slider_light;
|
||||
|
||||
static lv_obj_t *btn_yes;
|
||||
static lv_obj_t *btn_no;
|
||||
|
||||
static lv_obj_t *btn_accept;
|
||||
static lv_obj_t *btn_refuse;
|
||||
|
||||
static lv_obj_t *btn_app_acpt;
|
||||
static lv_obj_t *btn_app_rfse;
|
||||
|
||||
static lv_obj_t *btn_record;
|
||||
|
||||
static lv_obj_t *btn_return;
|
||||
static lv_obj_t *btn_home;
|
||||
static lv_obj_t *btn_return_set;
|
||||
|
||||
/*******************************滑块**********************************/
|
||||
static lv_obj_t *slider_vol;
|
||||
static lv_obj_t *slider_light;
|
||||
|
||||
/*******************************文本、定时器、图片**********************************/
|
||||
static lv_obj_t *label_yes;
|
||||
static lv_timer_t *timer;
|
||||
static lv_obj_t *img_record;
|
||||
static lv_obj_t *img_onrecord;
|
||||
|
||||
/*******************************列表**********************************/
|
||||
static lv_obj_t *msg_list;
|
||||
static lv_obj_t *notify_list;
|
||||
static lv_obj_t *setting_list;
|
||||
static lv_obj_t *door_setting_list;
|
||||
static lv_obj_t *language_list;
|
||||
|
||||
/*******************************日历滚轮**********************************/
|
||||
static lv_obj_t *roller_year;
|
||||
static lv_obj_t *roller_month;
|
||||
static lv_obj_t *roller_day;
|
||||
|
||||
|
||||
|
||||
/*******************************界面**********************************/
|
||||
static void main_gui(void);
|
||||
static void msg_gui(void);
|
||||
static void notify_gui(void);
|
||||
static void dial_gui(void);
|
||||
static void setting_gui(void);
|
||||
static void door_gui(void);
|
||||
static void language_gui(void);
|
||||
static void time_gui(void);
|
||||
static void wificonfg_gui(void);
|
||||
static void recovery_gui(void);
|
||||
static void bond_gui(void);
|
||||
static void info_gui(void);
|
||||
|
||||
|
||||
/*******************************回调函数**********************************/
|
||||
static void main_event_cb(lv_event_cb_t *e);
|
||||
static void msg_event_cb(lv_event_cb_t *e);
|
||||
static void noitify_event_cb(lv_event_cb_t *e);
|
||||
static void dial_event_cb(lv_event_cb_t *e);
|
||||
static void setting_event_cb(lv_event_cb_t *e);
|
||||
static void door_event_cb(lv_event_cb_t *e);
|
||||
static void language_event_cb(lv_event_cb_t *e);
|
||||
static void time_event_cb(lv_event_cb_t *e);
|
||||
static void recovery_event_cb(lv_event_cb_t *e);
|
||||
static void wificonfg_event_cb(lv_event_cb_t *e);
|
||||
static void bond_event_cb(lv_event_cb_t *e);
|
||||
static void info_event_cb(lv_event_cb_t *e);
|
||||
static void info_renew_event_cb(lv_event_cb_t *e);
|
||||
static void timer_callback(lv_timer_t *timer);
|
||||
|
||||
/*******************************变量**********************************/
|
||||
typedef struct
|
||||
{
|
||||
int year;
|
||||
@@ -115,12 +129,17 @@ typedef struct
|
||||
char *weekday;
|
||||
}lv_time_t;
|
||||
|
||||
static uint32_t cntdown;
|
||||
|
||||
/*******************************封装功能函数**********************************/
|
||||
static void lv_obj_show_battery(int batterylevel, lv_obj_t *parent);
|
||||
static void lv_obj_show_wifi(int connect_state, lv_obj_t *parent);
|
||||
static void lv_obj_show_time(lv_time_t *time, lv_obj_t *parent);
|
||||
|
||||
|
||||
|
||||
|
||||
/*样式初始化，只初始化一次就行*/
|
||||
static void lv_obj_style_init(void)
|
||||
{
|
||||
/*创建btn_style*/
|
||||
@@ -142,25 +161,33 @@ static void lv_obj_style_init(void)
|
||||
lv_style_set_width(&scr_style, 720);
|
||||
lv_style_set_height(&scr_style, 1280);
|
||||
lv_style_set_text_font(&scr_style, &lv_font_heiti24);
|
||||
lv_style_set_bg_color(&scr_style, lv_color_hex(0xE0FFFF));
|
||||
|
||||
/*创建return_style*/
|
||||
lv_style_init(&return_style);
|
||||
lv_style_set_width(&return_style, 38);
|
||||
lv_style_set_height(&return_style, 38);
|
||||
|
||||
/*创建list_style*/
|
||||
lv_style_init(&list_style);
|
||||
lv_style_set_width(&list_style, scr_act_width());
|
||||
lv_style_set_height(&list_style, scr_act_height() - 100);
|
||||
lv_style_set_bg_opa(&list_style, LV_OPA_TRANSP);
|
||||
lv_style_set_pad_hor(&list_style, 0); /*填充列表空隙*/
|
||||
}
|
||||
|
||||
/*主界面*/
|
||||
static void main_gui(void)
|
||||
{
|
||||
lv_obj_clean(top());
|
||||
lv_obj_t *scr = lv_obj_create(NULL);
|
||||
lv_obj_add_style(scr, &scr_style, 0);
|
||||
lv_scr_load(scr);
|
||||
|
||||
lv_obj_t *tileview = lv_tileview_create(scr);
|
||||
lv_obj_set_style_bg_opa(tileview, LV_OPA_TRANSP, 0);
|
||||
lv_obj_set_style_opa(tileview, LV_OPA_TRANSP, LV_PART_SCROLLBAR);
|
||||
|
||||
lv_obj_t *scr_app = lv_tileview_add_tile(tileview, 0, 1, LV_DIR_RIGHT);
|
||||
lv_obj_t *scr_main = lv_tileview_add_tile(tileview, 1, 1, LV_DIR_HOR );
|
||||
lv_obj_t *scr_ring = lv_tileview_add_tile(tileview, 2, 1, LV_DIR_LEFT);
|
||||
lv_obj_set_tile(tileview, scr_main, LV_ANIM_OFF);
|
||||
@@ -180,11 +207,12 @@ static void main_gui(void)
|
||||
lv_obj_show_wifi(1, scr);
|
||||
lv_obj_show_time(&time, scr);
|
||||
|
||||
btn_notif = lv_btn_create(scr_main);
|
||||
lv_obj_add_style(btn_notif, &btn_style, 0);
|
||||
lv_obj_align(btn_notif, LV_ALIGN_LEFT_MID, 50, 150);
|
||||
lv_obj_set_size(btn_notif, scr_act_width() - 300, 100);
|
||||
lv_obj_t *notiflabel = lv_label_create(btn_notif);
|
||||
btn_notify = lv_btn_create(scr_main);
|
||||
lv_obj_add_style(btn_notify, &btn_style, 0);
|
||||
lv_obj_align(btn_notify, LV_ALIGN_LEFT_MID, 50, 150);
|
||||
lv_obj_set_size(btn_notify, scr_act_width() - 300, 100);
|
||||
lv_obj_add_event_cb(btn_notify, main_event_cb, LV_EVENT_CLICKED, 0);
|
||||
lv_obj_t *notiflabel = lv_label_create(btn_notify);
|
||||
lv_obj_add_style(notiflabel, &btn_text_style, 0);
|
||||
lv_label_set_text(notiflabel, "今天有人经过门前 ");
|
||||
lv_obj_set_size(notiflabel, 250, 24);
|
||||
@@ -194,7 +222,7 @@ static void main_gui(void)
|
||||
btn_set = lv_btn_create(scr_main);
|
||||
lv_obj_add_style(btn_set, &btn_style, 0);
|
||||
lv_obj_set_size(btn_set, 150, 100);
|
||||
lv_obj_align_to(btn_set, btn_notif, LV_ALIGN_OUT_RIGHT_MID, 50, 0);
|
||||
lv_obj_align_to(btn_set, btn_notify, LV_ALIGN_OUT_RIGHT_MID, 50, 0);
|
||||
lv_obj_set_style_bg_img_src(btn_set, LV_SYMBOL_SETTINGS, 0);
|
||||
lv_obj_set_style_text_font(btn_set, &lv_font_montserrat_34, 0);
|
||||
lv_obj_add_event_cb(btn_set, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
@@ -202,7 +230,7 @@ static void main_gui(void)
|
||||
btn_msg = lv_btn_create(scr_main);
|
||||
lv_obj_add_style(btn_msg, &btn_style, 0);
|
||||
lv_obj_set_size(btn_msg, scr_act_width() - 100, 150);
|
||||
lv_obj_align_to(btn_msg, btn_notif, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 50);
|
||||
lv_obj_align_to(btn_msg, btn_notify, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 50);
|
||||
lv_obj_add_event_cb(btn_msg, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_t *label = lv_label_create(btn_msg);
|
||||
lv_obj_add_style(label, &btn_text_style, 0);
|
||||
@@ -224,8 +252,12 @@ static void main_gui(void)
|
||||
lv_obj_add_style(btn_record, &btn_style, 0);
|
||||
lv_obj_set_size(btn_record, 150, 150);
|
||||
lv_obj_align_to(btn_record, btn_dial, LV_ALIGN_OUT_RIGHT_MID, 50, 0);
|
||||
lv_obj_set_style_bg_img_src(btn_record, record_img, 0);
|
||||
lv_obj_set_style_bg_color(btn_record, lv_palette_main(LV_PALETTE_RED), 0);
|
||||
lv_obj_add_event_cb(btn_record, main_event_cb, LV_EVENT_PRESSED, 0);
|
||||
lv_obj_add_event_cb(btn_record, main_event_cb, LV_EVENT_RELEASED, 0);
|
||||
img_record = lv_img_create(btn_record);
|
||||
lv_img_set_src(img_record, record_img);
|
||||
lv_obj_center(img_record);
|
||||
|
||||
slider_vol = lv_slider_create(scr_main);
|
||||
lv_slider_set_range(slider_vol, 0, 100);
|
||||
@@ -253,25 +285,6 @@ static void main_gui(void)
|
||||
lv_obj_align_to(img_light, slider_light, LV_ALIGN_CENTER, 0, 0);
|
||||
lv_obj_move_foreground(img_light);
|
||||
|
||||
/*app打电话*/
|
||||
lv_obj_add_style(scr_app, &scr_style, 0);
|
||||
|
||||
btn_app_acpt = lv_imgbtn_create(scr_app);
|
||||
lv_imgbtn_set_src(btn_app_acpt, LV_IMGBTN_STATE_RELEASED, accept_img, accept_img, accept_img);
|
||||
lv_obj_align(btn_app_acpt, LV_ALIGN_RIGHT_MID, -100, 200);
|
||||
lv_obj_add_event_cb(btn_app_acpt, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_t *label_app = lv_label_create(scr_app);
|
||||
lv_label_set_text(label_app, "接听");
|
||||
lv_obj_align_to(label_app, btn_app_acpt, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);
|
||||
|
||||
btn_app_rfse = lv_imgbtn_create(scr_app);
|
||||
lv_imgbtn_set_src(btn_app_rfse, LV_IMGBTN_STATE_RELEASED, refuse_img, refuse_img, refuse_img);
|
||||
lv_obj_align(btn_app_rfse, LV_ALIGN_LEFT_MID, 100, 200);
|
||||
lv_obj_add_event_cb(btn_app_rfse, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
label_app = lv_label_create(scr_app);
|
||||
lv_label_set_text(label_app, "拒绝");
|
||||
lv_obj_align_to(label_app, btn_app_rfse, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);
|
||||
|
||||
/*门铃响电话*/
|
||||
lv_obj_add_style(scr_ring, &scr_style, 0);
|
||||
|
||||
@@ -296,11 +309,17 @@ static void main_gui(void)
|
||||
static void main_event_cb(lv_event_cb_t *e)
|
||||
{
|
||||
lv_obj_t *target = lv_event_get_target(e);
|
||||
lv_event_code_t code = lv_event_get_code(e);
|
||||
|
||||
if(target == btn_set)
|
||||
{
|
||||
setting_gui();
|
||||
}
|
||||
else if(target == btn_notify)
|
||||
{
|
||||
LV_LOG_USER("notify click");
|
||||
notify_gui();
|
||||
}
|
||||
else if(target == btn_msg)
|
||||
{
|
||||
msg_gui();
|
||||
@@ -309,6 +328,32 @@ static void main_event_cb(lv_event_cb_t *e)
|
||||
{
|
||||
dial_gui();
|
||||
}
|
||||
else if(target == btn_record)
|
||||
{
|
||||
if(code == LV_EVENT_PRESSED)
|
||||
{
|
||||
LV_LOG_USER("start press");
|
||||
lv_obj_add_flag(img_record, LV_OBJ_FLAG_HIDDEN);
|
||||
img_onrecord = lv_img_create(btn_record);
|
||||
lv_img_set_src(img_onrecord, onrecord_img);
|
||||
lv_obj_center(img_onrecord);
|
||||
lv_anim_t anim;
|
||||
lv_anim_init(&anim);
|
||||
lv_anim_set_var(&anim, img_onrecord);
|
||||
lv_anim_set_exec_cb(&anim, (lv_anim_exec_xcb_t) lv_img_set_angle);
|
||||
lv_anim_set_time(&anim, 500);
|
||||
lv_anim_set_values(&anim, 0, 3599);
|
||||
lv_anim_set_repeat_count(&anim, LV_ANIM_REPEAT_INFINITE);
|
||||
lv_anim_start(&anim);
|
||||
}
|
||||
else if(code == LV_EVENT_RELEASED)
|
||||
{
|
||||
LV_LOG_USER("end press");
|
||||
lv_obj_clear_flag(img_record, LV_OBJ_FLAG_HIDDEN);
|
||||
lv_obj_del(img_onrecord);
|
||||
}
|
||||
|
||||
}
|
||||
else if(target == slider_vol)
|
||||
{
|
||||
LV_LOG_USER("vol: %d", lv_slider_get_value(slider_vol));
|
||||
@@ -317,15 +362,13 @@ static void main_event_cb(lv_event_cb_t *e)
|
||||
{
|
||||
LV_LOG_USER("light: %d", lv_slider_get_value(slider_light));
|
||||
}
|
||||
else if(target == btn_accept)
|
||||
{
|
||||
setting_gui();
|
||||
}
|
||||
else if(target == btn_accept)
|
||||
{
|
||||
setting_gui();
|
||||
}
|
||||
else if(target == btn_return)
|
||||
}
|
||||
|
||||
static void return_event_cb(lv_event_cb_t *e)
|
||||
{
|
||||
lv_obj_t *target = lv_event_get_target(e);
|
||||
|
||||
if(target == btn_return)
|
||||
{
|
||||
LV_LOG_USER("btn_return");
|
||||
main_gui();
|
||||
@@ -342,6 +385,63 @@ static void main_event_cb(lv_event_cb_t *e)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void notify_gui(void)
|
||||
{
|
||||
lv_obj_clean(top());
|
||||
lv_obj_t *scr = lv_obj_create(NULL);
|
||||
lv_obj_add_style(scr, &scr_style, 0);
|
||||
lv_scr_load(scr);
|
||||
|
||||
lv_obj_show_battery(3, scr);
|
||||
lv_obj_show_wifi(1, scr);
|
||||
|
||||
lv_obj_t *label = lv_label_create(scr);
|
||||
lv_label_set_text(label, "异常信息");
|
||||
lv_obj_align(label, LV_ALIGN_TOP_MID, 0, 10);
|
||||
|
||||
notify_list = lv_list_create(scr);
|
||||
lv_obj_add_style(notify_list, &list_style, 0);
|
||||
lv_obj_align(notify_list, LV_ALIGN_TOP_LEFT, 0, 100);
|
||||
|
||||
lv_obj_t *notify_btn;
|
||||
lv_obj_t *reddot;
|
||||
static const char *notify_items[] = {"异常信息1", "异常信息2", "异常信息3", "异常信息4"};
|
||||
for(int i = 0; i < sizeof(notify_items)/sizeof(notify_items[0]); i++)
|
||||
{
|
||||
notify_btn = lv_list_add_btn(notify_list, NULL, notify_items[i]);
|
||||
lv_obj_set_height(notify_btn, 100);
|
||||
lv_obj_set_style_bg_opa(notify_btn, LV_OPA_30, 0);
|
||||
lv_obj_add_event_cb(notify_btn, noitify_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
reddot = lv_btn_create(notify_btn);
|
||||
lv_obj_set_size(reddot, 10, 10);
|
||||
lv_obj_align(reddot, LV_ALIGN_TOP_RIGHT, 0, 0);
|
||||
lv_obj_set_style_bg_color(reddot, lv_palette_main(LV_PALETTE_RED), 0);
|
||||
lv_obj_clear_flag(reddot, LV_OBJ_FLAG_HIDDEN);
|
||||
}
|
||||
|
||||
btn_return = lv_imgbtn_create(scr);
|
||||
lv_imgbtn_set_src(btn_return, LV_IMGBTN_STATE_RELEASED, NULL, return_img, NULL);
|
||||
lv_obj_add_style(btn_return, &return_style, 0);
|
||||
lv_obj_align(btn_return, LV_ALIGN_TOP_LEFT, 0, 10);
|
||||
lv_obj_add_event_cb(btn_return, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
|
||||
}
|
||||
|
||||
static void noitify_event_cb(lv_event_cb_t *e)
|
||||
{
|
||||
lv_obj_t *target = lv_event_get_target(e);
|
||||
lv_event_code_t code = lv_event_get_code(e);
|
||||
lv_obj_t *child = NULL;
|
||||
|
||||
if(code == LV_EVENT_CLICKED)
|
||||
{
|
||||
LV_LOG_USER("Already read");
|
||||
child = lv_obj_get_child(target, -1);
|
||||
lv_obj_add_flag(child, LV_OBJ_FLAG_HIDDEN);
|
||||
}
|
||||
}
|
||||
|
||||
static void msg_gui(void)
|
||||
{
|
||||
lv_obj_clean(top());
|
||||
@@ -357,7 +457,7 @@ static void msg_gui(void)
|
||||
lv_obj_align(label, LV_ALIGN_TOP_MID, 0, 10);
|
||||
|
||||
msg_list = lv_list_create(scr);
|
||||
lv_obj_set_size(msg_list, scr_act_width(), scr_act_height() - 100);
|
||||
lv_obj_add_style(msg_list, &list_style, 0);
|
||||
lv_obj_align(msg_list, LV_ALIGN_TOP_LEFT, 0, 100);
|
||||
|
||||
lv_obj_t *msg_btn;
|
||||
@@ -367,6 +467,7 @@ static void msg_gui(void)
|
||||
{
|
||||
msg_btn = lv_list_add_btn(msg_list, NULL, msg_items[i]);
|
||||
lv_obj_set_height(msg_btn, 100);
|
||||
lv_obj_set_style_bg_opa(msg_btn, LV_OPA_30, 0);
|
||||
lv_obj_add_event_cb(msg_btn, msg_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
reddot = lv_btn_create(msg_btn);
|
||||
lv_obj_set_size(reddot, 10, 10);
|
||||
@@ -379,13 +480,7 @@ static void msg_gui(void)
|
||||
lv_imgbtn_set_src(btn_return, LV_IMGBTN_STATE_RELEASED, NULL, return_img, NULL);
|
||||
lv_obj_add_style(btn_return, &return_style, 0);
|
||||
lv_obj_align(btn_return, LV_ALIGN_TOP_LEFT, 0, 10);
|
||||
lv_obj_add_event_cb(btn_return, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
|
||||
btn_home = lv_imgbtn_create(scr);
|
||||
lv_imgbtn_set_src(btn_home, LV_IMGBTN_STATE_RELEASED, NULL, home_img, NULL);
|
||||
lv_obj_add_style(btn_home, &return_style, 0);
|
||||
lv_obj_align_to(btn_home, btn_return, LV_ALIGN_OUT_RIGHT_TOP, 20, 0);
|
||||
lv_obj_add_event_cb(btn_home, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_return, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
|
||||
static void msg_event_cb(lv_event_cb_t *e)
|
||||
@@ -441,15 +536,16 @@ static void setting_gui(void)
|
||||
lv_obj_show_wifi(1, scr);
|
||||
|
||||
setting_list = lv_list_create(scr);
|
||||
lv_obj_set_size(setting_list, scr_act_width(), scr_act_height() - 100);
|
||||
lv_obj_add_style(setting_list, &list_style, 0);
|
||||
lv_obj_align(setting_list, LV_ALIGN_TOP_LEFT, 0, 100);
|
||||
|
||||
lv_obj_t *setting_btn;
|
||||
static const char *setting_items[] = {"语言设置", "时间设置", "门锁设置", "恢复出厂", "设备绑定", "关于设备"};
|
||||
static const char *setting_items[] = {"语言设置", "时间设置", "门锁设置", "恢复出厂", "网络配置", "设备绑定", "关于设备"};
|
||||
for(int i = 0; i < sizeof(setting_items)/sizeof(setting_items[0]); i++)
|
||||
{
|
||||
setting_btn = lv_list_add_btn(setting_list, NULL, setting_items[i]);
|
||||
lv_obj_set_height(setting_btn, 100);
|
||||
lv_obj_set_style_bg_opa(setting_btn, LV_OPA_30, 0);
|
||||
lv_obj_add_event_cb(setting_btn, setting_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
|
||||
@@ -457,13 +553,13 @@ static void setting_gui(void)
|
||||
lv_imgbtn_set_src(btn_return, LV_IMGBTN_STATE_RELEASED, NULL, return_img, NULL);
|
||||
lv_obj_add_style(btn_return, &return_style, 0);
|
||||
lv_obj_align(btn_return, LV_ALIGN_TOP_LEFT, 0, 10);
|
||||
lv_obj_add_event_cb(btn_return, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_return, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
|
||||
btn_home = lv_imgbtn_create(scr);
|
||||
lv_imgbtn_set_src(btn_home, LV_IMGBTN_STATE_RELEASED, NULL, home_img, NULL);
|
||||
lv_obj_add_style(btn_home, &return_style, 0);
|
||||
lv_obj_align_to(btn_home, btn_return, LV_ALIGN_OUT_RIGHT_TOP, 20, 0);
|
||||
lv_obj_add_event_cb(btn_home, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_home, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
|
||||
static void setting_event_cb(lv_event_cb_t *e)
|
||||
@@ -487,6 +583,11 @@ static void setting_event_cb(lv_event_cb_t *e)
|
||||
{
|
||||
recovery_gui();
|
||||
}
|
||||
else if(strcmp(text, "网络配置") == 0)
|
||||
{
|
||||
LV_LOG_USER("wifi connect");
|
||||
wificonfg_gui();
|
||||
}
|
||||
else if(strcmp(text, "设备绑定") == 0)
|
||||
{
|
||||
bond_gui();
|
||||
@@ -508,16 +609,9 @@ static void door_gui(void)
|
||||
lv_obj_show_wifi(1, scr);
|
||||
|
||||
door_setting_list = lv_list_create(scr);
|
||||
lv_obj_set_size(door_setting_list, scr_act_width(), scr_act_height() - 100);
|
||||
lv_obj_add_style(door_setting_list, &list_style, 0);
|
||||
lv_obj_align(door_setting_list, LV_ALIGN_TOP_LEFT, 0, 100);
|
||||
|
||||
/*开门方向怎么画还不确定，先不要下拉列表*/
|
||||
// setting_btn = lv_list_add_btn(door_setting_list, NULL, "开门方向");
|
||||
// lv_obj_t *droplist = lv_dropdown_create(setting_btn);
|
||||
// lv_dropdown_set_options(droplist, "正常\n""翻转");
|
||||
// lv_dropdown_set_symbol(droplist, symbol_img);
|
||||
// lv_obj_add_event_cb(droplist, door_event_cb, LV_EVENT_VALUE_CHANGED, NULL);
|
||||
|
||||
lv_obj_t *setting_btn;
|
||||
lv_obj_t *setting_switch;
|
||||
static const char *door_setting_items[] = {"开门方向翻转","常开模式", "自动反锁", "哨兵模式", "老化测试", "出厂测试"};
|
||||
@@ -525,6 +619,7 @@ static void door_gui(void)
|
||||
{
|
||||
setting_btn = lv_list_add_btn(door_setting_list, NULL, door_setting_items[i]);
|
||||
lv_obj_set_height(setting_btn, 100);
|
||||
lv_obj_set_style_bg_opa(setting_btn, LV_OPA_30, 0);
|
||||
setting_switch = lv_switch_create(setting_btn);
|
||||
lv_obj_add_event_cb(setting_switch, door_event_cb, LV_EVENT_VALUE_CHANGED, NULL);
|
||||
}
|
||||
@@ -533,13 +628,13 @@ static void door_gui(void)
|
||||
lv_imgbtn_set_src(btn_return_set, LV_IMGBTN_STATE_RELEASED, NULL, return_img, NULL);
|
||||
lv_obj_add_style(btn_return_set, &return_style, 0);
|
||||
lv_obj_align(btn_return_set, LV_ALIGN_TOP_LEFT, 0, 10);
|
||||
lv_obj_add_event_cb(btn_return_set, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_return_set, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
|
||||
btn_home = lv_imgbtn_create(scr);
|
||||
lv_imgbtn_set_src(btn_home, LV_IMGBTN_STATE_RELEASED, NULL, home_img, NULL);
|
||||
lv_obj_add_style(btn_home, &return_style, 0);
|
||||
lv_obj_align_to(btn_home, btn_return, LV_ALIGN_OUT_RIGHT_TOP, 20, 0);
|
||||
lv_obj_add_event_cb(btn_home, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_home, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
|
||||
static void door_event_cb(lv_event_cb_t *e)
|
||||
@@ -574,7 +669,7 @@ static void language_gui(void)
|
||||
lv_obj_show_wifi(1, scr);
|
||||
|
||||
language_list = lv_list_create(scr);
|
||||
lv_obj_set_size(language_list, scr_act_width(), scr_act_height() - 100);
|
||||
lv_obj_add_style(language_list, &list_style, 0);
|
||||
lv_obj_align(language_list, LV_ALIGN_TOP_LEFT, 0, 100);
|
||||
|
||||
lv_obj_t *lang_btn;
|
||||
@@ -582,6 +677,7 @@ static void language_gui(void)
|
||||
{
|
||||
lang_btn = lv_list_add_btn(language_list, NULL, lang_items[i]);
|
||||
lv_obj_set_height(lang_btn, 100);
|
||||
lv_obj_set_style_bg_opa(lang_btn, LV_OPA_30, 0);
|
||||
lv_obj_add_event_cb(lang_btn, language_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
|
||||
@@ -589,13 +685,13 @@ static void language_gui(void)
|
||||
lv_imgbtn_set_src(btn_return_set, LV_IMGBTN_STATE_RELEASED, NULL, return_img, NULL);
|
||||
lv_obj_add_style(btn_return_set, &return_style, 0);
|
||||
lv_obj_align(btn_return_set, LV_ALIGN_TOP_LEFT, 0, 10);
|
||||
lv_obj_add_event_cb(btn_return_set, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_return_set, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
|
||||
btn_home = lv_imgbtn_create(scr);
|
||||
lv_imgbtn_set_src(btn_home, LV_IMGBTN_STATE_RELEASED, NULL, home_img, NULL);
|
||||
lv_obj_add_style(btn_home, &return_style, 0);
|
||||
lv_obj_align_to(btn_home, btn_return, LV_ALIGN_OUT_RIGHT_TOP, 20, 0);
|
||||
lv_obj_add_event_cb(btn_home, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_home, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
|
||||
static void language_event_cb(lv_event_cb_t *e)
|
||||
@@ -707,13 +803,13 @@ static void time_gui(void)
|
||||
lv_imgbtn_set_src(btn_return_set, LV_IMGBTN_STATE_RELEASED, NULL, return_img, NULL);
|
||||
lv_obj_add_style(btn_return_set, &return_style, 0);
|
||||
lv_obj_align(btn_return_set, LV_ALIGN_TOP_LEFT, 0, 10);
|
||||
lv_obj_add_event_cb(btn_return_set, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_return_set, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
|
||||
btn_home = lv_imgbtn_create(scr);
|
||||
lv_imgbtn_set_src(btn_home, LV_IMGBTN_STATE_RELEASED, NULL, home_img, NULL);
|
||||
lv_obj_add_style(btn_home, &return_style, 0);
|
||||
lv_obj_align_to(btn_home, btn_return, LV_ALIGN_OUT_RIGHT_TOP, 20, 0);
|
||||
lv_obj_add_event_cb(btn_home, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_home, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
|
||||
static void time_anim_ready_cb(lv_anim_t *anim)
|
||||
@@ -775,6 +871,7 @@ static void time_event_cb(lv_event_cb_t *e)
|
||||
}
|
||||
}
|
||||
|
||||
/*恢复出厂界面，特殊：会采用定时器，所以返回的时候要删掉定时器，该界面的返回键不统一处理*/
|
||||
static void recovery_gui(void)
|
||||
{
|
||||
lv_obj_clean(top());
|
||||
@@ -793,37 +890,56 @@ static void recovery_gui(void)
|
||||
lv_label_set_text(label, "恢复出厂设置,将清空所有用户数据,确定继续?");
|
||||
lv_obj_align(label, LV_ALIGN_CENTER, 0, 0);
|
||||
|
||||
timer = lv_timer_create(timer_callback, 1000, NULL);
|
||||
lv_timer_set_repeat_count(timer, 10);
|
||||
|
||||
cntdown = 10;
|
||||
|
||||
btn_yes = lv_btn_create(scr);
|
||||
lv_obj_set_style_bg_color(btn_yes, lv_palette_main(LV_PALETTE_RED), 0);
|
||||
lv_obj_set_size(btn_yes, 100, 50);
|
||||
lv_obj_set_style_bg_color(btn_yes, lv_palette_main(LV_PALETTE_GREY), 0);
|
||||
lv_obj_set_size(btn_yes, 150, 50);
|
||||
lv_obj_align_to(btn_yes, label, LV_ALIGN_OUT_BOTTOM_RIGHT, 0, 50);
|
||||
lv_obj_add_event_cb(btn_yes, recovery_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_t *label_btn = lv_label_create(btn_yes);
|
||||
lv_obj_add_style(label_btn, &btn_text_style, 0);
|
||||
lv_label_set_text(label_btn, "确认");
|
||||
lv_obj_center(label_btn);
|
||||
label_yes = lv_label_create(btn_yes);
|
||||
lv_obj_add_style(label_yes, &btn_text_style, 0);
|
||||
lv_label_set_text_fmt(label_yes, "确认(%d)", cntdown);
|
||||
lv_obj_center(label_yes);
|
||||
|
||||
btn_no = lv_btn_create(scr);
|
||||
lv_obj_set_style_bg_color(btn_no, lv_palette_main(LV_PALETTE_GREEN), 0);
|
||||
lv_obj_set_size(btn_no, 100, 50);
|
||||
lv_obj_set_size(btn_no, 150, 50);
|
||||
lv_obj_align_to(btn_no, label, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 50);
|
||||
lv_obj_add_event_cb(btn_no, recovery_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
label_btn = lv_label_create(btn_no);
|
||||
lv_obj_t *label_btn = lv_label_create(btn_no);
|
||||
lv_obj_add_style(label_btn, &btn_text_style, 0);
|
||||
lv_label_set_text(label_btn, "取消");
|
||||
lv_obj_center(label_btn);
|
||||
|
||||
btn_return_set = lv_imgbtn_create(scr);
|
||||
lv_imgbtn_set_src(btn_return_set, LV_IMGBTN_STATE_RELEASED, NULL, return_img, NULL);
|
||||
lv_imgbtn_set_src(btn_return_set, LV_IMGBTN_STATE_RELEASED, return_img, return_img, return_img);
|
||||
lv_obj_add_style(btn_return_set, &return_style, 0);
|
||||
lv_obj_align(btn_return_set, LV_ALIGN_TOP_LEFT, 0, 10);
|
||||
lv_obj_add_event_cb(btn_return_set, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_return_set, recovery_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
|
||||
btn_home = lv_imgbtn_create(scr);
|
||||
lv_imgbtn_set_src(btn_home, LV_IMGBTN_STATE_RELEASED, NULL, home_img, NULL);
|
||||
lv_imgbtn_set_src(btn_home, LV_IMGBTN_STATE_RELEASED, home_img, home_img, home_img);
|
||||
lv_obj_add_style(btn_home, &return_style, 0);
|
||||
lv_obj_align_to(btn_home, btn_return, LV_ALIGN_OUT_RIGHT_TOP, 20, 0);
|
||||
lv_obj_add_event_cb(btn_home, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_home, recovery_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
|
||||
static void timer_callback(lv_timer_t *timer_c)
|
||||
{
|
||||
if(--cntdown)
|
||||
{
|
||||
lv_label_set_text_fmt(label_yes, "确认(%d)", cntdown);
|
||||
}
|
||||
else
|
||||
{
|
||||
lv_timer_del(timer);
|
||||
lv_label_set_text(label_yes, "确认");
|
||||
lv_obj_set_style_bg_color(btn_yes, lv_palette_main(LV_PALETTE_RED), 0);
|
||||
lv_obj_add_event_cb(btn_yes, recovery_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
static void recovery_anim_ready_cb(lv_anim_t *anim)
|
||||
@@ -860,6 +976,16 @@ static void recovery_event_cb(lv_event_cb_t *e)
|
||||
LV_LOG_USER("recovery quit");
|
||||
setting_gui();
|
||||
}
|
||||
else if(target == btn_return_set)
|
||||
{
|
||||
lv_timer_del(timer);
|
||||
setting_gui();
|
||||
}
|
||||
else if(target == btn_home)
|
||||
{
|
||||
lv_timer_del(timer);
|
||||
main_gui();
|
||||
}
|
||||
else
|
||||
{
|
||||
main_gui();
|
||||
@@ -867,6 +993,89 @@ static void recovery_event_cb(lv_event_cb_t *e)
|
||||
|
||||
}
|
||||
|
||||
static void wificonfg_gui(void)
|
||||
{
|
||||
lv_obj_clean(top());
|
||||
lv_obj_t *scr = lv_obj_create(NULL);
|
||||
lv_obj_add_style(scr, &scr_style, 0);
|
||||
lv_scr_load(scr);
|
||||
|
||||
lv_obj_show_battery(3, scr);
|
||||
lv_obj_show_wifi(1, scr);
|
||||
|
||||
lv_obj_t *label = lv_label_create(scr);
|
||||
lv_label_set_text(label, "请打开手机app设置网络配置二维码,放置在镜头前扫描");
|
||||
lv_obj_align(label, LV_ALIGN_CENTER, 0, 100);
|
||||
/*模拟得到通知*/
|
||||
lv_obj_add_flag(label, LV_OBJ_FLAG_CLICKABLE);
|
||||
lv_obj_add_event_cb(label, wificonfg_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
|
||||
btn_return_set = lv_imgbtn_create(scr);
|
||||
lv_imgbtn_set_src(btn_return_set, LV_IMGBTN_STATE_RELEASED, NULL, return_img, NULL);
|
||||
lv_obj_add_style(btn_return_set, &return_style, 0);
|
||||
lv_obj_align(btn_return_set, LV_ALIGN_TOP_LEFT, 0, 10);
|
||||
lv_obj_add_event_cb(btn_return_set, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
|
||||
btn_home = lv_imgbtn_create(scr);
|
||||
lv_imgbtn_set_src(btn_home, LV_IMGBTN_STATE_RELEASED, NULL, home_img, NULL);
|
||||
lv_obj_add_style(btn_home, &return_style, 0);
|
||||
lv_obj_align_to(btn_home, btn_return, LV_ALIGN_OUT_RIGHT_TOP, 20, 0);
|
||||
lv_obj_add_event_cb(btn_home, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
|
||||
static void wifi_anim_ready_cb(lv_anim_t *anim)
|
||||
{
|
||||
lv_obj_clean(top());
|
||||
lv_obj_t *scr = lv_obj_create(NULL);
|
||||
lv_obj_add_style(scr, &scr_style, 0);
|
||||
lv_scr_load(scr);
|
||||
|
||||
if(0)
|
||||
{
|
||||
lv_obj_set_style_bg_img_src(scr, succ_img, 0);
|
||||
lv_obj_t *label = lv_label_create(scr);
|
||||
lv_label_set_text(label, "绑定成功");
|
||||
lv_obj_align(label, LV_ALIGN_CENTER, 0, 100);
|
||||
}
|
||||
else
|
||||
{
|
||||
lv_obj_set_style_bg_img_src(scr, fail_img, 0);
|
||||
lv_obj_t *label = lv_label_create(scr);
|
||||
lv_label_set_text(label, "绑定失败");
|
||||
lv_obj_align(label, LV_ALIGN_CENTER, 0, 100);
|
||||
}
|
||||
|
||||
btn_return_set = lv_imgbtn_create(scr);
|
||||
lv_imgbtn_set_src(btn_return_set, LV_IMGBTN_STATE_RELEASED, NULL, return_img, NULL);
|
||||
lv_obj_add_style(btn_return_set, &return_style, 0);
|
||||
lv_obj_align(btn_return_set, LV_ALIGN_TOP_LEFT, 0, 10);
|
||||
lv_obj_add_event_cb(btn_return_set, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
|
||||
|
||||
static void wificonfg_event_cb(lv_event_cb_t *e)
|
||||
{
|
||||
lv_obj_t *target = lv_event_get_target(e);
|
||||
lv_event_code_t code = lv_event_get_code(e);
|
||||
|
||||
if(code == LV_EVENT_CLICKED)
|
||||
{
|
||||
lv_obj_clean(top());
|
||||
LV_LOG_USER("ad wifi yes");
|
||||
lv_obj_t *label = lv_label_create(top());
|
||||
lv_label_set_text(label, "正在配置中...");
|
||||
lv_obj_center(label);
|
||||
lv_anim_t anim;
|
||||
lv_anim_init(&anim);
|
||||
lv_anim_set_var(&anim, label);
|
||||
lv_anim_set_exec_cb(&anim, (lv_anim_exec_xcb_t)lv_img_set_angle);
|
||||
lv_anim_set_time(&anim, 2500);
|
||||
lv_anim_set_values(&anim, 0, 0);
|
||||
lv_anim_set_ready_cb(&anim, wifi_anim_ready_cb);
|
||||
lv_anim_start(&anim);
|
||||
}
|
||||
}
|
||||
|
||||
static void bond_gui(void)
|
||||
{
|
||||
lv_obj_clean(top());
|
||||
@@ -888,13 +1097,13 @@ static void bond_gui(void)
|
||||
lv_imgbtn_set_src(btn_return_set, LV_IMGBTN_STATE_RELEASED, NULL, return_img, NULL);
|
||||
lv_obj_add_style(btn_return_set, &return_style, 0);
|
||||
lv_obj_align(btn_return_set, LV_ALIGN_TOP_LEFT, 0, 10);
|
||||
lv_obj_add_event_cb(btn_return_set, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_return_set, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
|
||||
btn_home = lv_imgbtn_create(scr);
|
||||
lv_imgbtn_set_src(btn_home, LV_IMGBTN_STATE_RELEASED, NULL, home_img, NULL);
|
||||
lv_obj_add_style(btn_home, &return_style, 0);
|
||||
lv_obj_align_to(btn_home, btn_return, LV_ALIGN_OUT_RIGHT_TOP, 20, 0);
|
||||
lv_obj_add_event_cb(btn_home, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_home, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
|
||||
static void bond_anim_ready_cb(lv_anim_t *anim)
|
||||
@@ -923,7 +1132,7 @@ static void bond_anim_ready_cb(lv_anim_t *anim)
|
||||
lv_imgbtn_set_src(btn_return_set, LV_IMGBTN_STATE_RELEASED, NULL, return_img, NULL);
|
||||
lv_obj_add_style(btn_return_set, &return_style, 0);
|
||||
lv_obj_align(btn_return_set, LV_ALIGN_TOP_LEFT, 0, 10);
|
||||
lv_obj_add_event_cb(btn_return_set, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_return_set, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
|
||||
static void bond_event_cb(lv_event_cb_t *e)
|
||||
@@ -982,21 +1191,79 @@ static void info_gui(void)
|
||||
lv_imgbtn_set_src(btn_return_set, LV_IMGBTN_STATE_RELEASED, NULL, return_img, NULL);
|
||||
lv_obj_add_style(btn_return_set, &return_style, 0);
|
||||
lv_obj_align(btn_return_set, LV_ALIGN_TOP_LEFT, 0, 10);
|
||||
lv_obj_add_event_cb(btn_return_set, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_return_set, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
|
||||
btn_home = lv_imgbtn_create(scr);
|
||||
lv_imgbtn_set_src(btn_home, LV_IMGBTN_STATE_RELEASED, NULL, home_img, NULL);
|
||||
lv_obj_add_style(btn_home, &return_style, 0);
|
||||
lv_obj_align_to(btn_home, btn_return, LV_ALIGN_OUT_RIGHT_TOP, 20, 0);
|
||||
lv_obj_add_event_cb(btn_home, main_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
lv_obj_add_event_cb(btn_home, return_event_cb, LV_EVENT_CLICKED, NULL);
|
||||
}
|
||||
|
||||
static void info_anim_ready_cb(lv_anim_t *anim)
|
||||
static void info_nonew_anim_ready_cb(lv_anim_t *anim)
|
||||
{
|
||||
lv_anim_del(anim, NULL);
|
||||
info_gui();
|
||||
}
|
||||
|
||||
static void info_renew_anim_ready_cb(lv_anim_t *anim)
|
||||
{
|
||||
lv_anim_del(anim, NULL);
|
||||
|
||||
lv_obj_t *btn = lv_btn_create(top());
|
||||
lv_obj_set_size(btn, 500, 200);
|
||||
lv_obj_center(btn);
|
||||
lv_obj_set_style_bg_color(btn, lv_palette_main(LV_PALETTE_GREY), 0);
|
||||
|
||||
lv_obj_t *label = lv_label_create(btn);
|
||||
lv_label_set_text(label, "检测到新版本,是否需要更新版本？");
|
||||
lv_obj_align(label, LV_ALIGN_TOP_MID, 0, 50);
|
||||
|
||||
btn_yes = lv_btn_create(btn);
|
||||
lv_obj_set_style_bg_color(btn_yes, lv_palette_main(LV_PALETTE_RED), 0);
|
||||
lv_obj_set_size(btn_yes, 100, 50);
|
||||
lv_obj_align_to(btn_yes, label, LV_ALIGN_OUT_BOTTOM_RIGHT, 0, 50);
|
||||
lv_obj_add_event_cb(btn_yes, info_renew_event_cb, LV_EVENT_CLICKED, 0);
|
||||
lv_obj_t *label_btn = lv_label_create(btn_yes);
|
||||
lv_obj_add_style(label_btn, &btn_text_style, 0);
|
||||
lv_label_set_text(label_btn, "确认");
|
||||
lv_obj_center(label_btn);
|
||||
|
||||
btn_no = lv_btn_create(btn);
|
||||
lv_obj_set_style_bg_color(btn_no, lv_palette_main(LV_PALETTE_GREEN), 0);
|
||||
lv_obj_set_size(btn_no, 100, 50);
|
||||
lv_obj_align_to(btn_no, label, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 50);
|
||||
lv_obj_add_event_cb(btn_no, info_renew_event_cb, LV_EVENT_CLICKED, 0);
|
||||
label_btn = lv_label_create(btn_no);
|
||||
lv_obj_add_style(label_btn, &btn_text_style, 0);
|
||||
lv_label_set_text(label_btn, "取消");
|
||||
lv_obj_center(label_btn);
|
||||
}
|
||||
|
||||
static void info_renew_event_cb(lv_event_cb_t *e)
|
||||
{
|
||||
lv_obj_t *target = lv_event_get_target(e);
|
||||
if(target == btn_yes)
|
||||
{
|
||||
lv_obj_clean(top());
|
||||
lv_obj_t *label = lv_label_create(top());
|
||||
lv_label_set_text(label, "正在更新中...");
|
||||
lv_obj_center(label);
|
||||
lv_anim_t anim;
|
||||
lv_anim_init(&anim);
|
||||
lv_anim_set_var(&anim, label);
|
||||
lv_anim_set_exec_cb(&anim, (lv_anim_exec_xcb_t) lv_img_set_angle);
|
||||
lv_anim_set_time(&anim, 1000);
|
||||
lv_anim_set_values(&anim, 0, 0);
|
||||
lv_anim_set_ready_cb(&anim, info_nonew_anim_ready_cb);
|
||||
lv_anim_start(&anim);
|
||||
}
|
||||
else if(target == btn_no)
|
||||
{
|
||||
info_gui();
|
||||
}
|
||||
}
|
||||
|
||||
static void info_event_cb(lv_event_cb_t *e)
|
||||
{
|
||||
lv_obj_t *target = lv_event_get_target(e);
|
||||
@@ -1005,7 +1272,7 @@ static void info_event_cb(lv_event_cb_t *e)
|
||||
|
||||
if(code == LV_EVENT_CLICKED)
|
||||
{
|
||||
if(1)
|
||||
if(0)
|
||||
{
|
||||
LV_LOG_USER("Not Detect New Version");
|
||||
|
||||
@@ -1018,15 +1285,23 @@ static void info_event_cb(lv_event_cb_t *e)
|
||||
lv_anim_set_exec_cb(&anim, (lv_anim_exec_xcb_t) lv_img_set_angle);
|
||||
lv_anim_set_time(&anim, 1000);
|
||||
lv_anim_set_values(&anim, 0, 0);
|
||||
lv_anim_set_ready_cb(&anim, info_anim_ready_cb);
|
||||
lv_anim_set_ready_cb(&anim, info_nonew_anim_ready_cb);
|
||||
lv_anim_start(&anim);
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
LV_LOG_USER("Detect New Version");
|
||||
|
||||
|
||||
|
||||
lv_obj_t *img = lv_img_create(parent);
|
||||
lv_img_set_src(img, wait_img);
|
||||
lv_obj_center(img);
|
||||
lv_anim_t anim;
|
||||
lv_anim_init(&anim);
|
||||
lv_anim_set_var(&anim, img);
|
||||
lv_anim_set_exec_cb(&anim, (lv_anim_exec_xcb_t) lv_img_set_angle);
|
||||
lv_anim_set_time(&anim, 1000);
|
||||
lv_anim_set_values(&anim, 0, 3599);
|
||||
lv_anim_set_ready_cb(&anim, info_renew_anim_ready_cb);
|
||||
lv_anim_start(&anim);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB |
Reference in New Issue
Block a user