mirror of
https://gitee.com/zlgopen/awtk.git
synced 2024-11-30 02:58:26 +08:00
improve digit clock
This commit is contained in:
parent
75698a1f38
commit
85a7624b2b
@ -29,6 +29,7 @@
|
||||
#include "assets/inc/ui/combo_box.data"
|
||||
#include "assets/inc/ui/kb_phone.data"
|
||||
#include "assets/inc/ui/main.data"
|
||||
#include "assets/inc/ui/digit_clock.data"
|
||||
#include "assets/inc/ui/scroll_bar.data"
|
||||
#include "assets/inc/ui/lua.data"
|
||||
#include "assets/inc/ui/linear_gradient.data"
|
||||
@ -384,6 +385,7 @@ ret_t assets_init(void) {
|
||||
assets_manager_add(rm, ui_combo_box);
|
||||
assets_manager_add(rm, ui_kb_phone);
|
||||
assets_manager_add(rm, ui_main);
|
||||
assets_manager_add(rm, ui_digit_clock);
|
||||
assets_manager_add(rm, ui_scroll_bar);
|
||||
assets_manager_add(rm, ui_lua);
|
||||
assets_manager_add(rm, ui_linear_gradient);
|
||||
|
39
demos/assets/inc/ui/digit_clock.data
Normal file
39
demos/assets/inc/ui/digit_clock.data
Normal file
@ -0,0 +1,39 @@
|
||||
const unsigned char ui_digit_clock[] = {
|
||||
0x04,0x00,0x01,0x01,0xb7,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x69,0x67,0x69,0x74,0x5f,0x63,0x6c,
|
||||
0x6f,0x63,0x6b,0x00,0x64,0x61,0x74,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x77,0x69,0x6e,0x64,0x6f,0x77,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,0x61,0x6e,0x69,0x6d,0x5f,0x68,0x69,0x6e,0x74,0x00,0x68,0x74,0x72,0x61,0x6e,0x73,
|
||||
0x6c,0x61,0x74,0x65,0x00,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x63,0x3a,0x31,0x20,0x68,0x3a,0x33,0x30,
|
||||
0x20,0x73,0x3a,0x31,0x30,0x00,0x00,0x64,0x69,0x67,0x69,0x74,0x5f,0x63,0x6c,0x6f,0x63,0x6b,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,0x66,0x6f,0x72,0x6d,0x61,0x74,0x00,0x68,0x3a,0x6d,0x00,0x00,0x00,0x64,0x69,0x67,0x69,
|
||||
0x74,0x5f,0x63,0x6c,0x6f,0x63,0x6b,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,0x66,0x6f,0x72,0x6d,0x61,0x74,0x00,0x68,
|
||||
0x68,0x3a,0x6d,0x6d,0x00,0x00,0x00,0x64,0x69,0x67,0x69,0x74,0x5f,0x63,0x6c,0x6f,0x63,0x6b,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,0x66,0x6f,0x72,0x6d,0x61,0x74,0x00,0x68,0x3a,0x6d,0x3a,0x73,0x00,0x00,0x00,0x64,0x69,
|
||||
0x67,0x69,0x74,0x5f,0x63,0x6c,0x6f,0x63,0x6b,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,0x66,0x6f,0x72,0x6d,0x61,0x74,
|
||||
0x00,0x68,0x68,0x3a,0x6d,0x6d,0x3a,0x73,0x73,0x00,0x00,0x00,0x64,0x69,0x67,0x69,0x74,0x5f,0x63,0x6c,
|
||||
0x6f,0x63,0x6b,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,0x66,0x6f,0x72,0x6d,0x61,0x74,0x00,0x59,0x2f,0x4d,0x2f,0x44,
|
||||
0x00,0x00,0x00,0x64,0x69,0x67,0x69,0x74,0x5f,0x63,0x6c,0x6f,0x63,0x6b,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,0x66,
|
||||
0x6f,0x72,0x6d,0x61,0x74,0x00,0x59,0x59,0x2d,0x4d,0x4d,0x2d,0x44,0x44,0x00,0x00,0x00,0x64,0x69,0x67,
|
||||
0x69,0x74,0x5f,0x63,0x6c,0x6f,0x63,0x6b,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,0x66,0x6f,0x72,0x6d,0x61,0x74,0x00,
|
||||
0x59,0x2f,0x4d,0x2f,0x44,0x20,0x68,0x3a,0x6d,0x6d,0x3a,0x73,0x73,0x00,0x00,0x00,0x64,0x69,0x67,0x69,
|
||||
0x74,0x5f,0x63,0x6c,0x6f,0x63,0x6b,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,0x66,0x6f,0x72,0x6d,0x61,0x74,0x00,0x59,
|
||||
0x59,0x2f,0x4d,0x4d,0x2f,0x44,0x44,0x20,0x68,0x3a,0x6d,0x6d,0x3a,0x73,0x73,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,};/*743*/
|
@ -1,5 +1,5 @@
|
||||
const unsigned char ui_gif_image[] = {
|
||||
0x04,0x00,0x01,0x01,0xfc,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x67,0x69,0x66,0x5f,0x69,0x6d,0x61,0x67,
|
||||
0x04,0x00,0x01,0x01,0xac,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x67,0x69,0x66,0x5f,0x69,0x6d,0x61,0x67,
|
||||
0x65,0x00,0x64,0x61,0x74,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x77,0x69,0x6e,0x64,0x6f,0x77,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,
|
||||
@ -22,8 +22,4 @@ const unsigned char ui_gif_image[] = {
|
||||
0x00,0x00,0x67,0x69,0x66,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,0x69,0x6d,
|
||||
0x61,0x67,0x65,0x00,0x62,0x65,0x65,0x00,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x02,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x28,
|
||||
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,};/*556*/
|
||||
0x61,0x67,0x65,0x00,0x62,0x65,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*476*/
|
||||
|
@ -1,5 +1,5 @@
|
||||
const unsigned char ui_main[] = {
|
||||
0x04,0x00,0x01,0x01,0xe0,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0x61,0x69,0x6e,0x00,0x64,0x61,0x74,
|
||||
0x04,0x00,0x01,0x01,0x43,0x0e,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0x61,0x69,0x6e,0x00,0x64,0x61,0x74,
|
||||
0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x77,0x69,0x6e,0x64,0x6f,0x77,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,
|
||||
@ -75,107 +75,112 @@ const unsigned char ui_main[] = {
|
||||
0x72,0x38,0x20,0x6d,0x35,0x20,0x73,0x35,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x6c,0x6f,0x63,0x61,
|
||||
0x6c,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x4c,0x6f,0x63,0x61,0x6c,0x65,0x00,0x00,0x00,0x62,0x75,0x74,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x74,0x69,0x6d,0x65,
|
||||
0x5f,0x63,0x6c,0x6f,0x63,0x6b,0x00,0x74,0x65,0x78,0x74,0x00,0x41,0x6e,0x61,0x6c,0x6f,0x67,0x20,0x43,
|
||||
0x6c,0x6f,0x63,0x6b,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x64,0x69,0x67,0x69,0x74,0x5f,0x63,
|
||||
0x6c,0x6f,0x63,0x6b,0x00,0x74,0x65,0x78,0x74,0x00,0x44,0x69,0x67,0x69,0x74,0x20,0x43,0x6c,0x6f,0x63,
|
||||
0x6b,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,
|
||||
0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x6c,0x6f,0x63,0x61,0x6c,0x65,0x00,0x74,0x65,0x78,
|
||||
0x74,0x00,0x4c,0x6f,0x63,0x61,0x6c,0x65,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x69,0x6d,0x61,
|
||||
0x67,0x65,0x73,0x00,0x74,0x65,0x78,0x74,0x00,0x49,0x6d,0x61,0x67,0x65,0x00,0x00,0x00,0x62,0x75,0x74,
|
||||
0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,
|
||||
0x65,0x6e,0x3a,0x74,0x69,0x6d,0x65,0x5f,0x63,0x6c,0x6f,0x63,0x6b,0x00,0x74,0x65,0x78,0x74,0x00,0x54,
|
||||
0x69,0x6d,0x65,0x20,0x43,0x6c,0x6f,0x63,0x6b,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,
|
||||
0x65,0x6e,0x3a,0x67,0x75,0x61,0x67,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x47,0x75,0x61,0x67,0x65,0x00,
|
||||
0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,
|
||||
0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x73,0x77,0x69,0x74,0x63,0x68,0x00,0x74,0x65,0x78,0x74,0x00,
|
||||
0x53,0x77,0x69,0x74,0x63,0x68,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x67,0x75,
|
||||
0x61,0x67,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x47,0x75,0x61,0x67,0x65,0x00,0x00,0x00,0x62,0x75,0x74,
|
||||
0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,
|
||||
0x65,0x6e,0x3a,0x69,0x6d,0x61,0x67,0x65,0x73,0x00,0x74,0x65,0x78,0x74,0x00,0x49,0x6d,0x61,0x67,0x65,
|
||||
0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,
|
||||
0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x73,0x77,0x69,0x74,0x63,0x68,0x00,0x74,0x65,0x78,0x74,
|
||||
0x00,0x53,0x77,0x69,0x74,0x63,0x68,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x74,0x65,0x78,0x74,0x5f,
|
||||
0x73,0x65,0x6c,0x65,0x63,0x74,0x6f,0x72,0x00,0x74,0x65,0x78,0x74,0x00,0x53,0x65,0x6c,0x65,0x63,0x74,
|
||||
0x6f,0x72,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x74,0x65,0x78,0x74,
|
||||
0x5f,0x73,0x65,0x6c,0x65,0x63,0x74,0x6f,0x72,0x00,0x74,0x65,0x78,0x74,0x00,0x53,0x65,0x6c,0x65,0x63,
|
||||
0x74,0x6f,0x72,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x69,0x6d,0x61,0x67,0x65,0x5f,0x61,0x6e,0x69,
|
||||
0x6d,0x61,0x74,0x69,0x6f,0x6e,0x00,0x74,0x65,0x78,0x74,0x00,0x49,0x6d,0x61,0x67,0x65,0x20,0x41,0x6e,
|
||||
0x69,0x6d,0x61,0x74,0x69,0x6f,0x6e,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x69,0x6d,0x61,0x67,0x65,0x5f,0x61,0x6e,
|
||||
0x69,0x6d,0x61,0x74,0x69,0x6f,0x6e,0x00,0x74,0x65,0x78,0x74,0x00,0x49,0x6d,0x61,0x67,0x65,0x20,0x41,
|
||||
0x6e,0x69,0x6d,0x61,0x74,0x69,0x6f,0x6e,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x70,0x72,0x6f,0x67,
|
||||
0x72,0x65,0x73,0x73,0x5f,0x63,0x69,0x72,0x63,0x6c,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x50,0x72,0x6f,
|
||||
0x67,0x72,0x65,0x73,0x73,0x43,0x69,0x72,0x63,0x6c,0x65,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,
|
||||
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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x70,0x72,0x6f,
|
||||
0x67,0x72,0x65,0x73,0x73,0x5f,0x63,0x69,0x72,0x63,0x6c,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x50,0x72,
|
||||
0x6f,0x67,0x72,0x65,0x73,0x73,0x43,0x69,0x72,0x63,0x6c,0x65,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,
|
||||
0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,
|
||||
0x3a,0x73,0x76,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x53,0x56,0x47,0x20,
|
||||
0x49,0x6d,0x61,0x67,0x65,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,
|
||||
0x69,0x6d,0x61,0x67,0x65,0x5f,0x76,0x61,0x6c,0x75,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x56,0x61,0x6c,
|
||||
0x75,0x65,0x20,0x49,0x6d,0x61,0x67,0x65,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x67,0x69,0x66,0x5f,0x69,0x6d,
|
||||
0x61,0x67,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x47,0x49,0x46,0x20,0x49,0x6d,0x61,0x67,0x65,0x00,0x00,
|
||||
0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,
|
||||
0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x69,0x6d,0x61,0x67,0x65,0x5f,0x76,0x61,0x6c,0x75,0x65,0x00,0x74,
|
||||
0x65,0x78,0x74,0x00,0x56,0x61,0x6c,0x75,0x65,0x20,0x49,0x6d,0x61,0x67,0x65,0x00,0x00,0x00,0x00,0x76,
|
||||
0x69,0x65,0x77,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,0x01,0x01,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0x61,0x79,0x6f,0x75,
|
||||
0x74,0x00,0x63,0x32,0x20,0x72,0x38,0x20,0x6d,0x35,0x20,0x73,0x35,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,
|
||||
0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,
|
||||
0x3a,0x6c,0x61,0x62,0x65,0x6c,0x00,0x74,0x65,0x78,0x74,0x00,0x4c,0x61,0x62,0x65,0x6c,0x00,0x00,0x00,
|
||||
0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,
|
||||
0x00,0x6f,0x70,0x65,0x6e,0x3a,0x73,0x6c,0x69,0x64,0x65,0x5f,0x6d,0x65,0x6e,0x75,0x00,0x74,0x65,0x78,
|
||||
0x74,0x00,0x53,0x6c,0x69,0x64,0x65,0x20,0x4d,0x65,0x6e,0x75,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,
|
||||
0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,
|
||||
0x3a,0x76,0x67,0x63,0x61,0x6e,0x76,0x61,0x73,0x00,0x74,0x65,0x78,0x74,0x00,0x56,0x47,0x20,0x43,0x61,
|
||||
0x6e,0x76,0x61,0x73,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x73,0x76,0x67,
|
||||
0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x53,0x56,0x47,0x20,0x49,0x6d,0x61,0x67,
|
||||
0x65,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x6c,0x69,0x6e,0x65,0x61,0x72,0x5f,
|
||||
0x67,0x72,0x61,0x64,0x69,0x65,0x6e,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0x4c,0x69,0x6e,0x65,0x61,0x72,
|
||||
0x20,0x47,0x72,0x61,0x64,0x69,0x65,0x6e,0x74,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,
|
||||
0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x67,0x69,0x66,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,
|
||||
0x74,0x65,0x78,0x74,0x00,0x47,0x49,0x46,0x20,0x49,0x6d,0x61,0x67,0x65,0x00,0x00,0x00,0x00,0x76,0x69,
|
||||
0x65,0x77,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,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x64,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0x61,0x79,0x6f,0x75,0x74,
|
||||
0x00,0x63,0x32,0x20,0x72,0x38,0x20,0x6d,0x35,0x20,0x73,0x35,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,
|
||||
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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x72,0x61,
|
||||
0x64,0x69,0x61,0x6c,0x5f,0x67,0x72,0x61,0x64,0x69,0x65,0x6e,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0x52,
|
||||
0x61,0x64,0x69,0x61,0x6c,0x20,0x47,0x72,0x61,0x64,0x69,0x65,0x6e,0x74,0x00,0x00,0x00,0x62,0x75,0x74,
|
||||
0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,
|
||||
0x65,0x6e,0x3a,0x73,0x74,0x72,0x6f,0x6b,0x65,0x5f,0x67,0x72,0x61,0x64,0x69,0x65,0x6e,0x74,0x00,0x74,
|
||||
0x65,0x78,0x74,0x00,0x53,0x74,0x72,0x6f,0x6b,0x65,0x20,0x47,0x72,0x61,0x64,0x69,0x65,0x6e,0x74,0x00,
|
||||
0x00,0x00,0x00,0x76,0x69,0x65,0x77,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,0x01,0x01,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,
|
||||
0x61,0x79,0x6f,0x75,0x74,0x00,0x63,0x31,0x20,0x72,0x38,0x20,0x6d,0x35,0x20,0x73,0x35,0x00,0x00,0x62,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,
|
||||
0x6c,0x61,0x62,0x65,0x6c,0x00,0x74,0x65,0x78,0x74,0x00,0x4c,0x61,0x62,0x65,0x6c,0x00,0x00,0x00,0x62,
|
||||
0x75,0x74,0x74,0x6f,0x6e,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,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,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x6f,0x70,0x65,0x6e,0x3a,0x73,0x6c,0x69,0x64,0x65,0x5f,0x6d,0x65,0x6e,0x75,0x00,0x74,0x65,0x78,0x74,
|
||||
0x00,0x53,0x6c,0x69,0x64,0x65,0x20,0x4d,0x65,0x6e,0x75,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,
|
||||
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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x63,0x61,0x6c,0x69,0x62,0x72,
|
||||
0x61,0x74,0x69,0x6f,0x6e,0x5f,0x77,0x69,0x6e,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x61,0x6c,0x69,0x62,
|
||||
0x72,0x61,0x74,0x69,0x6f,0x6e,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,
|
||||
0x76,0x67,0x63,0x61,0x6e,0x76,0x61,0x73,0x00,0x74,0x65,0x78,0x74,0x00,0x56,0x47,0x20,0x43,0x61,0x6e,
|
||||
0x76,0x61,0x73,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x73,0x68,0x6f,0x77,0x5f,0x66,0x70,0x73,0x00,0x74,
|
||||
0x65,0x78,0x74,0x00,0x53,0x68,0x6f,0x77,0x20,0x46,0x50,0x53,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,
|
||||
0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x6c,0x69,0x6e,0x65,0x61,0x72,0x5f,0x67,
|
||||
0x72,0x61,0x64,0x69,0x65,0x6e,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0x4c,0x69,0x6e,0x65,0x61,0x72,0x20,
|
||||
0x47,0x72,0x61,0x64,0x69,0x65,0x6e,0x74,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x65,0x78,0x69,0x74,
|
||||
0x00,0x74,0x65,0x78,0x74,0x00,0x45,0x78,0x69,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*3600*/
|
||||
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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x72,0x61,0x64,
|
||||
0x69,0x61,0x6c,0x5f,0x67,0x72,0x61,0x64,0x69,0x65,0x6e,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0x52,0x61,
|
||||
0x64,0x69,0x61,0x6c,0x20,0x47,0x72,0x61,0x64,0x69,0x65,0x6e,0x74,0x00,0x00,0x00,0x62,0x75,0x74,0x74,
|
||||
0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,
|
||||
0x6e,0x3a,0x73,0x74,0x72,0x6f,0x6b,0x65,0x5f,0x67,0x72,0x61,0x64,0x69,0x65,0x6e,0x74,0x00,0x74,0x65,
|
||||
0x78,0x74,0x00,0x53,0x74,0x72,0x6f,0x6b,0x65,0x20,0x47,0x72,0x61,0x64,0x69,0x65,0x6e,0x74,0x00,0x00,
|
||||
0x00,0x00,0x76,0x69,0x65,0x77,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,0x01,0x01,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0x61,
|
||||
0x79,0x6f,0x75,0x74,0x00,0x63,0x31,0x20,0x72,0x38,0x20,0x6d,0x35,0x20,0x73,0x35,0x00,0x00,0x62,0x75,
|
||||
0x74,0x74,0x6f,0x6e,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,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,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x63,0x61,0x6c,0x69,0x62,0x72,0x61,
|
||||
0x74,0x69,0x6f,0x6e,0x5f,0x77,0x69,0x6e,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x61,0x6c,0x69,0x62,0x72,
|
||||
0x61,0x74,0x69,0x6f,0x6e,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x6e,0x61,0x6d,0x65,0x00,0x73,0x68,0x6f,0x77,0x5f,0x66,0x70,0x73,0x00,0x74,0x65,
|
||||
0x78,0x74,0x00,0x53,0x68,0x6f,0x77,0x20,0x46,0x50,0x53,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,
|
||||
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,0x6e,0x61,0x6d,0x65,0x00,0x65,0x78,0x69,0x74,0x00,
|
||||
0x74,0x65,0x78,0x74,0x00,0x45,0x78,0x69,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*3699*/
|
||||
|
@ -1,5 +1,5 @@
|
||||
const unsigned char ui_svg_image[] = {
|
||||
0x04,0x00,0x01,0x01,0x2a,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x76,0x67,0x5f,0x69,0x6d,0x61,0x67,
|
||||
0x04,0x00,0x01,0x01,0xda,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x76,0x67,0x5f,0x69,0x6d,0x61,0x67,
|
||||
0x65,0x00,0x64,0x61,0x74,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x77,0x69,0x6e,0x64,0x6f,0x77,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,
|
||||
@ -63,8 +63,4 @@ const unsigned char ui_svg_image[] = {
|
||||
0x3d,0x30,0x2c,0x20,0x78,0x5f,0x74,0x6f,0x3d,0x32,0x2c,0x20,0x79,0x5f,0x66,0x72,0x6f,0x6d,0x3d,0x30,
|
||||
0x2c,0x20,0x79,0x5f,0x74,0x6f,0x3d,0x32,0x2c,0x20,0x79,0x6f,0x79,0x6f,0x5f,0x74,0x69,0x6d,0x65,0x73,
|
||||
0x3d,0x31,0x30,0x30,0x30,0x2c,0x20,0x64,0x75,0x72,0x61,0x74,0x69,0x6f,0x6e,0x3d,0x35,0x30,0x30,0x30,
|
||||
0x29,0x3b,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,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,};/*1370*/
|
||||
0x29,0x3b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*1290*/
|
||||
|
@ -1,5 +1,5 @@
|
||||
const unsigned char ui_system_bar[] = {
|
||||
0x04,0x00,0x01,0x01,0x71,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x79,0x73,0x74,0x65,0x6d,0x5f,0x62,
|
||||
0x04,0x00,0x01,0x01,0x73,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x79,0x73,0x74,0x65,0x6d,0x5f,0x62,
|
||||
0x61,0x72,0x00,0x64,0x61,0x74,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x73,0x79,0x73,0x74,0x65,0x6d,0x5f,0x62,0x61,0x72,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
@ -14,9 +14,9 @@ const unsigned char ui_system_bar[] = {
|
||||
0x00,0x00,0x00,0x64,0x69,0x67,0x69,0x74,0x5f,0x63,0x6c,0x6f,0x63,0x6b,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x02,0x01,0x01,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,
|
||||
0x74,0x79,0x6c,0x65,0x00,0x74,0x69,0x6d,0x65,0x00,0x66,0x6f,0x72,0x6d,0x61,0x74,0x00,0x68,0x3a,0x6d,
|
||||
0x00,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x03,0x02,0x00,0x00,
|
||||
0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1a,0x00,0x00,0x00,0x1a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x73,0x74,0x79,0x6c,0x65,0x00,0x63,0x6c,0x6f,0x73,0x65,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x6c,0x6f,
|
||||
0x73,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*417*/
|
||||
0x74,0x79,0x6c,0x65,0x00,0x74,0x69,0x6d,0x65,0x00,0x66,0x6f,0x72,0x6d,0x61,0x74,0x00,0x68,0x68,0x3a,
|
||||
0x6d,0x6d,0x00,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,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,0x03,0x02,
|
||||
0x00,0x00,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1a,0x00,0x00,0x00,0x1a,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x63,0x6c,0x6f,0x73,0x65,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,
|
||||
0x6c,0x6f,0x73,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*419*/
|
||||
|
@ -1,5 +1,5 @@
|
||||
const unsigned char ui_time_clock[] = {
|
||||
0x04,0x00,0x01,0x01,0x65,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x69,0x6d,0x65,0x5f,0x63,0x6c,0x6f,
|
||||
0x04,0x00,0x01,0x01,0xf5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x69,0x6d,0x65,0x5f,0x63,0x6c,0x6f,
|
||||
0x63,0x6b,0x00,0x64,0x61,0x74,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x77,0x69,0x6e,0x64,0x6f,0x77,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,
|
||||
@ -13,23 +13,4 @@ const unsigned char ui_time_clock[] = {
|
||||
0x67,0x65,0x00,0x63,0x6c,0x6f,0x63,0x6b,0x5f,0x68,0x6f,0x75,0x72,0x00,0x6d,0x69,0x6e,0x75,0x74,0x65,
|
||||
0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x63,0x6c,0x6f,0x63,0x6b,0x5f,0x6d,0x69,0x6e,0x75,0x74,0x65,0x00,
|
||||
0x73,0x65,0x63,0x6f,0x6e,0x64,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x63,0x6c,0x6f,0x63,0x6b,0x5f,0x73,
|
||||
0x65,0x63,0x6f,0x6e,0x64,0x00,0x00,0x00,0x64,0x69,0x67,0x69,0x74,0x5f,0x63,0x6c,0x6f,0x63,0x6b,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x2c,0x01,0x00,0x00,0x1e,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x66,0x6f,0x72,0x6d,0x61,0x74,0x00,0x59,0x2f,0x4d,0x2f,0x44,0x00,0x00,0x00,0x64,
|
||||
0x69,0x67,0x69,0x74,0x5f,0x63,0x6c,0x6f,0x63,0x6b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x28,
|
||||
0x00,0x00,0x00,0x2c,0x01,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x72,0x6d,0x61,
|
||||
0x74,0x00,0x68,0x3a,0x6d,0x3a,0x73,0x00,0x00,0x00,0x64,0x69,0x67,0x69,0x74,0x5f,0x63,0x6c,0x6f,0x63,
|
||||
0x6b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x46,0x00,0x00,0x00,0x2c,0x01,0x00,0x00,0x1e,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x72,0x6d,0x61,0x74,0x00,0x68,0x3a,0x6d,0x00,0x00,0x00,0x64,
|
||||
0x69,0x67,0x69,0x74,0x5f,0x63,0x6c,0x6f,0x63,0x6b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x32,
|
||||
0x00,0x00,0x00,0x2c,0x01,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x72,0x6d,0x61,
|
||||
0x74,0x00,0x59,0x2f,0x4d,0x2f,0x44,0x20,0x68,0x3a,0x6d,0x3a,0x73,0x00,0x00,0x00,0x62,0x75,0x74,0x74,
|
||||
0x6f,0x6e,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,0x02,0x03,0x01,0x00,0x00,0x00,0x00,0x00,0x0a,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,};/*661*/
|
||||
0x65,0x63,0x6f,0x6e,0x64,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*293*/
|
||||
|
BIN
demos/assets/raw/ui/digit_clock.bin
Normal file
BIN
demos/assets/raw/ui/digit_clock.bin
Normal file
Binary file not shown.
10
demos/assets/raw/ui/digit_clock.xml
Normal file
10
demos/assets/raw/ui/digit_clock.xml
Normal file
@ -0,0 +1,10 @@
|
||||
<window anim_hint="htranslate" layout="c:1 h:30 s:10">
|
||||
<digit_clock format="h:m" />
|
||||
<digit_clock format="hh:mm" />
|
||||
<digit_clock format="h:m:s"/>
|
||||
<digit_clock format="hh:mm:ss"/>
|
||||
<digit_clock format="Y/M/D"/>
|
||||
<digit_clock format="YY-MM-DD"/>
|
||||
<digit_clock format="Y/M/D h:mm:ss"/>
|
||||
<digit_clock format="YY/MM/DD h:mm:ss"/>
|
||||
</window>
|
Binary file not shown.
@ -5,5 +5,4 @@
|
||||
<gif image="bee"/>
|
||||
<gif image="bee"/>
|
||||
</view>
|
||||
<button name="close" x="c" y="bottom:10" w="80" h="40" text="Close" />
|
||||
</window>
|
||||
|
Binary file not shown.
@ -16,17 +16,18 @@
|
||||
</view>
|
||||
|
||||
<view x="0" y="0" w="100%" h="100%" layout="c2 r8 m5 s5">
|
||||
<button name="open:time_clock" text="Analog Clock"/>
|
||||
<button name="open:digit_clock" text="Digit Clock"/>
|
||||
<button name="open:locale" text="Locale"/>
|
||||
<button name="open:time_clock" text="Time Clock"/>
|
||||
<button name="open:guage" text="Guage"/>
|
||||
<button name="open:images" text="Image"/>
|
||||
<button name="open:guage" text="Guage"/>
|
||||
<button name="open:switch" text="Switch"/>
|
||||
<button name="open:text_selector" text="Selector"/>
|
||||
<button name="open:image_animation" text="Image Animation"/>
|
||||
<button name="open:progress_circle" text="ProgressCircle"/>
|
||||
<button name="open:image_value" text="Value Image"/>
|
||||
<button name="open:svg_image" text="SVG Image"/>
|
||||
<button name="open:gif_image" text="GIF Image"/>
|
||||
<button name="open:image_value" text="Value Image"/>
|
||||
</view>
|
||||
|
||||
<view x="0" y="0" w="100%" h="100%" layout="c2 r8 m5 s5">
|
||||
|
Binary file not shown.
@ -13,5 +13,4 @@
|
||||
|
||||
<svg image="pointer_4"
|
||||
animation="rotation(from=0, to=6.28, yoyo_times=1000, duration=5000);scale(x_from=0, x_to=2, y_from=0, y_to=2, yoyo_times=1000, duration=5000);"/>
|
||||
<button name="close" text="Close"/>
|
||||
</window>
|
||||
|
Binary file not shown.
@ -1,7 +1,7 @@
|
||||
<system_bar h="30">
|
||||
<column x="0" y="0" w="-40" h="100%">
|
||||
<label style="title" x="10" y="m" w="55%" h="100%" name="title"/>
|
||||
<digit_clock style="time" x="r" y="m" w="40%" h="100%" format="h:m"/>
|
||||
<digit_clock style="time" x="r" y="m" w="40%" h="100%" format="hh:mm"/>
|
||||
</column>
|
||||
<button style="close" x="r:5" y="m" w="26" h="26" name="close" text="x"/>
|
||||
</system_bar>
|
||||
|
Binary file not shown.
@ -1,11 +1,4 @@
|
||||
<window anim_hint="htranslate" >
|
||||
<time_clock x="c" y="m" w="300" h="300" bg_image="clock_bg" image="clock"
|
||||
hour_image="clock_hour" minute_image="clock_minute" second_image="clock_second"/>
|
||||
|
||||
<digit_clock x="c" y="10" w="300" h="30" format="Y/M/D"/>
|
||||
<digit_clock x="c" y="40" w="300" h="30" format="h:m:s"/>
|
||||
<digit_clock x="c" y="70" w="300" h="30" format="h:m" />
|
||||
<digit_clock x="c" y="bottom:50" w="300" h="30" format="Y/M/D h:m:s"/>
|
||||
|
||||
<button name="close" x="center" y="bottom:10" w="25%" h="30" text="Close"/>
|
||||
</window>
|
||||
|
@ -1,8 +1,9 @@
|
||||
# 最新动态
|
||||
|
||||
* 2018/12/08-11
|
||||
* 2018/12/11
|
||||
* gradiant支持alpha渐变。
|
||||
* 完善slide menu控件,增加测试和demo。
|
||||
* 完善digit\_clock,支持YY、MM、DD、HH、mm、dd格式
|
||||
|
||||
* 2018/12/08-10
|
||||
* slide menu控件。
|
||||
|
@ -27,35 +27,70 @@
|
||||
|
||||
#define DATE_TIME_MAX_LEN 127
|
||||
|
||||
static uint32_t count_char(const char* p, char c) {
|
||||
uint32_t nr = 0;
|
||||
while (*p++ == c) {
|
||||
nr++;
|
||||
}
|
||||
|
||||
return nr;
|
||||
}
|
||||
|
||||
ret_t digit_clock_format_time(widget_t* widget, const char* format, date_time_t* dt) {
|
||||
wstr_t* str = &(widget->text);
|
||||
const char* p = format;
|
||||
|
||||
str->size = 0;
|
||||
while (*p) {
|
||||
int32_t repeat = count_char(p, *p);
|
||||
|
||||
switch (*p) {
|
||||
case 'Y': {
|
||||
wstr_push_int(str, "%d", dt->year);
|
||||
if (repeat == 2) {
|
||||
wstr_push_int(str, "%02d", (dt->year % 100));
|
||||
} else {
|
||||
wstr_push_int(str, "%d", dt->year);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'M': {
|
||||
wstr_push_int(str, "%d", dt->month);
|
||||
if (repeat == 2) {
|
||||
wstr_push_int(str, "%02d", dt->month);
|
||||
} else {
|
||||
wstr_push_int(str, "%d", dt->month);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'D': {
|
||||
wstr_push_int(str, "%d", dt->day);
|
||||
if (repeat == 2) {
|
||||
wstr_push_int(str, "%02d", dt->day);
|
||||
} else {
|
||||
wstr_push_int(str, "%d", dt->day);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'h': {
|
||||
wstr_push_int(str, "%d", dt->hour);
|
||||
if (repeat == 2) {
|
||||
wstr_push_int(str, "%02d", dt->hour);
|
||||
} else {
|
||||
wstr_push_int(str, "%d", dt->hour);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'm': {
|
||||
wstr_push_int(str, "%d", dt->minute);
|
||||
if (repeat == 2) {
|
||||
wstr_push_int(str, "%02d", dt->minute);
|
||||
} else {
|
||||
wstr_push_int(str, "%d", dt->minute);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 's': {
|
||||
wstr_push_int(str, "%d", dt->second);
|
||||
if (repeat == 2) {
|
||||
wstr_push_int(str, "%02d", dt->second);
|
||||
} else {
|
||||
wstr_push_int(str, "%d", dt->second);
|
||||
}
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@ -63,7 +98,7 @@ ret_t digit_clock_format_time(widget_t* widget, const char* format, date_time_t*
|
||||
break;
|
||||
}
|
||||
}
|
||||
p++;
|
||||
p += repeat;
|
||||
}
|
||||
|
||||
return RET_OK;
|
||||
|
@ -39,16 +39,24 @@ typedef struct _digit_clock_t {
|
||||
* @property {char*} format
|
||||
* @annotation ["set_prop","get_prop","readable","persitent","design","scriptable"]
|
||||
* 显示格式。
|
||||
* Y 代表年
|
||||
* M 代表月
|
||||
* D 代表日
|
||||
* h 代表时
|
||||
* m 代表分
|
||||
* s 代表秒
|
||||
* Y 代表年(完整显示)
|
||||
* M 代表月(1-12)
|
||||
* D 代表日(1-31)
|
||||
* h 代表时(0-23)
|
||||
* m 代表分(0-59)
|
||||
* s 代表秒(0-59)
|
||||
* YY 代表年(只显示末两位)
|
||||
* MM 代表月(01-12)
|
||||
* DD 代表日(01-31)
|
||||
* hh 代表时(00-23)
|
||||
* mm 代表分(00-59)
|
||||
* ss 代表秒(00-59)
|
||||
*
|
||||
* 如 日期时间为:2018/11/12 9:10:20
|
||||
* "Y/D/M"显示为"2018/11/12"
|
||||
* "Y-D-M"显示为"2018-11-12"
|
||||
* "Y-D-M h:m:s"显示为"2018-11-12 9:10:20"
|
||||
* "Y-D-M hh:mm:ss"显示为"2018-11-12 09:10:20"
|
||||
*/
|
||||
char* format;
|
||||
|
||||
|
@ -30,51 +30,91 @@ TEST(DigitClock, format) {
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("2018"));
|
||||
|
||||
ASSERT_EQ(digit_clock_format_time(w, "YY", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("18"));
|
||||
|
||||
ASSERT_EQ(digit_clock_format_time(w, "Y-", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("2018-"));
|
||||
|
||||
dt.month = 12;
|
||||
ASSERT_EQ(digit_clock_format_time(w, "YY-", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("18-"));
|
||||
|
||||
dt.month = 9;
|
||||
ASSERT_EQ(digit_clock_format_time(w, "Y-M", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("2018-12"));
|
||||
ASSERT_EQ(string(str), string("2018-9"));
|
||||
|
||||
ASSERT_EQ(digit_clock_format_time(w, "YY-MM", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("18-09"));
|
||||
|
||||
ASSERT_EQ(digit_clock_format_time(w, "Y-M-", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("2018-12-"));
|
||||
ASSERT_EQ(string(str), string("2018-9-"));
|
||||
|
||||
dt.day = 31;
|
||||
dt.day = 3;
|
||||
ASSERT_EQ(digit_clock_format_time(w, "Y-M-D", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("2018-12-31"));
|
||||
ASSERT_EQ(string(str), string("2018-9-3"));
|
||||
|
||||
ASSERT_EQ(digit_clock_format_time(w, "YY-MM-DD", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("18-09-03"));
|
||||
|
||||
ASSERT_EQ(digit_clock_format_time(w, "Y-M-D ", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("2018-12-31 "));
|
||||
ASSERT_EQ(string(str), string("2018-9-3 "));
|
||||
|
||||
ASSERT_EQ(digit_clock_format_time(w, "YY-MM-DD ", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("18-09-03 "));
|
||||
|
||||
dt.hour = 1;
|
||||
ASSERT_EQ(digit_clock_format_time(w, "Y-M-D h", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("2018-12-31 1"));
|
||||
ASSERT_EQ(string(str), string("2018-9-3 1"));
|
||||
|
||||
ASSERT_EQ(digit_clock_format_time(w, "YY-MM-DD hh", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("18-09-03 01"));
|
||||
|
||||
ASSERT_EQ(digit_clock_format_time(w, "Y-M-D h:", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("2018-12-31 1:"));
|
||||
ASSERT_EQ(string(str), string("2018-9-3 1:"));
|
||||
|
||||
ASSERT_EQ(digit_clock_format_time(w, "YY-MM-DD hh:", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("18-09-03 01:"));
|
||||
|
||||
dt.minute = 2;
|
||||
ASSERT_EQ(digit_clock_format_time(w, "Y-M-D h:m", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("2018-12-31 1:2"));
|
||||
ASSERT_EQ(string(str), string("2018-9-3 1:2"));
|
||||
|
||||
ASSERT_EQ(digit_clock_format_time(w, "YY-MM-DD hh:mm", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("18-09-03 01:02"));
|
||||
|
||||
dt.second = 3;
|
||||
ASSERT_EQ(digit_clock_format_time(w, "Y-M-D h:m:s", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("2018-12-31 1:2:3"));
|
||||
ASSERT_EQ(string(str), string("2018-9-3 1:2:3"));
|
||||
|
||||
ASSERT_EQ(digit_clock_format_time(w, "YY-MM-DD hh:mm:ss", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("18-09-03 01:02:03"));
|
||||
|
||||
dt.second = 32;
|
||||
ASSERT_EQ(digit_clock_format_time(w, "Y-M-D h:m:s", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("2018-12-31 1:2:32"));
|
||||
ASSERT_EQ(string(str), string("2018-9-3 1:2:32"));
|
||||
|
||||
ASSERT_EQ(digit_clock_format_time(w, "Y-M-D hh:mm:ss", &dt), RET_OK);
|
||||
ASSERT_EQ(wstr_get_utf8(&(w->text), str, sizeof(str)), RET_OK);
|
||||
ASSERT_EQ(string(str), string("2018-9-3 01:02:32"));
|
||||
|
||||
widget_destroy(w);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user