test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-29 18:48:09 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

update resource

Browse Source
This commit is contained in:
xianjimli 2018-06-09 19:05:56 +08:00
parent c2cdd4f939
commit 4712d4b355
14 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@ -12,3 +12,15 @@ lua/demo1
lua/lftk_run
lib
tags
bin/demo1
bin/demo_animator
bin/demo_thread
bin/demotr
bin/demovg
bin/fontgen
bin/imagegen
bin/preview_ui
bin/resgen
bin/runLua
bin/runTest
bin/strgen

2
demos/res/inc/images/bricks.data
View File

@ -361,4 +361,4 @@ const unsigned char image_bricks[] = {
0xcd,0xbb,0xcc,0xbb,0xed,0xbb,0x0d,0xc4,0x0d,0xbc,0x0d,0xc4,0x0d,0xc4,0x0d,0xc4,0xed,0xc3,0x0d,0xc4,
0x0d,0xc4,0x0d,0xc4,0x0e,0xcc,0x11,0xd5,0xb0,0xc4,0xad,0xbb,0xac,0xbb,0xec,0xc3,0xec,0xc3,0xcc,0xbb,
0xcc,0xbb,0xcc,0xc3,0xcc,0xc3,0xed,0xc3,0xed,0xc3,0xcc,0xbb,0xcc,0xbb,0xd2,0xc4,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,};/*7244*/
0x00,0x00,0x01,0x03,};/*7244*/

2
demos/res/inc/images/checked.data
View File

@ -116,4 +116,4 @@ const unsigned char image_checked[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*2348*/
0x00,0x00,0x00,0x00,0x30,0x21,0x60,0x79,};/*2348*/

2
demos/res/inc/images/earth.data
View File

@ -116,4 +116,4 @@ const unsigned char image_earth[] = {
0x00,0x00,0x00,0xb4,0x00,0x00,0x00,0xdf,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xdf,
0x00,0x00,0x00,0xb4,0x00,0x00,0x00,0x73,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*2348*/
0x00,0x00,0x00,0x00,0x50,0x01,0xd0,0xf1,};/*2348*/

2
demos/res/inc/images/middle_off.data
View File

@ -116,4 +116,4 @@ const unsigned char image_middle_off[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x88,0x2a,0xe9,0x7a,};/*2348*/
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*2348*/

2
demos/res/inc/strings/en_US.data
View File

@ -2,4 +2,4 @@ const unsigned char strings_en_US[] = {
0x06,0x00,0x00,0x01,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x65,0x6e,0x5f,0x55,0x53,0x00,0x64,0x61,
0x74,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x1c,0x00,0x00,0x00,0x23,0x00,0x00,0x00,
0x2a,0x00,0x00,0x00,0x2d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x61,0x6e,0x63,
0x65,0x6c,0x00,0x43,0x61,0x6e,0x63,0x65,0x6c,0x00,0x6f,0x6b,0x00,0x4f,0x4b,0x00,0x00,0x00,0x00,0x00,};/*80*/
0x65,0x6c,0x00,0x43,0x61,0x6e,0x63,0x65,0x6c,0x00,0x6f,0x6b,0x00,0x4f,0x4b,0x00,0x00,0x00,0x05,0x00,};/*80*/

2
demos/res/inc/strings/zh_CN.data
View File

@ -3,4 +3,4 @@ const unsigned char strings_zh_CN[] = {
0x74,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x1c,0x00,0x00,0x00,0x23,0x00,0x00,0x00,
0x2a,0x00,0x00,0x00,0x2d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x61,0x6e,0x63,
0x65,0x6c,0x00,0xe5,0x8f,0x96,0xe6,0xb6,0x88,0x00,0x6f,0x6b,0x00,0xe7,0xa1,0xae,0xe5,0xae,0x9a,0x00,
0x00,0x00,0x00,0x00,};/*84*/
0x02,0x00,0xe8,0x7a,};/*84*/

2
demos/res/inc/ui/animator.data
View File

@ -6,4 +6,4 @@ const unsigned char ui_animator[] = {
0x30,0x20,0x68,0x33,0x30,0x20,0x35,0x20,0x31,0x30,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,
0x0a,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x19,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x6e,0x61,0x6d,0x65,0x00,0x63,0x6c,0x6f,0x73,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x6c,0x6f,0x73,
0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*149*/
0x65,0x00,0x00,0x00,0x00,0x92,0xd1,0x29,0xe7,};/*149*/

6
demos/res/inc/ui/main.data
View File

@ -2,8 +2,8 @@ const unsigned char ui_main[] = {
0x04,0x00,0x01,0x01,0x84,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0x61,0x69,0x6e,0x00,0x64,0x61,0x74,
0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x01,0x00,0x00,0xe0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
0x6e,0x61,0x6d,0x65,0x00,0x6d,0x61,0x69,0x6e,0x00,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x77,0x31,0x30,
0x30,0x20,0x68,0x33,0x30,0x20,0x35,0x20,0x31,0x30,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,
0x6e,0x61,0x6d,0x65,0x00,0x6d,0x61,0x69,0x6e,0x00,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x77,0x31,0x32,
0x38,0x20,0x68,0x33,0x30,0x20,0x35,0x20,0x31,0x30,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,
0x0a,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x19,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x6d,0x65,0x6d,0x74,0x65,0x73,0x74,0x00,0x74,0x65,
0x78,0x74,0x00,0x4d,0x65,0x6d,0x54,0x65,0x73,0x74,0x00,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x01,
@ -19,4 +19,4 @@ const unsigned char ui_main[] = {
0x64,0x6f,0x77,0x00,0x00,0x00,0x01,0x00,0x0a,0x00,0x03,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,
0x00,0x00,0x19,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,
0x70,0x65,0x6e,0x3a,0x61,0x6e,0x69,0x6d,0x61,0x74,0x6f,0x72,0x00,0x74,0x65,0x78,0x74,0x00,0x41,0x6e,
0x69,0x6d,0x61,0x74,0x65,0x20,0x57,0x69,0x64,0x67,0x65,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*420*/
0x69,0x6d,0x61,0x74,0x65,0x20,0x57,0x69,0x64,0x67,0x65,0x74,0x00,0x00,0x00,0x00,0x07,0x00,0x00,0x00,};/*420*/

2
demos/res/inc/ui/top.data
View File

@ -12,4 +12,4 @@ const unsigned char ui_top[] = {
0x00,0x71,0x75,0x69,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0xe7,0xa1,0xae,0xe5,0xae,0x9a,0x00,0x00,0x00,
0x01,0x00,0x0a,0x00,0x03,0x03,0x01,0x00,0x0a,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x28,0x00,0x00,0x00,
0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x71,0x75,0x69,0x74,0x00,0x74,0x65,
0x78,0x74,0x00,0xe5,0x8f,0x96,0xe6,0xb6,0x88,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x6f,};/*277*/
0x78,0x74,0x00,0xe5,0x8f,0x96,0xe6,0xb6,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*277*/

BIN
demos/res/raw/ui/main.bin
View File

Binary file not shown.

2
demos/res/raw/ui/main.xml
View File

@ -1,4 +1,4 @@
<window name="main" x="0" y="0" w="320" h="480" layout="w100 h30 5 10">
<window name="main" x="0" y="0" w="320" h="480" layout="w128 h30 5 10">
<button name="open:memtest" x="10" y="5" w="25%" h="30" text="MemTest"/>
<button name="open:basic" x="10" y="5" w="25%" h="30" text="Basic"/>
<button name="open:slide_view" x="center" y="5" w="25%" h="30" text="SlideView"/>

6
demos/resource.c
View File

@ -90,13 +90,13 @@
#include "res/inc/images/unchecked.data"
#include "res/inc/images/unmuted.data"
#include "res/inc/images/warn.data"
#endif /*WITH_STB_IMAGE*/
#endif/*WITH_STB_IMAGE*/
#ifdef WITH_STB_FONT
#include "res/inc/fonts/default.res"
#else
#include "res/inc/fonts/default.data"
#endif /*WITH_STB_FONT*/
#endif /*WITH_FS_RES*/
#endif/*WITH_STB_FONT*/
#endif/*WITH_FS_RES*/
ret_t resource_init(void) {
resource_manager_t* rm = resource_manager();

2
tools/image_gen/image_gen.c
View File

@ -57,7 +57,7 @@ uint32_t image_gen_buff(bitmap_t* image, uint8_t* output_buff, uint32_t buff_siz
if (image->flags & BITMAP_FLAG_OPAQUE) {
if (image->format == BITMAP_FMT_RGBA) {
if (bitmap_rgba_to_rgb565(image, header->data) == RET_OK) {
if (bitmap_rgba_to_rgb565(image, (uint16_t*)(header->data)) == RET_OK) {
header->format = BITMAP_FMT_RGB565;
size = sizeof(uint16_t) * image->w * image->h;
} else {