From: @CHENG <2393524978@qq.com> Date: Tue, 23 Jan 2024 10:17:08 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=7fa995f7d76c45bdedf629b6a4167c2ab0b49cea;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial/buildin_dial_list.db b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial/buildin_dial_list.db index acf5970e..e71b569b 100644 --- a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial/buildin_dial_list.db +++ b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial/buildin_dial_list.db @@ -1,11 +1,9 @@ default_digit -R:/png/dial_default_ambient/am_digit.json +R:/png/dial_digital/dial_digital.json rokcket R:/png/dial_rocket/rocket_watch.json dolphin R:/png/dial_dolphin/dolphin_watch.json -bear -R:/png/dial_bear/bear_watch.json style1 R:/png/dial_style1/dial_style1.json dial_style3 diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/bear_watch.json b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/bear_watch.json deleted file mode 100644 index 3a475e90..00000000 --- a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/bear_watch.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "name": "小熊时钟", - "preview_img": "R:/png/dial_bear/icon_dial_bear_clock.png", - "bg_img": "R:/png/dial_bear/icon_bear.png", - "configurable": 0, - "element_ll": [ - { - "element_pos": { - "x": 120, - "y": 0 - }, - "element_cnt": 1, - "act_type": 2, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 2, - "element_name": "指针时钟", - "img_cnt": 4, - "img_ll": [ - { - "img_type": 20, - "img_pos": { - "x": -10, - "y": 0 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_bear/icon_dial_bear_hour.png" - } - ] - }, - { - "img_type": 21, - "img_pos": { - "x": -4, - "y": 0 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_bear/icon_dial_bear_min.png" - } - ] - }, - { - "img_type": 22, - "img_pos": { - "x": -2, - "y": 0 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_bear/icon_dial_bear_sec.png" - } - ] - }, { - "img_type": 23, - "img_pos": { - "x": -15, - "y": 105 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_bear/icon_bear_nose.png" - } - ] - } - ], - "label_cnt": 0, - "label_ll": [ - { - "label_type": 200, - "text": "ijk", - "text_color": { - "r": 12, - "g": 34, - "b": 56 - }, - "text_pos": { - "x": 202, - "y": 203 - }, - "font_size": 204 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - } - ] -} diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_bear.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_bear.png deleted file mode 100644 index ca6c9146..00000000 Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_bear.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_bear_nose.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_bear_nose.png deleted file mode 100644 index 21253cbe..00000000 Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_bear_nose.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_clock.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_clock.png deleted file mode 100644 index 20d9e1ec..00000000 Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_clock.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_hour.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_hour.png deleted file mode 100644 index 1cbcdf6c..00000000 Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_hour.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_min.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_min.png deleted file mode 100644 index 0ca71e41..00000000 Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_min.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_sec.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_sec.png deleted file mode 100644 index 2442fbdf..00000000 Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_sec.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json deleted file mode 100644 index b35949b1..00000000 --- a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "name": "数字时钟", - "preview_img": "R:/png/dial_default_ambient/am_digit_pre.png", - "bg_img": "R:/png/dial_default_ambient/am_digit_bg.png", - "configurable": 0, - "element_ll": [ - { - "element_pos": { - "x": 117, - "y": 180 - }, - "element_cnt": 1, - "act_type": 1, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 1, - "element_name": "数字时钟", - "img_cnt": 5, - "img_ll": [ - { - "img_type": 10, - "img_pos": { - "x": 0, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_0.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_1.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_2.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_3.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_4.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_5.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_6.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_7.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_8.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_9.png" - } - ] - }, - { - "img_type": 11, - "img_pos": { - "x": 49, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_0.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_1.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_2.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_3.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_4.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_5.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_6.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_7.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_8.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_9.png" - } - ] - }, - { - "img_type": 16, - "img_pos": { - "x": 105, - "y": 29 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_default_ambient/am_digit_con_colon.png" - } - ] - }, - { - "img_type": 12, - "img_pos": { - "x": 136, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_0.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_1.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_2.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_3.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_4.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_5.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_6.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_7.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_8.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_9.png" - } - ] - }, - { - "img_type": 13, - "img_pos": { - "x": 191, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_0.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_1.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_2.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_3.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_4.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_5.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_6.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_7.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_8.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_9.png" - } - ] - } - ], - "label_cnt": 0, - "label_ll": [ - { - "label_type": 0, - "text": "", - "text_color": { - "r": 0, - "g": 0, - "b": 0 - }, - "text_pos": { - "x": 0, - "y": 0 - }, - "font_size": 0 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 0, - "y": 0 - }, - "bar_color": { - "r": 0, - "g": 0, - "b": 0 - }, - "bar_w": 0, - "bar_h": 0 - } - } - ] - } - ] -} diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_default_ambient/am_digit_con_colon.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_default_ambient/am_digit_con_colon.png deleted file mode 100644 index d9343b8b..00000000 Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_default_ambient/am_digit_con_colon.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png deleted file mode 100644 index dd9a26af..00000000 Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/0.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/0.png new file mode 100644 index 00000000..9b6a7edf Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/0.png differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/1.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/1.png new file mode 100644 index 00000000..48816d49 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/1.png differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/2.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/2.png new file mode 100644 index 00000000..81da6b8d Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/2.png differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/3.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/3.png new file mode 100644 index 00000000..4843a5fe Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/3.png differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/4.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/4.png new file mode 100644 index 00000000..60eb4b37 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/4.png differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/5.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/5.png new file mode 100644 index 00000000..e29a6ffc Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/5.png differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/6.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/6.png new file mode 100644 index 00000000..316aade5 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/6.png differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/7.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/7.png new file mode 100644 index 00000000..f58fa52b Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/7.png differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/8.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/8.png new file mode 100644 index 00000000..5f4f5981 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/8.png differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/9.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/9.png new file mode 100644 index 00000000..045510aa Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/9.png differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/am_none.json b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/am_none.json new file mode 100644 index 00000000..92f569d1 --- /dev/null +++ b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/am_none.json @@ -0,0 +1,18 @@ +{ + "name": "无", + "preview_img": "R:/png/dial/icon_none.png", + "configurable": 2, + "element_ll": [ + { + "element_pos": { + "x": 0, + "y": 0 + }, + "element_cnt": 0, + "act_type": 1, + "layer": 0, + "element_dsc_ll": [ + ] + } + ] +} diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/bg.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/bg.png new file mode 100644 index 00000000..19c4d50f Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/bg.png differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/colon.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/colon.png new file mode 100644 index 00000000..4ca73d3b Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/colon.png differ diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/dial_digital.json b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/dial_digital.json new file mode 100644 index 00000000..97001554 --- /dev/null +++ b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/dial_digital.json @@ -0,0 +1,230 @@ +{ + "name": "数字时钟", + "preview_img": "R:/png/dial_digital/pre.png", + "bg_img": "R:/png/dial_digital/bg.png", + "configurable": 0, + "element_ll": [ + { + "element_pos": { + "x": 28, + "y": 144 + }, + "element_cnt": 1, + "act_type": 1, + "layer": 0, + "element_dsc_ll": [ + { + "element_type": 1, + "element_name": "数字时钟", + "img_cnt": 5, + "img_ll": [ + { + "img_type": 10, + "img_pos": { + "x": 0, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_digital/0.png" + }, + { + "sub_img": "R:/png/dial_digital/1.png" + }, + { + "sub_img": "R:/png/dial_digital/2.png" + }, + { + "sub_img": "R:/png/dial_digital/3.png" + }, + { + "sub_img": "R:/png/dial_digital/4.png" + }, + { + "sub_img": "R:/png/dial_digital/5.png" + }, + { + "sub_img": "R:/png/dial_digital/6.png" + }, + { + "sub_img": "R:/png/dial_digital/7.png" + }, + { + "sub_img": "R:/png/dial_digital/8.png" + }, + { + "sub_img": "R:/png/dial_digital/9.png" + } + ] + }, + { + "img_type": 11, + "img_pos": { + "x": 90, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_digital/0.png" + }, + { + "sub_img": "R:/png/dial_digital/1.png" + }, + { + "sub_img": "R:/png/dial_digital/2.png" + }, + { + "sub_img": "R:/png/dial_digital/3.png" + }, + { + "sub_img": "R:/png/dial_digital/4.png" + }, + { + "sub_img": "R:/png/dial_digital/5.png" + }, + { + "sub_img": "R:/png/dial_digital/6.png" + }, + { + "sub_img": "R:/png/dial_digital/7.png" + }, + { + "sub_img": "R:/png/dial_digital/8.png" + }, + { + "sub_img": "R:/png/dial_digital/9.png" + } + ] + }, + { + "img_type": 16, + "img_pos": { + "x": 180, + "y": 0 + }, + "sub_img_cnt": 1, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_digital/colon.png" + } + ] + }, + { + "img_type": 12, + "img_pos": { + "x": 229, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_digital/0.png" + }, + { + "sub_img": "R:/png/dial_digital/1.png" + }, + { + "sub_img": "R:/png/dial_digital/2.png" + }, + { + "sub_img": "R:/png/dial_digital/3.png" + }, + { + "sub_img": "R:/png/dial_digital/4.png" + }, + { + "sub_img": "R:/png/dial_digital/5.png" + }, + { + "sub_img": "R:/png/dial_digital/6.png" + }, + { + "sub_img": "R:/png/dial_digital/7.png" + }, + { + "sub_img": "R:/png/dial_digital/8.png" + }, + { + "sub_img": "R:/png/dial_digital/9.png" + } + ] + }, + { + "img_type": 13, + "img_pos": { + "x": 319, + "y": 0 + }, + "sub_img_cnt": 10, + "sub_img_ll": [ + { + "sub_img": "R:/png/dial_digital/0.png" + }, + { + "sub_img": "R:/png/dial_digital/1.png" + }, + { + "sub_img": "R:/png/dial_digital/2.png" + }, + { + "sub_img": "R:/png/dial_digital/3.png" + }, + { + "sub_img": "R:/png/dial_digital/4.png" + }, + { + "sub_img": "R:/png/dial_digital/5.png" + }, + { + "sub_img": "R:/png/dial_digital/6.png" + }, + { + "sub_img": "R:/png/dial_digital/7.png" + }, + { + "sub_img": "R:/png/dial_digital/8.png" + }, + { + "sub_img": "R:/png/dial_digital/9.png" + } + ] + } + ], + "label_cnt": 0, + "label_ll": [ + { + "label_type": 0, + "text": "", + "text_color": { + "r": 0, + "g": 0, + "b": 0 + }, + "text_pos": { + "x": 0, + "y": 0 + }, + "font_size": 0 + } + ], + "bar": { + "bar_type": 0, + "bar_pos": { + "x": 0, + "y": 0 + }, + "bar_color": { + "r": 0, + "g": 0, + "b": 0 + }, + "bar_w": 0, + "bar_h": 0 + } + } + ] + } + ] +} diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/pre.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/pre.png new file mode 100644 index 00000000..5e46e5b2 Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_digital/pre.png differ