mirror of
https://github.com/zlgopen/awtk.git
synced 2025-05-09 03:51:08 +08:00
improve slide view
This commit is contained in:
lixianjing
parent
c3930a6d40
commit
9b906bd480
@ -910,22 +910,22 @@ static ret_t on_idle_scroll_view_set_virtual_wh(const idle_info_t* idle) {
|
|||||||
|
|
||||||
static ret_t on_click_next_page(void* ctx, event_t* e) {
|
static ret_t on_click_next_page(void* ctx, event_t* e) {
|
||||||
const char* name = (const char*)ctx;
|
const char* name = (const char*)ctx;
|
||||||
widget_t* scroll_view = widget_lookup(window_manager(), name, TRUE);
|
widget_t* pages = widget_lookup(window_manager(), name, TRUE);
|
||||||
int32_t curr_page = widget_get_prop_int(scroll_view, WIDGET_PROP_CURR_PAGE, 0);
|
int32_t curr_page = widget_get_prop_int(pages, WIDGET_PROP_CURR_PAGE, 0);
|
||||||
int32_t max_page = widget_get_prop_int(scroll_view, WIDGET_PROP_PAGE_MAX_NUMBER, 0);
|
int32_t max_page = widget_get_prop_int(pages, WIDGET_PROP_PAGE_MAX_NUMBER, 0);
|
||||||
int32_t next_page = (curr_page + 1) % max_page;
|
int32_t next_page = (curr_page + 1) % max_page;
|
||||||
|
|
||||||
return widget_set_prop_int(scroll_view, WIDGET_PROP_CURR_PAGE, next_page);
|
return widget_set_prop_int(pages, WIDGET_PROP_CURR_PAGE, next_page);
|
||||||
}
|
}
|
||||||
|
|
||||||
static ret_t on_click_prev_page(void* ctx, event_t* e) {
|
static ret_t on_click_prev_page(void* ctx, event_t* e) {
|
||||||
const char* name = (const char*)ctx;
|
const char* name = (const char*)ctx;
|
||||||
widget_t* scroll_view = widget_lookup(window_manager(), name, TRUE);
|
widget_t* pages = widget_lookup(window_manager(), name, TRUE);
|
||||||
int32_t curr_page = widget_get_prop_int(scroll_view, WIDGET_PROP_CURR_PAGE, 0);
|
int32_t curr_page = widget_get_prop_int(pages, WIDGET_PROP_CURR_PAGE, 0);
|
||||||
int32_t max_page = widget_get_prop_int(scroll_view, WIDGET_PROP_PAGE_MAX_NUMBER, 0);
|
int32_t max_page = widget_get_prop_int(pages, WIDGET_PROP_PAGE_MAX_NUMBER, 0);
|
||||||
int32_t next_page = curr_page == 0 ? max_page : (curr_page - 1) % max_page;
|
int32_t next_page = curr_page == 0 ? max_page - 1 : (curr_page - 1) % max_page;
|
||||||
|
|
||||||
return widget_set_prop_int(scroll_view, WIDGET_PROP_CURR_PAGE, next_page);
|
return widget_set_prop_int(pages, WIDGET_PROP_CURR_PAGE, next_page);
|
||||||
}
|
}
|
||||||
|
|
||||||
static ret_t install_one(void* ctx, const void* iter) {
|
static ret_t install_one(void* ctx, const void* iter) {
|
||||||
|
|||||||
@ -1,6 +1,8 @@
|
|||||||
<window anim_hint="htranslate">
|
<window anim_hint="htranslate">
|
||||||
<slide_view x="0" y="0" w="100%" h="100%" style="dot" loop="true">
|
<slide_view name="test" x="0" y="0" w="100%" h="100%" style="dot" loop="true">
|
||||||
<?include filename="slide_view.inc" ?>
|
<?include filename="slide_view.inc" ?>
|
||||||
</slide_view>
|
</slide_view>
|
||||||
<slide_indicator x="0" y="b" w="100%" h="20" style="icon"/>
|
<slide_indicator x="c" y="b" w="70%" h="20" style="icon"/>
|
||||||
|
<button name="next_page:test" x="0" y="b" w="15%" h="20" text="next"/>
|
||||||
|
<button name="prev_page:test" x="r" y="b" w="15%" h="20" text="perv"/>
|
||||||
</window>
|
</window>
|
||||||
|
|||||||
@ -1,6 +1,8 @@
|
|||||||
<window anim_hint="htranslate">
|
<window anim_hint="htranslate">
|
||||||
<slide_view x="0" y="0" w="100%" h="100%" vertical="true" loop="true">
|
<slide_view name="test" x="0" y="0" w="100%" h="100%" vertical="true" loop="true">
|
||||||
<?include filename="slide_view.inc" ?>
|
<?include filename="slide_view.inc" ?>
|
||||||
</slide_view>
|
</slide_view>
|
||||||
<slide_indicator x="r" y="0" w="20" h="100%" style="icon"/>
|
<slide_indicator x="c" y="b" w="70%" h="20" style="icon"/>
|
||||||
|
<button name="next_page:test" x="0" y="b" w="15%" h="20" text="next"/>
|
||||||
|
<button name="prev_page:test" x="r" y="b" w="15%" h="20" text="perv"/>
|
||||||
</window>
|
</window>
|
||||||
|
|||||||
@ -3,6 +3,7 @@
|
|||||||
2022/10/17
|
2022/10/17
|
||||||
* 增加获取自定义键值表函数接口(感谢兆坤提供补丁)
|
* 增加获取自定义键值表函数接口(感谢兆坤提供补丁)
|
||||||
* 修复list_view的按键 滚动的问题(感谢智明提供补丁)
|
* 修复list_view的按键 滚动的问题(感谢智明提供补丁)
|
||||||
|
* 修改slide_view在开头页上一页或者最后一页的时候切换下一页滑动逻辑(感谢智明提供补丁)
|
||||||
|
|
||||||
2022/10/15
|
2022/10/15
|
||||||
* 增加str\_from\_xxx函数。
|
* 增加str\_from\_xxx函数。
|
||||||
|
|||||||
@ -251,6 +251,7 @@ extern TK_CONST_DATA_ALIGN(const unsigned char data_com_zlg_app_json[]);
|
|||||||
extern TK_CONST_DATA_ALIGN(const unsigned char data_gpinyin_dat[]);
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_gpinyin_dat[]);
|
||||||
extern TK_CONST_DATA_ALIGN(const unsigned char data_test_dat[]);
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_test_dat[]);
|
||||||
extern TK_CONST_DATA_ALIGN(const unsigned char data_conf_test_json[]);
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_conf_test_json[]);
|
||||||
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_custom_keys_json[]);
|
||||||
extern TK_CONST_DATA_ALIGN(const unsigned char data_suggest_words_zh_cn_dat[]);
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_suggest_words_zh_cn_dat[]);
|
||||||
extern TK_CONST_DATA_ALIGN(const unsigned char data_test_json[]);
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_test_json[]);
|
||||||
extern TK_CONST_DATA_ALIGN(const unsigned char data_a_b_c_any[]);
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_a_b_c_any[]);
|
||||||
@ -1138,6 +1139,7 @@ ret_t assets_init_dark(void) {
|
|||||||
assets_manager_add(am, data_gpinyin_dat);
|
assets_manager_add(am, data_gpinyin_dat);
|
||||||
assets_manager_add(am, data_test_dat);
|
assets_manager_add(am, data_test_dat);
|
||||||
assets_manager_add(am, data_conf_test_json);
|
assets_manager_add(am, data_conf_test_json);
|
||||||
|
assets_manager_add(am, data_custom_keys_json);
|
||||||
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
||||||
assets_manager_add(am, data_test_json);
|
assets_manager_add(am, data_test_json);
|
||||||
assets_manager_add(am, data_a_b_c_any);
|
assets_manager_add(am, data_a_b_c_any);
|
||||||
|
|||||||
@ -251,6 +251,7 @@
|
|||||||
#include "default/inc/data/gpinyin_dat.data"
|
#include "default/inc/data/gpinyin_dat.data"
|
||||||
#include "default/inc/data/test_dat.data"
|
#include "default/inc/data/test_dat.data"
|
||||||
#include "default/inc/data/conf_test_json.data"
|
#include "default/inc/data/conf_test_json.data"
|
||||||
|
#include "default/inc/data/custom_keys_json.data"
|
||||||
#include "default/inc/data/suggest_words_zh_cn_dat.data"
|
#include "default/inc/data/suggest_words_zh_cn_dat.data"
|
||||||
#include "default/inc/data/test_json.data"
|
#include "default/inc/data/test_json.data"
|
||||||
#include "default/inc/data/a_b_c_any.data"
|
#include "default/inc/data/a_b_c_any.data"
|
||||||
@ -1138,6 +1139,7 @@ ret_t assets_init_default(void) {
|
|||||||
assets_manager_add(am, data_gpinyin_dat);
|
assets_manager_add(am, data_gpinyin_dat);
|
||||||
assets_manager_add(am, data_test_dat);
|
assets_manager_add(am, data_test_dat);
|
||||||
assets_manager_add(am, data_conf_test_json);
|
assets_manager_add(am, data_conf_test_json);
|
||||||
|
assets_manager_add(am, data_custom_keys_json);
|
||||||
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
||||||
assets_manager_add(am, data_test_json);
|
assets_manager_add(am, data_test_json);
|
||||||
assets_manager_add(am, data_a_b_c_any);
|
assets_manager_add(am, data_a_b_c_any);
|
||||||
|
|||||||
@ -204,6 +204,7 @@ extern TK_CONST_DATA_ALIGN(const unsigned char data_com_zlg_app_json[]);
|
|||||||
extern TK_CONST_DATA_ALIGN(const unsigned char data_gpinyin_dat[]);
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_gpinyin_dat[]);
|
||||||
extern TK_CONST_DATA_ALIGN(const unsigned char data_test_dat[]);
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_test_dat[]);
|
||||||
extern TK_CONST_DATA_ALIGN(const unsigned char data_conf_test_json[]);
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_conf_test_json[]);
|
||||||
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_custom_keys_json[]);
|
||||||
extern TK_CONST_DATA_ALIGN(const unsigned char data_suggest_words_zh_cn_dat[]);
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_suggest_words_zh_cn_dat[]);
|
||||||
extern TK_CONST_DATA_ALIGN(const unsigned char data_test_json[]);
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_test_json[]);
|
||||||
extern TK_CONST_DATA_ALIGN(const unsigned char data_a_b_c_any[]);
|
extern TK_CONST_DATA_ALIGN(const unsigned char data_a_b_c_any[]);
|
||||||
@ -721,6 +722,7 @@ ret_t assets_init_dark(void) {
|
|||||||
assets_manager_add(am, data_gpinyin_dat);
|
assets_manager_add(am, data_gpinyin_dat);
|
||||||
assets_manager_add(am, data_test_dat);
|
assets_manager_add(am, data_test_dat);
|
||||||
assets_manager_add(am, data_conf_test_json);
|
assets_manager_add(am, data_conf_test_json);
|
||||||
|
assets_manager_add(am, data_custom_keys_json);
|
||||||
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
||||||
assets_manager_add(am, data_test_json);
|
assets_manager_add(am, data_test_json);
|
||||||
assets_manager_add(am, data_a_b_c_any);
|
assets_manager_add(am, data_a_b_c_any);
|
||||||
|
|||||||
@ -204,6 +204,7 @@
|
|||||||
#include "default/inc/data/gpinyin_dat.data"
|
#include "default/inc/data/gpinyin_dat.data"
|
||||||
#include "default/inc/data/test_dat.data"
|
#include "default/inc/data/test_dat.data"
|
||||||
#include "default/inc/data/conf_test_json.data"
|
#include "default/inc/data/conf_test_json.data"
|
||||||
|
#include "default/inc/data/custom_keys_json.data"
|
||||||
#include "default/inc/data/suggest_words_zh_cn_dat.data"
|
#include "default/inc/data/suggest_words_zh_cn_dat.data"
|
||||||
#include "default/inc/data/test_json.data"
|
#include "default/inc/data/test_json.data"
|
||||||
#include "default/inc/data/a_b_c_any.data"
|
#include "default/inc/data/a_b_c_any.data"
|
||||||
@ -721,6 +722,7 @@ ret_t assets_init_default(void) {
|
|||||||
assets_manager_add(am, data_gpinyin_dat);
|
assets_manager_add(am, data_gpinyin_dat);
|
||||||
assets_manager_add(am, data_test_dat);
|
assets_manager_add(am, data_test_dat);
|
||||||
assets_manager_add(am, data_conf_test_json);
|
assets_manager_add(am, data_conf_test_json);
|
||||||
|
assets_manager_add(am, data_custom_keys_json);
|
||||||
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
||||||
assets_manager_add(am, data_test_json);
|
assets_manager_add(am, data_test_json);
|
||||||
assets_manager_add(am, data_a_b_c_any);
|
assets_manager_add(am, data_a_b_c_any);
|
||||||
|
|||||||
8
res/assets/default/inc/data/custom_keys_json.data
Normal file
8
res/assets/default/inc/data/custom_keys_json.data
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
TK_CONST_DATA_ALIGN(const unsigned char data_custom_keys_json[]) = {
|
||||||
|
0x09,0x00,0x03,0x01,0x49,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x75,0x73,0x74,0x6f,0x6d,0x5f,0x6b,
|
||||||
|
0x65,0x79,0x73,0x2e,0x6a,0x73,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||||
|
0x00,0x00,0x00,0x00,0x7b,0x0d,0x0a,0x20,0x20,0x20,0x20,0x22,0x43,0x55,0x53,0x54,0x4f,0x4d,0x31,0x22,
|
||||||
|
0x20,0x3a,0x20,0x7b,0x0d,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x22,0x74,0x79,0x70,0x65,0x22,
|
||||||
|
0x20,0x3a,0x20,0x30,0x2c,0x0d,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x22,0x76,0x61,0x6c,0x75,
|
||||||
|
0x65,0x22,0x20,0x3a,0x20,0x31,0x33,0x0d,0x0a,0x20,0x20,0x20,0x20,0x7d,0x0d,0x0a,0x7d,0x00,0x00,0x00,
|
||||||
|
0x00,};/*121*/
|
||||||
@ -1,5 +1,5 @@
|
|||||||
TK_CONST_DATA_ALIGN(const unsigned char ui_main_fscript[]) = {
|
TK_CONST_DATA_ALIGN(const unsigned char ui_main_fscript[]) = {
|
||||||
0x04,0x00,0x01,0x01,0xab,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0x61,0x69,0x6e,0x5f,0x66,0x73,0x63,
|
0x04,0x00,0x01,0x01,0x74,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0x61,0x69,0x6e,0x5f,0x66,0x73,0x63,
|
||||||
0x72,0x69,0x70,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
0x72,0x69,0x70,0x74,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,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,
|
||||||
@ -23,118 +23,128 @@ TK_CONST_DATA_ALIGN(const unsigned char ui_main_fscript[]) = {
|
|||||||
0x72,0x65,0x73,0x73,0x3a,0x22,0x2c,0x20,0x6b,0x65,0x79,0x2c,0x20,0x22,0x61,0x6c,0x74,0x3d,0x22,0x2c,
|
0x72,0x65,0x73,0x73,0x3a,0x22,0x2c,0x20,0x6b,0x65,0x79,0x2c,0x20,0x22,0x61,0x6c,0x74,0x3d,0x22,0x2c,
|
||||||
0x20,0x61,0x6c,0x74,0x2c,0x20,0x22,0x63,0x74,0x72,0x6c,0x3d,0x22,0x2c,0x20,0x63,0x74,0x72,0x6c,0x2c,
|
0x20,0x61,0x6c,0x74,0x2c,0x20,0x22,0x63,0x74,0x72,0x6c,0x3d,0x22,0x2c,0x20,0x63,0x74,0x72,0x6c,0x2c,
|
||||||
0x20,0x22,0x63,0x6d,0x64,0x3d,0x22,0x2c,0x20,0x63,0x6d,0x64,0x2c,0x20,0x22,0x6d,0x65,0x6e,0x75,0x3d,
|
0x20,0x22,0x63,0x6d,0x64,0x3d,0x22,0x2c,0x20,0x63,0x6d,0x64,0x2c,0x20,0x22,0x6d,0x65,0x6e,0x75,0x3d,
|
||||||
0x22,0x2c,0x20,0x6d,0x65,0x6e,0x75,0x29,0x3b,0x00,0x00,0x76,0x69,0x65,0x77,0x00,0x00,0x00,0x00,0x00,
|
0x22,0x2c,0x20,0x6d,0x65,0x6e,0x75,0x29,0x3b,0x00,0x6f,0x6e,0x3a,0x77,0x69,0x6e,0x64,0x6f,0x77,0x5f,
|
||||||
|
0x6f,0x70,0x65,0x6e,0x00,0x67,0x6c,0x6f,0x62,0x61,0x6c,0x2e,0x69,0x73,0x5f,0x73,0x68,0x6f,0x77,0x5f,
|
||||||
|
0x66,0x70,0x73,0x20,0x3d,0x20,0x66,0x61,0x6c,0x73,0x65,0x3b,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x73,
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x64,0x00,
|
||||||
0x65,0x6c,0x66,0x5f,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x28,0x78,
|
0x00,0x00,0x73,0x65,0x6c,0x66,0x5f,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,
|
||||||
0x3d,0x30,0x2c,0x79,0x3d,0x30,0x2c,0x77,0x3d,0x31,0x30,0x30,0x25,0x2c,0x68,0x3d,0x31,0x30,0x30,0x25,
|
0x74,0x28,0x78,0x3d,0x30,0x2c,0x79,0x3d,0x30,0x2c,0x77,0x3d,0x31,0x30,0x30,0x25,0x2c,0x68,0x3d,0x31,
|
||||||
0x29,0x00,0x63,0x68,0x69,0x6c,0x64,0x72,0x65,0x6e,0x5f,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,
|
0x30,0x30,0x25,0x29,0x00,0x63,0x68,0x69,0x6c,0x64,0x72,0x65,0x6e,0x5f,0x6c,0x61,0x79,0x6f,0x75,0x74,
|
||||||
0x66,0x61,0x75,0x6c,0x74,0x28,0x63,0x3d,0x32,0x2c,0x72,0x3d,0x31,0x30,0x2c,0x6d,0x3d,0x35,0x2c,0x73,
|
0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x28,0x63,0x3d,0x32,0x2c,0x72,0x3d,0x31,0x30,0x2c,0x6d,0x3d,
|
||||||
0x3d,0x35,0x29,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
0x35,0x2c,0x73,0x3d,0x35,0x29,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,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,
|
||||||
0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x66,0x6f,0x63,0x75,0x73,0x65,0x64,0x00,0x74,0x72,0x75,0x65,
|
0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x66,0x6f,0x63,0x75,0x73,0x65,0x64,0x00,0x74,
|
||||||
0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x6f,0x70,0x65,0x6e,0x28,0x27,0x74,0x65,0x73,0x74,
|
0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x6f,0x70,0x65,0x6e,0x28,0x27,0x74,
|
||||||
0x5f,0x66,0x73,0x63,0x72,0x69,0x70,0x74,0x27,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x54,0x65,0x73,0x74,
|
0x65,0x73,0x74,0x5f,0x66,0x73,0x63,0x72,0x69,0x70,0x74,0x27,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x54,
|
||||||
0x20,0x46,0x73,0x63,0x72,0x69,0x70,0x74,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,
|
0x65,0x73,0x74,0x20,0x46,0x73,0x63,0x72,0x69,0x70,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,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,
|
||||||
|
0x63,0x6c,0x69,0x63,0x6b,0x00,0x6f,0x70,0x65,0x6e,0x28,0x27,0x62,0x75,0x74,0x74,0x6f,0x6e,0x5f,0x66,
|
||||||
|
0x73,0x63,0x72,0x69,0x70,0x74,0x27,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x42,0x75,0x74,0x74,0x6f,0x6e,
|
||||||
|
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,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,
|
||||||
|
0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x6f,0x70,0x65,0x6e,
|
||||||
|
0x28,0x27,0x62,0x61,0x73,0x69,0x63,0x5f,0x66,0x73,0x63,0x72,0x69,0x70,0x74,0x27,0x29,0x00,0x74,0x65,
|
||||||
|
0x78,0x74,0x00,0x42,0x61,0x73,0x69,0x63,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,
|
||||||
0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,
|
0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,
|
||||||
0x63,0x6b,0x00,0x6f,0x70,0x65,0x6e,0x28,0x27,0x62,0x75,0x74,0x74,0x6f,0x6e,0x5f,0x66,0x73,0x63,0x72,
|
0x63,0x6b,0x00,0x6f,0x70,0x65,0x6e,0x28,0x27,0x74,0x65,0x78,0x74,0x5f,0x73,0x65,0x6c,0x65,0x63,0x74,
|
||||||
0x69,0x70,0x74,0x27,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x42,0x75,0x74,0x74,0x6f,0x6e,0x73,0x00,0x00,
|
0x6f,0x72,0x5f,0x66,0x73,0x63,0x72,0x69,0x70,0x74,0x27,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x54,0x65,
|
||||||
0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
0x78,0x74,0x20,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,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||||
0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x6f,0x70,0x65,0x6e,0x28,0x27,0x62,
|
0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x74,0x72,0x5f,
|
||||||
0x61,0x73,0x69,0x63,0x5f,0x66,0x73,0x63,0x72,0x69,0x70,0x74,0x27,0x29,0x00,0x74,0x65,0x78,0x74,0x00,
|
0x74,0x65,0x78,0x74,0x00,0x3c,0x22,0x65,0x6e,0x26,0x7a,0x68,0x22,0x3e,0x00,0x6f,0x6e,0x3a,0x63,0x6c,
|
||||||
0x42,0x61,0x73,0x69,0x63,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,
|
0x69,0x63,0x6b,0x00,0x61,0x20,0x3d,0x20,0x6c,0x6f,0x63,0x61,0x6c,0x65,0x5f,0x67,0x65,0x74,0x28,0x29,
|
||||||
|
0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x62,0x20,0x3d,0x20,0x6f,0x62,0x6a,0x65,0x63,0x74,0x5f,
|
||||||
|
0x67,0x65,0x74,0x28,0x61,0x2c,0x20,0x27,0x6c,0x61,0x6e,0x67,0x75,0x61,0x67,0x65,0x27,0x29,0x0a,0x20,
|
||||||
|
0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x69,0x66,0x20,0x28,0x62,0x20,0x3d,0x3d,0x20,0x27,0x65,0x6e,0x27,
|
||||||
|
0x29,0x20,0x7b,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x6c,0x6f,0x63,0x61,0x6c,0x65,
|
||||||
|
0x5f,0x73,0x65,0x74,0x28,0x27,0x7a,0x68,0x27,0x2c,0x20,0x27,0x43,0x4e,0x27,0x29,0x0a,0x20,0x20,0x20,
|
||||||
|
0x20,0x20,0x20,0x20,0x20,0x7d,0x20,0x65,0x6c,0x73,0x65,0x20,0x7b,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,
|
||||||
|
0x20,0x20,0x20,0x20,0x6c,0x6f,0x63,0x61,0x6c,0x65,0x5f,0x73,0x65,0x74,0x28,0x27,0x65,0x6e,0x27,0x2c,
|
||||||
|
0x20,0x27,0x55,0x53,0x27,0x29,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x7d,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,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,
|
||||||
|
0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x68,0x61,0x6e,0x67,0x65,0x20,0x54,0x68,0x65,0x6d,0x65,0x00,
|
||||||
|
0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x61,0x20,0x3d,0x20,0x74,0x68,0x65,0x6d,0x65,0x5f,0x67,
|
||||||
|
0x65,0x74,0x28,0x29,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x69,0x66,0x20,0x28,0x61,0x20,0x3d,
|
||||||
|
0x3d,0x20,0x27,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x27,0x29,0x20,0x7b,0x0a,0x20,0x20,0x20,0x20,0x20,
|
||||||
|
0x20,0x20,0x20,0x20,0x20,0x74,0x68,0x65,0x6d,0x65,0x5f,0x73,0x65,0x74,0x28,0x27,0x64,0x61,0x72,0x6b,
|
||||||
|
0x27,0x29,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x7d,0x20,0x65,0x6c,0x73,0x65,0x20,0x7b,0x0a,
|
||||||
|
0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x74,0x68,0x65,0x6d,0x65,0x5f,0x73,0x65,0x74,0x28,
|
||||||
|
0x27,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x27,0x29,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x7d,
|
||||||
|
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,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,
|
||||||
|
0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x76,0x61,0x72,0x20,0x66,
|
||||||
|
0x69,0x6c,0x65,0x73,0x3d,0x63,0x68,0x6f,0x6f,0x73,0x65,0x5f,0x66,0x69,0x6c,0x65,0x73,0x28,0x27,0x2e,
|
||||||
|
0x63,0x27,0x2c,0x20,0x27,0x2e,0x2f,0x27,0x29,0x3b,0x70,0x72,0x69,0x6e,0x74,0x28,0x66,0x69,0x6c,0x65,
|
||||||
|
0x73,0x2e,0x73,0x69,0x7a,0x65,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x68,0x6f,0x6f,0x73,0x65,0x20,
|
||||||
|
0x46,0x69,0x6c,0x65,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,
|
||||||
0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,
|
0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,
|
||||||
0x6f,0x70,0x65,0x6e,0x28,0x27,0x74,0x65,0x78,0x74,0x5f,0x73,0x65,0x6c,0x65,0x63,0x74,0x6f,0x72,0x5f,
|
0x76,0x61,0x72,0x20,0x66,0x69,0x6c,0x65,0x3d,0x63,0x68,0x6f,0x6f,0x73,0x65,0x5f,0x66,0x69,0x6c,0x65,
|
||||||
0x66,0x73,0x63,0x72,0x69,0x70,0x74,0x27,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x54,0x65,0x78,0x74,0x20,
|
0x28,0x27,0x2e,0x63,0x27,0x2c,0x20,0x27,0x2e,0x2f,0x27,0x29,0x3b,0x70,0x72,0x69,0x6e,0x74,0x28,0x66,
|
||||||
0x53,0x65,0x6c,0x65,0x63,0x74,0x6f,0x72,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,
|
0x69,0x6c,0x65,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x68,0x6f,0x6f,0x73,0x65,0x20,0x46,0x69,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,
|
||||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,
|
||||||
0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x74,0x72,0x5f,0x74,0x65,0x78,
|
0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x76,0x61,0x72,0x20,
|
||||||
0x74,0x00,0x3c,0x22,0x65,0x6e,0x26,0x7a,0x68,0x22,0x3e,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,
|
0x66,0x69,0x6c,0x65,0x3d,0x63,0x68,0x6f,0x6f,0x73,0x65,0x5f,0x66,0x69,0x6c,0x65,0x5f,0x66,0x6f,0x72,
|
||||||
0x00,0x61,0x20,0x3d,0x20,0x6c,0x6f,0x63,0x61,0x6c,0x65,0x5f,0x67,0x65,0x74,0x28,0x29,0x0a,0x20,0x20,
|
0x5f,0x73,0x61,0x76,0x65,0x28,0x27,0x2e,0x63,0x27,0x2c,0x20,0x27,0x2e,0x2f,0x27,0x29,0x3b,0x70,0x72,
|
||||||
0x20,0x20,0x20,0x20,0x20,0x20,0x62,0x20,0x3d,0x20,0x6f,0x62,0x6a,0x65,0x63,0x74,0x5f,0x67,0x65,0x74,
|
0x69,0x6e,0x74,0x28,0x66,0x69,0x6c,0x65,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x68,0x6f,0x6f,0x73,
|
||||||
0x28,0x61,0x2c,0x20,0x27,0x6c,0x61,0x6e,0x67,0x75,0x61,0x67,0x65,0x27,0x29,0x0a,0x20,0x20,0x20,0x20,
|
0x65,0x20,0x46,0x69,0x6c,0x65,0x20,0x53,0x61,0x76,0x65,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,
|
||||||
0x20,0x20,0x20,0x20,0x69,0x66,0x20,0x28,0x62,0x20,0x3d,0x3d,0x20,0x27,0x65,0x6e,0x27,0x29,0x20,0x7b,
|
|
||||||
0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x6c,0x6f,0x63,0x61,0x6c,0x65,0x5f,0x73,0x65,
|
|
||||||
0x74,0x28,0x27,0x7a,0x68,0x27,0x2c,0x20,0x27,0x43,0x4e,0x27,0x29,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,
|
|
||||||
0x20,0x20,0x7d,0x20,0x65,0x6c,0x73,0x65,0x20,0x7b,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
|
|
||||||
0x20,0x6c,0x6f,0x63,0x61,0x6c,0x65,0x5f,0x73,0x65,0x74,0x28,0x27,0x65,0x6e,0x27,0x2c,0x20,0x27,0x55,
|
|
||||||
0x53,0x27,0x29,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x7d,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,0x00,0x00,0x00,
|
||||||
0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x74,
|
|
||||||
0x65,0x78,0x74,0x00,0x43,0x68,0x61,0x6e,0x67,0x65,0x20,0x54,0x68,0x65,0x6d,0x65,0x00,0x6f,0x6e,0x3a,
|
|
||||||
0x63,0x6c,0x69,0x63,0x6b,0x00,0x61,0x20,0x3d,0x20,0x74,0x68,0x65,0x6d,0x65,0x5f,0x67,0x65,0x74,0x28,
|
|
||||||
0x29,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x69,0x66,0x20,0x28,0x61,0x20,0x3d,0x3d,0x20,0x27,
|
|
||||||
0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x27,0x29,0x20,0x7b,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
|
|
||||||
0x20,0x20,0x74,0x68,0x65,0x6d,0x65,0x5f,0x73,0x65,0x74,0x28,0x27,0x64,0x61,0x72,0x6b,0x27,0x29,0x0a,
|
|
||||||
0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x7d,0x20,0x65,0x6c,0x73,0x65,0x20,0x7b,0x0a,0x20,0x20,0x20,
|
|
||||||
0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x74,0x68,0x65,0x6d,0x65,0x5f,0x73,0x65,0x74,0x28,0x27,0x64,0x65,
|
|
||||||
0x66,0x61,0x75,0x6c,0x74,0x27,0x29,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x7d,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,
|
0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,
|
||||||
0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x76,0x61,0x72,0x20,0x66,0x69,0x6c,0x65,
|
0x63,0x6c,0x69,0x63,0x6b,0x00,0x76,0x61,0x72,0x20,0x66,0x69,0x6c,0x65,0x3d,0x63,0x68,0x6f,0x6f,0x73,
|
||||||
0x73,0x3d,0x63,0x68,0x6f,0x6f,0x73,0x65,0x5f,0x66,0x69,0x6c,0x65,0x73,0x28,0x27,0x2e,0x63,0x27,0x2c,
|
0x65,0x5f,0x66,0x6f,0x6c,0x64,0x65,0x72,0x28,0x27,0x2e,0x2f,0x27,0x29,0x3b,0x70,0x72,0x69,0x6e,0x74,
|
||||||
0x20,0x27,0x2e,0x2f,0x27,0x29,0x3b,0x70,0x72,0x69,0x6e,0x74,0x28,0x66,0x69,0x6c,0x65,0x73,0x2e,0x73,
|
0x28,0x66,0x69,0x6c,0x65,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x68,0x6f,0x6f,0x73,0x65,0x20,0x46,
|
||||||
0x69,0x7a,0x65,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x68,0x6f,0x6f,0x73,0x65,0x20,0x46,0x69,0x6c,
|
0x6f,0x6c,0x64,0x65,0x72,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||||
0x65,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,
|
||||||
0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x76,0x61,0x72,
|
0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,
|
||||||
0x20,0x66,0x69,0x6c,0x65,0x3d,0x63,0x68,0x6f,0x6f,0x73,0x65,0x5f,0x66,0x69,0x6c,0x65,0x28,0x27,0x2e,
|
0x76,0x61,0x72,0x20,0x72,0x65,0x74,0x20,0x3d,0x20,0x64,0x69,0x61,0x6c,0x6f,0x67,0x5f,0x69,0x6e,0x66,
|
||||||
0x63,0x27,0x2c,0x20,0x27,0x2e,0x2f,0x27,0x29,0x3b,0x70,0x72,0x69,0x6e,0x74,0x28,0x66,0x69,0x6c,0x65,
|
0x6f,0x28,0x27,0x61,0x77,0x74,0x6b,0x27,0x2c,0x27,0x68,0x65,0x6c,0x6c,0x6f,0x27,0x29,0x3b,0x70,0x72,
|
||||||
0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x68,0x6f,0x6f,0x73,0x65,0x20,0x46,0x69,0x6c,0x65,0x00,0x00,
|
0x69,0x6e,0x74,0x28,0x72,0x65,0x74,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x49,0x6e,0x66,0x6f,0x00,0x00,
|
||||||
0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
0x00,0x00,0x00,0x00,0x00,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,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,
|
||||||
0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x76,0x61,0x72,0x20,0x66,0x69,0x6c,
|
0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x76,0x61,0x72,0x20,0x72,0x65,0x74,
|
||||||
0x65,0x3d,0x63,0x68,0x6f,0x6f,0x73,0x65,0x5f,0x66,0x69,0x6c,0x65,0x5f,0x66,0x6f,0x72,0x5f,0x73,0x61,
|
0x20,0x3d,0x20,0x64,0x69,0x61,0x6c,0x6f,0x67,0x5f,0x77,0x61,0x72,0x6e,0x28,0x27,0x61,0x77,0x74,0x6b,
|
||||||
0x76,0x65,0x28,0x27,0x2e,0x63,0x27,0x2c,0x20,0x27,0x2e,0x2f,0x27,0x29,0x3b,0x70,0x72,0x69,0x6e,0x74,
|
0x27,0x2c,0x27,0x68,0x65,0x6c,0x6c,0x6f,0x27,0x29,0x3b,0x70,0x72,0x69,0x6e,0x74,0x28,0x72,0x65,0x74,
|
||||||
0x28,0x66,0x69,0x6c,0x65,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x68,0x6f,0x6f,0x73,0x65,0x20,0x46,
|
0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x57,0x61,0x72,0x6e,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,
|
||||||
0x69,0x6c,0x65,0x20,0x53,0x61,0x76,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||||
0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,
|
0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,
|
||||||
0x63,0x6b,0x00,0x76,0x61,0x72,0x20,0x66,0x69,0x6c,0x65,0x3d,0x63,0x68,0x6f,0x6f,0x73,0x65,0x5f,0x66,
|
0x63,0x6c,0x69,0x63,0x6b,0x00,0x76,0x61,0x72,0x20,0x72,0x65,0x74,0x20,0x3d,0x20,0x64,0x69,0x61,0x6c,
|
||||||
0x6f,0x6c,0x64,0x65,0x72,0x28,0x27,0x2e,0x2f,0x27,0x29,0x3b,0x70,0x72,0x69,0x6e,0x74,0x28,0x66,0x69,
|
0x6f,0x67,0x5f,0x63,0x6f,0x6e,0x66,0x69,0x72,0x6d,0x28,0x27,0x61,0x77,0x74,0x6b,0x27,0x2c,0x27,0x68,
|
||||||
0x6c,0x65,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x68,0x6f,0x6f,0x73,0x65,0x20,0x46,0x6f,0x6c,0x64,
|
0x65,0x6c,0x6c,0x6f,0x27,0x29,0x3b,0x70,0x72,0x69,0x6e,0x74,0x28,0x72,0x65,0x74,0x29,0x00,0x74,0x65,
|
||||||
0x65,0x72,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
0x78,0x74,0x00,0x43,0x6f,0x6e,0x66,0x69,0x72,0x6d,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,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,
|
||||||
|
0x6c,0x69,0x63,0x6b,0x00,0x76,0x61,0x72,0x20,0x72,0x65,0x74,0x20,0x3d,0x20,0x64,0x69,0x61,0x6c,0x6f,
|
||||||
|
0x67,0x5f,0x74,0x6f,0x61,0x73,0x74,0x28,0x27,0x61,0x77,0x74,0x6b,0x27,0x2c,0x32,0x30,0x30,0x30,0x29,
|
||||||
|
0x3b,0x70,0x72,0x69,0x6e,0x74,0x28,0x72,0x65,0x74,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x54,0x6f,0x61,
|
||||||
|
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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,
|
||||||
0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x76,0x61,0x72,
|
0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x67,0x6c,0x6f,
|
||||||
0x20,0x72,0x65,0x74,0x20,0x3d,0x20,0x64,0x69,0x61,0x6c,0x6f,0x67,0x5f,0x69,0x6e,0x66,0x6f,0x28,0x27,
|
0x62,0x61,0x6c,0x2e,0x69,0x73,0x5f,0x73,0x68,0x6f,0x77,0x5f,0x66,0x70,0x73,0x20,0x3d,0x20,0x21,0x67,
|
||||||
0x61,0x77,0x74,0x6b,0x27,0x2c,0x27,0x68,0x65,0x6c,0x6c,0x6f,0x27,0x29,0x3b,0x70,0x72,0x69,0x6e,0x74,
|
0x6c,0x6f,0x62,0x61,0x6c,0x2e,0x69,0x73,0x5f,0x73,0x68,0x6f,0x77,0x5f,0x66,0x70,0x73,0x3b,0x73,0x68,
|
||||||
0x28,0x72,0x65,0x74,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x49,0x6e,0x66,0x6f,0x00,0x00,0x00,0x62,0x75,
|
0x6f,0x77,0x5f,0x66,0x70,0x73,0x28,0x67,0x6c,0x6f,0x62,0x61,0x6c,0x2e,0x69,0x73,0x5f,0x73,0x68,0x6f,
|
||||||
0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
0x77,0x5f,0x66,0x70,0x73,0x29,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,0x00,
|
||||||
0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,
|
||||||
0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x76,0x61,0x72,0x20,0x72,0x65,0x74,0x20,0x3d,0x20,
|
0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x71,0x75,0x69,0x74,0x28,
|
||||||
0x64,0x69,0x61,0x6c,0x6f,0x67,0x5f,0x77,0x61,0x72,0x6e,0x28,0x27,0x61,0x77,0x74,0x6b,0x27,0x2c,0x27,
|
0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x51,0x75,0x69,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*2980*/
|
||||||
0x68,0x65,0x6c,0x6c,0x6f,0x27,0x29,0x3b,0x70,0x72,0x69,0x6e,0x74,0x28,0x72,0x65,0x74,0x29,0x00,0x74,
|
|
||||||
0x65,0x78,0x74,0x00,0x57,0x61,0x72,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,0x66,
|
|
||||||
0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,
|
|
||||||
0x63,0x6b,0x00,0x76,0x61,0x72,0x20,0x72,0x65,0x74,0x20,0x3d,0x20,0x64,0x69,0x61,0x6c,0x6f,0x67,0x5f,
|
|
||||||
0x63,0x6f,0x6e,0x66,0x69,0x72,0x6d,0x28,0x27,0x61,0x77,0x74,0x6b,0x27,0x2c,0x27,0x68,0x65,0x6c,0x6c,
|
|
||||||
0x6f,0x27,0x29,0x3b,0x70,0x72,0x69,0x6e,0x74,0x28,0x72,0x65,0x74,0x29,0x00,0x74,0x65,0x78,0x74,0x00,
|
|
||||||
0x43,0x6f,0x6e,0x66,0x69,0x72,0x6d,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,0x66,0x6f,
|
|
||||||
0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,
|
|
||||||
0x6b,0x00,0x76,0x61,0x72,0x20,0x72,0x65,0x74,0x20,0x3d,0x20,0x64,0x69,0x61,0x6c,0x6f,0x67,0x5f,0x74,
|
|
||||||
0x6f,0x61,0x73,0x74,0x28,0x27,0x61,0x77,0x74,0x6b,0x27,0x2c,0x32,0x30,0x30,0x30,0x29,0x3b,0x70,0x72,
|
|
||||||
0x69,0x6e,0x74,0x28,0x72,0x65,0x74,0x29,0x00,0x74,0x65,0x78,0x74,0x00,0x54,0x6f,0x61,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,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,
|
|
||||||
0x74,0x72,0x75,0x65,0x00,0x6f,0x6e,0x3a,0x63,0x6c,0x69,0x63,0x6b,0x00,0x71,0x75,0x69,0x74,0x28,0x29,
|
|
||||||
0x00,0x74,0x65,0x78,0x74,0x00,0x51,0x75,0x69,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*2779*/
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
6
res/assets/default/raw/data/custom_keys.json
Normal file
6
res/assets/default/raw/data/custom_keys.json
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"CUSTOM1" : {
|
||||||
|
"type" : 0,
|
||||||
|
"value" : 13
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -251,6 +251,7 @@
|
|||||||
#include "assets/default/inc/data/gpinyin_dat.data"
|
#include "assets/default/inc/data/gpinyin_dat.data"
|
||||||
#include "assets/default/inc/data/test_dat.data"
|
#include "assets/default/inc/data/test_dat.data"
|
||||||
#include "assets/default/inc/data/conf_test_json.data"
|
#include "assets/default/inc/data/conf_test_json.data"
|
||||||
|
#include "assets/default/inc/data/custom_keys_json.data"
|
||||||
#include "assets/default/inc/data/suggest_words_zh_cn_dat.data"
|
#include "assets/default/inc/data/suggest_words_zh_cn_dat.data"
|
||||||
#include "assets/default/inc/data/test_json.data"
|
#include "assets/default/inc/data/test_json.data"
|
||||||
#include "assets/default/inc/data/a_b_c_any.data"
|
#include "assets/default/inc/data/a_b_c_any.data"
|
||||||
@ -1138,6 +1139,7 @@ ret_t assets_init(void) {
|
|||||||
assets_manager_add(am, data_gpinyin_dat);
|
assets_manager_add(am, data_gpinyin_dat);
|
||||||
assets_manager_add(am, data_test_dat);
|
assets_manager_add(am, data_test_dat);
|
||||||
assets_manager_add(am, data_conf_test_json);
|
assets_manager_add(am, data_conf_test_json);
|
||||||
|
assets_manager_add(am, data_custom_keys_json);
|
||||||
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
||||||
assets_manager_add(am, data_test_json);
|
assets_manager_add(am, data_test_json);
|
||||||
assets_manager_add(am, data_a_b_c_any);
|
assets_manager_add(am, data_a_b_c_any);
|
||||||
|
|||||||
@ -251,6 +251,7 @@
|
|||||||
#include "assets/default/inc/data/gpinyin_dat.data"
|
#include "assets/default/inc/data/gpinyin_dat.data"
|
||||||
#include "assets/default/inc/data/test_dat.data"
|
#include "assets/default/inc/data/test_dat.data"
|
||||||
#include "assets/default/inc/data/conf_test_json.data"
|
#include "assets/default/inc/data/conf_test_json.data"
|
||||||
|
#include "assets/default/inc/data/custom_keys_json.data"
|
||||||
#include "assets/default/inc/data/suggest_words_zh_cn_dat.data"
|
#include "assets/default/inc/data/suggest_words_zh_cn_dat.data"
|
||||||
#include "assets/default/inc/data/test_json.data"
|
#include "assets/default/inc/data/test_json.data"
|
||||||
#include "assets/default/inc/data/a_b_c_any.data"
|
#include "assets/default/inc/data/a_b_c_any.data"
|
||||||
@ -1138,6 +1139,7 @@ ret_t assets_init(void) {
|
|||||||
assets_manager_add(am, data_gpinyin_dat);
|
assets_manager_add(am, data_gpinyin_dat);
|
||||||
assets_manager_add(am, data_test_dat);
|
assets_manager_add(am, data_test_dat);
|
||||||
assets_manager_add(am, data_conf_test_json);
|
assets_manager_add(am, data_conf_test_json);
|
||||||
|
assets_manager_add(am, data_custom_keys_json);
|
||||||
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
||||||
assets_manager_add(am, data_test_json);
|
assets_manager_add(am, data_test_json);
|
||||||
assets_manager_add(am, data_a_b_c_any);
|
assets_manager_add(am, data_a_b_c_any);
|
||||||
|
|||||||
@ -204,6 +204,7 @@
|
|||||||
#include "assets/default/inc/data/gpinyin_dat.data"
|
#include "assets/default/inc/data/gpinyin_dat.data"
|
||||||
#include "assets/default/inc/data/test_dat.data"
|
#include "assets/default/inc/data/test_dat.data"
|
||||||
#include "assets/default/inc/data/conf_test_json.data"
|
#include "assets/default/inc/data/conf_test_json.data"
|
||||||
|
#include "assets/default/inc/data/custom_keys_json.data"
|
||||||
#include "assets/default/inc/data/suggest_words_zh_cn_dat.data"
|
#include "assets/default/inc/data/suggest_words_zh_cn_dat.data"
|
||||||
#include "assets/default/inc/data/test_json.data"
|
#include "assets/default/inc/data/test_json.data"
|
||||||
#include "assets/default/inc/data/a_b_c_any.data"
|
#include "assets/default/inc/data/a_b_c_any.data"
|
||||||
@ -721,6 +722,7 @@ ret_t assets_init(void) {
|
|||||||
assets_manager_add(am, data_gpinyin_dat);
|
assets_manager_add(am, data_gpinyin_dat);
|
||||||
assets_manager_add(am, data_test_dat);
|
assets_manager_add(am, data_test_dat);
|
||||||
assets_manager_add(am, data_conf_test_json);
|
assets_manager_add(am, data_conf_test_json);
|
||||||
|
assets_manager_add(am, data_custom_keys_json);
|
||||||
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
||||||
assets_manager_add(am, data_test_json);
|
assets_manager_add(am, data_test_json);
|
||||||
assets_manager_add(am, data_a_b_c_any);
|
assets_manager_add(am, data_a_b_c_any);
|
||||||
|
|||||||
@ -204,6 +204,7 @@
|
|||||||
#include "assets/default/inc/data/gpinyin_dat.data"
|
#include "assets/default/inc/data/gpinyin_dat.data"
|
||||||
#include "assets/default/inc/data/test_dat.data"
|
#include "assets/default/inc/data/test_dat.data"
|
||||||
#include "assets/default/inc/data/conf_test_json.data"
|
#include "assets/default/inc/data/conf_test_json.data"
|
||||||
|
#include "assets/default/inc/data/custom_keys_json.data"
|
||||||
#include "assets/default/inc/data/suggest_words_zh_cn_dat.data"
|
#include "assets/default/inc/data/suggest_words_zh_cn_dat.data"
|
||||||
#include "assets/default/inc/data/test_json.data"
|
#include "assets/default/inc/data/test_json.data"
|
||||||
#include "assets/default/inc/data/a_b_c_any.data"
|
#include "assets/default/inc/data/a_b_c_any.data"
|
||||||
@ -721,6 +722,7 @@ ret_t assets_init(void) {
|
|||||||
assets_manager_add(am, data_gpinyin_dat);
|
assets_manager_add(am, data_gpinyin_dat);
|
||||||
assets_manager_add(am, data_test_dat);
|
assets_manager_add(am, data_test_dat);
|
||||||
assets_manager_add(am, data_conf_test_json);
|
assets_manager_add(am, data_conf_test_json);
|
||||||
|
assets_manager_add(am, data_custom_keys_json);
|
||||||
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
assets_manager_add(am, data_suggest_words_zh_cn_dat);
|
||||||
assets_manager_add(am, data_test_json);
|
assets_manager_add(am, data_test_json);
|
||||||
assets_manager_add(am, data_a_b_c_any);
|
assets_manager_add(am, data_a_b_c_any);
|
||||||
|
|||||||
@ -919,8 +919,8 @@ static ret_t slide_view_set_active_animate(widget_t* widget, uint32_t active) {
|
|||||||
}
|
}
|
||||||
old_active = slide_view->active;
|
old_active = slide_view->active;
|
||||||
|
|
||||||
if (old_active < active ||
|
if ((old_active < active && !(slide_view->loop && old_active == 0 && active == widget->children->size - 1)) ||
|
||||||
(slide_view->loop && active == 0 && old_active == widget->children->size - 1)) {
|
(slide_view->loop && active == 0 && old_active == widget->children->size - 1)) {
|
||||||
slide_view->prev = widget_get_child(widget, old_active);
|
slide_view->prev = widget_get_child(widget, old_active);
|
||||||
slide_view->next = widget_get_child(widget, active);
|
slide_view->next = widget_get_child(widget, active);
|
||||||
xoffset_end = slide_view->vertical ? 0 : -widget->w;
|
xoffset_end = slide_view->vertical ? 0 : -widget->w;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user