From: @CHENG <2393524978@qq.com> Date: Tue, 7 May 2024 09:02:00 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1aee9928569b33d96f0224c931186012f622eb1a;p=mirrors%2FASR3603_Z5_DS.git gengxin --- diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/mmi_default_CUSTOM.h index 2c94c6eb..eef70bf2 100644 --- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/mmi_default_CUSTOM.h +++ b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/mmi_default_CUSTOM.h @@ -36,6 +36,8 @@ #define MMI_CUSTOMER_MEASURE_SPO2_DURATION (34 * 1000) // unit:ms +#define MMI_CUSTOMER_MEASURE_BLOOD_GLUCOSE_DURATION (20 * 1000) // unit:ms + //health measure timed #define MMI_CUSTOMER_HEART_TIMED_FLAG false @@ -54,6 +56,10 @@ #define MMI_CUSTOMER_SPO2_TIMED_INTERVAL (60 * 60) // unit:s +#define MMI_CUSTOMER_BLOOD_GLUCOSE_TIMED_FLAG false + +#define MMI_CUSTOMER_BLOOD_GLUCOSE_TIMED_INTERVAL (60 * 60) // unit:s + //default language #define MMI_CUSTOMER_LANGUAGE (LANG_CH) // LANG_EN @@ -92,6 +98,16 @@ // low battery #define MMI_CUSTOMER_LOW_BATTERY_SWITCH (MMI_WATCH_SWITCH_ON) +// schedule power on/off +#define MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH (MMI_WATCH_SWITCH_ON) +#define MMI_CUSTOMER_SCHEDULE_POWER_ON_HOUR (6) // 0-23 +#define MMI_CUSTOMER_SCHEDULE_POWER_ON_MINUTE (0) // 0-59 + +#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH (MMI_WATCH_SWITCH_ON) +#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_HOUR (23) // 0-23 +#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_MINUTE (59) // 0-59 + + #endif diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/R_WECHAT_RECV.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/R_WECHAT_RECV.mp3 deleted file mode 100644 index 3d263dbb..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/R_WECHAT_RECV.mp3 and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/audio_wechat_receive.mid b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/audio_wechat_receive.mid deleted file mode 100644 index e68d119f..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/audio_wechat_receive.mid and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/audio_wechat_receive.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/audio_wechat_receive.mp3 deleted file mode 100644 index 2d51bb85..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/audio_wechat_receive.mp3 and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALBUM.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALBUM.mp3 deleted file mode 100644 index 24c59164..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALBUM.mp3 and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALIPAY.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALIPAY.mp3 deleted file mode 100644 index ad4e42f5..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALIPAY.mp3 and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ATRIAL_FIBRILLATION.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ATRIAL_FIBRILLATION.mp3 new file mode 100644 index 00000000..7b6d5b69 Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ATRIAL_FIBRILLATION.mp3 differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CALL_LOG.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CALL_LOG.mp3 index 7507c61c..09e67477 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CALL_LOG.mp3 and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CALL_LOG.mp3 differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CAMERA.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CAMERA.mp3 deleted file mode 100644 index b1e8c242..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CAMERA.mp3 and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_DIALPAD.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_DIALPAD.mp3 index 8bfff82f..01570ca1 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_DIALPAD.mp3 and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_DIALPAD.mp3 differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_HEART_RATE.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_HEART_RATE.mp3 index 32a8a313..7c7234da 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_HEART_RATE.mp3 and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_HEART_RATE.mp3 differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_PHONEBOOK.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_PHONEBOOK.mp3 index 60e48132..4e77cc47 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_PHONEBOOK.mp3 and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_PHONEBOOK.mp3 differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SETTINGS.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SETTINGS.mp3 index 81129abc..b2813378 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SETTINGS.mp3 and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SETTINGS.mp3 differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SMS.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SMS.mp3 index 7c7f9d3b..85f76dcb 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SMS.mp3 and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SMS.mp3 differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SOS.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SOS.mp3 index 403ce1cd..7f20c317 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SOS.mp3 and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SOS.mp3 differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SPO2.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SPO2.mp3 index 1c2b274e..bf0d008d 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SPO2.mp3 and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SPO2.mp3 differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_STEP.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_STEP.mp3 deleted file mode 100644 index 07b90be6..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_STEP.mp3 and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TEMPERATURE.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TEMPERATURE.mp3 index 247fc25d..0d1061de 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TEMPERATURE.mp3 and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TEMPERATURE.mp3 differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TOOL.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TOOL.mp3 index 0bb726e7..92edfdad 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TOOL.mp3 and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TOOL.mp3 differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_VIDEO_CALL.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_VIDEO_CALL.mp3 index c96d9c63..28651222 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_VIDEO_CALL.mp3 and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_VIDEO_CALL.mp3 differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_WEATHER.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_WEATHER.mp3 new file mode 100644 index 00000000..2f2bde7e Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_WEATHER.mp3 differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_WECHAT.mp3 b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_WECHAT.mp3 deleted file mode 100644 index 4de4c1b3..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_WECHAT.mp3 and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/gif/anim_sos.gif b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/gif/anim_sos.gif index d7e04f66..27dbc778 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/gif/anim_sos.gif and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/gif/anim_sos.gif differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/album/icon_del_all_bg.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/album/icon_del_all_bg.png index 68671960..62024325 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/album/icon_del_all_bg.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/album/icon_del_all_bg.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/call_log/icon_call_missed_2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/call_log/icon_call_missed_2.png new file mode 100644 index 00000000..ab80e321 Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/call_log/icon_call_missed_2.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/common/ICON_COMMON_BG_BLACK.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/common/ICON_COMMON_BG_BLACK.png index 3329c796..9bba95cd 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/common/ICON_COMMON_BG_BLACK.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/common/ICON_COMMON_BG_BLACK.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/common/ICON_COMMON_BG_WHITE.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/common/ICON_COMMON_BG_WHITE.png index 81bc88ef..e34642cf 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/common/ICON_COMMON_BG_WHITE.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/common/ICON_COMMON_BG_WHITE.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial/buildin_dial_list.db b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial/buildin_dial_list.db index 1c2db896..b04df373 100644 --- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial/buildin_dial_list.db +++ b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial/buildin_dial_list.db @@ -1,13 +1,3 @@ -dolphin -R:/png/dial_dolphin/dolphin_watch.json -default_digit -R:/png/dial_default_ambient/am_digit.json -rokcket -R:/png/dial_rocket/rocket_watch.json -bear -R:/png/dial_bear/bear_watch.json -style1 -R:/png/dial_style1/dial_style1.json dial_style3 R:/png/dial_style3/dial_style3.json dial_style4 diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/bear_watch.json b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/bear_watch.json deleted file mode 100644 index 5a4df6fe..00000000 --- a/2.sdk/project/C55_DS_D11G_DT_HZCH/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": 20 - }, - "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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_bear.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_bear.png deleted file mode 100644 index 30ddb961..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_bear.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_bear_nose.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_bear_nose.png deleted file mode 100644 index 21253cbe..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_bear_nose.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_clock.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_clock.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_hour.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_hour.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_min.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_min.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_sec.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_sec.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/default_watch.json b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/default_watch.json deleted file mode 100644 index ea9a664f..00000000 --- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/default_watch.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "name": "default", - "preview_img": "R:/png/dial_default/icon_dial_clock.png", - "bg_img": "R:/png/dial_default/icon_dial_default.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_default/icon_dial_default_hour.png" - } - ] - }, - { - "img_type": 22, - "img_pos": { - "x": -2, - "y": 0 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_default/icon_dial_default_sec.png" - } - ] - }, - { - "img_type": 21, - "img_pos": { - "x": -10, - "y": 0 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_default/icon_dial_default_min.png" - } - ] - }, - { - "img_type": 23, - "img_pos": { - "x": -10, - "y": 110 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_default/icon_dial_default_dot.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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_clock.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_clock.png deleted file mode 100644 index 71e97421..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_clock.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default.png deleted file mode 100644 index a52205ae..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_dot.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_dot.png deleted file mode 100644 index eacf44dd..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_dot.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_hour.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_hour.png deleted file mode 100644 index 7dba5fd5..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_hour.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_min.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_min.png deleted file mode 100644 index cd0c21ea..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_min.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_sec.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_sec.png deleted file mode 100644 index 9bb64f6d..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_sec.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json deleted file mode 100644 index b5b175e6..00000000 --- a/2.sdk/project/C55_DS_D11G_DT_HZCH/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": 0, - "y": 85 - }, - "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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg.png deleted file mode 100644 index 9bba95cd..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_digit_con_colon.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_digit_con_colon.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_none.json b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_none.json deleted file mode 100644 index 92f569d1..00000000 --- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_none.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json deleted file mode 100644 index 8def041f..00000000 --- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json +++ /dev/null @@ -1,343 +0,0 @@ -{ - "name": "海豚世界", - "preview_img": "R:/png/dial_dolphin/icon_dial_dolphin.png", - "bg_img": "R:/png/dial_dolphin/icon_dolphin.png", - "configurable": 0, - "element_ll": [ - { - "element_pos": { - "x": 25, - "y": 60 - }, - "element_cnt": 1, - "act_type": 1, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 1, - "element_name": "数字时钟", - "img_cnt": 4, - "img_ll": [ - { - "img_type": 10, - "img_pos": { - "x": 0, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_0.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_1.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_2.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_3.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_4.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_5.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_6.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_7.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_8.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_9.png" - } - ] - }, - { - "img_type": 11, - "img_pos": { - "x": 37, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_0.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_1.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_2.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_3.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_4.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_5.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_6.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_7.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_8.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_9.png" - } - ] - }, - { - "img_type": 12, - "img_pos": { - "x": 0, - "y": 60 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_0.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_1.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_2.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_3.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_4.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_5.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_6.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_7.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_8.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_9.png" - } - ] - }, - { - "img_type": 13, - "img_pos": { - "x": 37, - "y": 60 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_0.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_1.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_2.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_3.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_4.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_5.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_6.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_7.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_8.png" - }, - { - "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_9.png" - } - ] - } - ], - "label_cnt": 0, - "label_ll": [ - { - "label_type": 5, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 25, - "y": 190 - }, - "font_size": 20 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - }, - { - "element_pos": { - "x": 25, - "y": 210 - }, - "element_cnt": 1, - "act_type": 5, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 5, - "element_name": "日期", - "img_cnt": 0, - "img_ll": [ - ], - "label_cnt": 3, - "label_ll": [ - { - "label_type": 8, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 0, - "y": 0 - }, - "font_size": 20 - }, - { - "label_type": 10, - "text": "-", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 23, - "y": 0 - }, - "font_size": 20 - }, - { - "label_type": 9, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 33, - "y": 0 - }, - "font_size": 20 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - }, - { - "element_pos": { - "x": 110, - "y": 210 - }, - "element_cnt": 1, - "act_type": 4, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 4, - "element_name": "星期", - "img_cnt": 0, - "img_ll": [ - ], - "label_cnt": 1, - "label_ll": [ - { - "label_type": 5, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 0, - "y": 0 - }, - "font_size": 20 - } - ], - "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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png deleted file mode 100644 index 4f4fdb86..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin.png deleted file mode 100644 index c51755b8..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png deleted file mode 100644 index 6f71e737..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png deleted file mode 100644 index 8094ce7c..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png deleted file mode 100644 index f1be80e8..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png deleted file mode 100644 index 3b28ecfc..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png deleted file mode 100644 index 9066c268..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png deleted file mode 100644 index 9feebfcc..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png deleted file mode 100644 index 04d5f16e..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png deleted file mode 100644 index 3f6b55b1..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png deleted file mode 100644 index 0a0e4ef2..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png deleted file mode 100644 index c5bfc437..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_dial_rocket.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_dial_rocket.png deleted file mode 100644 index ff4e2cd5..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_dial_rocket.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png deleted file mode 100644 index 59a73716..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png deleted file mode 100644 index a691d2ca..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png deleted file mode 100644 index 7ddfe18f..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png deleted file mode 100644 index cc136b68..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png deleted file mode 100644 index 108501b6..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png deleted file mode 100644 index e1433232..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png deleted file mode 100644 index 6eeeebb8..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png deleted file mode 100644 index ab651965..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png deleted file mode 100644 index c540767a..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png deleted file mode 100644 index 31dfe451..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png deleted file mode 100644 index 50f735e4..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png deleted file mode 100644 index e7a337ca..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png deleted file mode 100644 index 8a3ab35a..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png deleted file mode 100644 index 21c6d09a..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png deleted file mode 100644 index 93ebe598..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png deleted file mode 100644 index dc53a5f3..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png deleted file mode 100644 index 35d901aa..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png deleted file mode 100644 index ccd9e557..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png deleted file mode 100644 index e2c69fde..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png deleted file mode 100644 index 4874b3b4..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png deleted file mode 100644 index 8e8517f8..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json deleted file mode 100644 index 7b6549fd..00000000 --- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json +++ /dev/null @@ -1,357 +0,0 @@ -{ - "name": "太空翱翔", - "preview_img": "R:/png/dial_rocket/icon_dial_rocket.png", - "bg_img": "R:/png/dial_rocket/icon_rocket.png", - "configurable": 0, - "element_ll": [ - { - "element_pos": { - "x": 120, - "y": 60 - }, - "element_cnt": 1, - "act_type": 1, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 1, - "element_name": "数字时钟", - "img_cnt": 4, - "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": 50, - "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": 12, - "img_pos": { - "x": 44, - "y": 95 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_0.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_1.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_2.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_3.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_4.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_5.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_6.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_7.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_8.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_9.png" - } - ] - }, - { - "img_type": 13, - "img_pos": { - "x": 72, - "y": 95 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_0.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_1.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_2.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_3.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_4.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_5.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_6.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_7.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_8.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_9.png" - } - ] - } - ], - "label_cnt": 0, - "label_ll": [ - { - "label_type": 5, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 25, - "y": 190 - }, - "font_size": 20 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - }, - { - "element_pos": { - "x": 100, - "y": 225 - }, - "element_cnt": 1, - "act_type": 5, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 5, - "element_name": "日期", - "img_cnt": 0, - "img_ll": [ - ], - "label_cnt": 4, - "label_ll": [ - { - "label_type": 8, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 0, - "y": 0 - }, - "font_size": 20 - }, - { - "label_type": 10, - "text": "月", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 25, - "y": 0 - }, - "font_size": 20 - }, - { - "label_type": 9, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 45, - "y": 0 - }, - "font_size": 20 - }, - { - "label_type": 10, - "text": "日", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 70, - "y": 0 - }, - "font_size": 20 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - }, - { - "element_pos": { - "x": 190, - "y": 225 - }, - "element_cnt": 1, - "act_type": 4, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 4, - "element_name": "星期", - "img_cnt": 0, - "img_ll": [ - ], - "label_cnt": 1, - "label_ll": [ - { - "label_type": 5, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 0, - "y": 0 - }, - "font_size": 20 - } - ], - "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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/bg.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/bg.png deleted file mode 100644 index e0998e6e..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/bg.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/dial_style1.json b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/dial_style1.json deleted file mode 100644 index 5ea86ef8..00000000 --- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/dial_style1.json +++ /dev/null @@ -1,561 +0,0 @@ -{ - "name": "那时花开", - "preview_img": "R:/png/dial_style1/view.png", - "bg_img": "R:/png/dial_style1/bg.png", - "configurable": 0, - "element_ll": - [ - { - "element_pos": { - "x": 0, - "y": 0 - }, - "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": 40, - "y": 50 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style1/time/0.png" - }, - { - "sub_img": "R:/png/dial_style1/time/1.png" - }, - { - "sub_img": "R:/png/dial_style1/time/2.png" - }, - { - "sub_img": "R:/png/dial_style1/time/3.png" - }, - { - "sub_img": "R:/png/dial_style1/time/4.png" - }, - { - "sub_img": "R:/png/dial_style1/time/5.png" - }, - { - "sub_img": "R:/png/dial_style1/time/6.png" - }, - { - "sub_img": "R:/png/dial_style1/time/7.png" - }, - { - "sub_img": "R:/png/dial_style1/time/8.png" - }, - { - "sub_img": "R:/png/dial_style1/time/9.png" - } - ] - }, - { - "img_type": 11, - "img_pos": { - "x": 76, - "y": 50 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style1/time/0.png" - }, - { - "sub_img": "R:/png/dial_style1/time/1.png" - }, - { - "sub_img": "R:/png/dial_style1/time/2.png" - }, - { - "sub_img": "R:/png/dial_style1/time/3.png" - }, - { - "sub_img": "R:/png/dial_style1/time/4.png" - }, - { - "sub_img": "R:/png/dial_style1/time/5.png" - }, - { - "sub_img": "R:/png/dial_style1/time/6.png" - }, - { - "sub_img": "R:/png/dial_style1/time/7.png" - }, - { - "sub_img": "R:/png/dial_style1/time/8.png" - }, - { - "sub_img": "R:/png/dial_style1/time/9.png" - } - ] - }, - { - "img_type": 16, - "img_pos": { - "x": 116, - "y": 58 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style1/time/colon.png" - } - ] - }, - { - "img_type": 12, - "img_pos": { - "x": 128, - "y": 50 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style1/time/0.png" - }, - { - "sub_img": "R:/png/dial_style1/time/1.png" - }, - { - "sub_img": "R:/png/dial_style1/time/2.png" - }, - { - "sub_img": "R:/png/dial_style1/time/3.png" - }, - { - "sub_img": "R:/png/dial_style1/time/4.png" - }, - { - "sub_img": "R:/png/dial_style1/time/5.png" - }, - { - "sub_img": "R:/png/dial_style1/time/6.png" - }, - { - "sub_img": "R:/png/dial_style1/time/7.png" - }, - { - "sub_img": "R:/png/dial_style1/time/8.png" - }, - { - "sub_img": "R:/png/dial_style1/time/9.png" - } - ] - }, - { - "img_type": 13, - "img_pos": { - "x": 164, - "y": 50 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style1/time/0.png" - }, - { - "sub_img": "R:/png/dial_style1/time/1.png" - }, - { - "sub_img": "R:/png/dial_style1/time/2.png" - }, - { - "sub_img": "R:/png/dial_style1/time/3.png" - }, - { - "sub_img": "R:/png/dial_style1/time/4.png" - }, - { - "sub_img": "R:/png/dial_style1/time/5.png" - }, - { - "sub_img": "R:/png/dial_style1/time/6.png" - }, - { - "sub_img": "R:/png/dial_style1/time/7.png" - }, - { - "sub_img": "R:/png/dial_style1/time/8.png" - }, - { - "sub_img": "R:/png/dial_style1/time/9.png" - } - ] - } - ], - "label_cnt": 0, - "label_ll": [ - { - "label_type": 5, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 25, - "y": 160 - }, - "font_size": 20 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - }, - { - "element_pos": - { - "x": 24, - "y": 111 - }, - "element_cnt": 1, - "act_type": 5, - "layer": 0, - "element_dsc_ll": - [ - { - "element_type": 5, - "element_name": "日期", - "img_cnt": 0, - "img_ll": [ - ], - "label_cnt": 4, - "label_ll": - [ - { - "label_type": 8, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 0, - "y": 0 - }, - "font_size": 20 - }, - { - "label_type": 10, - "text": "月", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 25, - "y": 0 - }, - "font_size": 20 - }, - { - "label_type": 9, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 45, - "y": 0 - }, - "font_size": 20 - }, - { - "label_type": 10, - "text": "日", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 70, - "y": 0 - }, - "font_size": 20 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - }, - { - "element_pos": { - "x": 47, - "y": 143 - }, - "element_cnt": 1, - "act_type": 4, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 4, - "element_name": "星期", - "img_cnt": 0, - "img_ll": [ - ], - "label_cnt": 1, - "label_ll": [ - { - "label_type": 5, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 0, - "y": 0 - }, - "font_size": 20 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - }, - { - "element_pos": { - "x": 130, - "y": 125 - }, - "element_cnt": 1, - "act_type": 8, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 8, - "element_name": "计步", - "img_cnt": 1, - "img_ll": [ - { - "img_type": 80, - "img_pos": { - "x": 0, - "y": 0 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style1/step.png" - } - ] - } - ], - "label_cnt": 1, - "label_ll": [ - { - "label_type": 17, - "text": "10249", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 35, - "y": 0 - }, - "font_size": 20 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - }, - { - "element_pos": { - "x": 53, - "y": 182 - }, - "element_cnt": 1, - "act_type": 13, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 13, - "element_name": "心率", - "img_cnt": 1, - "img_ll": [ - { - "img_type": 130, - "img_pos": { - "x": 0, - "y": 0 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style1/heart.png" - } - ] - } - ], - "label_cnt": 1, - "label_ll": [ - { - "label_type": 24, - "text": "123", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": -7, - "y": 37 - }, - "font_size": 25 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - }, - { - "element_pos": { - "x": 161, - "y": 182 - }, - "element_cnt": 1, - "act_type": 14, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 14, - "element_name": "血氧", - "img_cnt": 1, - "img_ll": [ - { - "img_type": 140, - "img_pos": { - "x": 0, - "y": 0 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style1/spo2.png" - } - ] - } - ], - "label_cnt": 1, - "label_ll": [ - { - "label_type": 26, - "text": "--", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": -10, - "y": 37 - }, - "font_size": 25 - } - ], - "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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/heart.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/heart.png deleted file mode 100644 index 519608b1..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/heart.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/spo2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/spo2.png deleted file mode 100644 index 15cb89dc..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/spo2.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/step.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/step.png deleted file mode 100644 index 385213b6..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/step.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/0.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/0.png deleted file mode 100644 index def8e2cb..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/0.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/1.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/1.png deleted file mode 100644 index 5f405173..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/1.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/2.png deleted file mode 100644 index 149e760f..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/2.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/3.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/3.png deleted file mode 100644 index 1b66e2bb..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/3.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/4.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/4.png deleted file mode 100644 index 143e3c06..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/4.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/5.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/5.png deleted file mode 100644 index 7cee6364..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/5.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/6.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/6.png deleted file mode 100644 index d18b2085..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/6.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/7.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/7.png deleted file mode 100644 index 3b620289..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/7.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/8.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/8.png deleted file mode 100644 index 6dbd9f3f..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/8.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/9.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/9.png deleted file mode 100644 index e88f1b59..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/9.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/colon.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/colon.png deleted file mode 100644 index 21eca502..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/colon.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/view.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/view.png deleted file mode 100644 index d4d08278..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/view.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/0.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/0.png deleted file mode 100644 index b63f4d30..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/0.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/1.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/1.png deleted file mode 100644 index 23ce1cb9..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/1.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/2.png deleted file mode 100644 index 75606130..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/2.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/3.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/3.png deleted file mode 100644 index 8aa96644..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/3.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/4.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/4.png deleted file mode 100644 index 86c53aaa..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/4.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/5.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/5.png deleted file mode 100644 index 67ee008e..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/5.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/6.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/6.png deleted file mode 100644 index c028667b..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/6.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/7.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/7.png deleted file mode 100644 index bc794b97..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/7.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/8.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/8.png deleted file mode 100644 index f2580de8..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/8.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/9.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/9.png deleted file mode 100644 index b0737826..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/9.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/bg.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/bg.png deleted file mode 100644 index 9bba95cd..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/bg.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/cloundy.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/cloundy.png deleted file mode 100644 index bc1edac1..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/cloundy.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/degree.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/degree.png deleted file mode 100644 index 080a3fbf..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/degree.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/dial_style2.json b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/dial_style2.json deleted file mode 100644 index aa30cb9e..00000000 --- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/dial_style2.json +++ /dev/null @@ -1,357 +0,0 @@ -{ - "name": "rocket", - "preview_img": "R:/png/dial_rocket/icon_dial_rocket.png", - "bg_img": "R:/png/dial_rocket/icon_rocket.png", - "configurable": 0, - "element_ll": [ - { - "element_pos": { - "x": 120, - "y": 40 - }, - "element_cnt": 1, - "act_type": 1, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 1, - "element_name": "数字时钟", - "img_cnt": 4, - "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": 50, - "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": 12, - "img_pos": { - "x": 44, - "y": 95 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_0.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_1.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_2.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_3.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_4.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_5.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_6.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_7.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_8.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_9.png" - } - ] - }, - { - "img_type": 13, - "img_pos": { - "x": 72, - "y": 95 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_0.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_1.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_2.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_3.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_4.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_5.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_6.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_7.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_8.png" - }, - { - "sub_img": "R:/png/dial_rocket/icon_rocket_digital_s_9.png" - } - ] - } - ], - "label_cnt": 0, - "label_ll": [ - { - "label_type": 5, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 25, - "y": 190 - }, - "font_size": 20 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - }, - { - "element_pos": { - "x": 100, - "y": 185 - }, - "element_cnt": 1, - "act_type": 5, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 5, - "element_name": "日期", - "img_cnt": 0, - "img_ll": [ - ], - "label_cnt": 4, - "label_ll": [ - { - "label_type": 8, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 0, - "y": 0 - }, - "font_size": 20 - }, - { - "label_type": 10, - "text": "月", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 25, - "y": 0 - }, - "font_size": 20 - }, - { - "label_type": 9, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 45, - "y": 0 - }, - "font_size": 20 - }, - { - "label_type": 10, - "text": "日", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 70, - "y": 0 - }, - "font_size": 20 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - }, - { - "element_pos": { - "x": 190, - "y": 185 - }, - "element_cnt": 1, - "act_type": 4, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 4, - "element_name": "星期", - "img_cnt": 0, - "img_ll": [ - ], - "label_cnt": 1, - "label_ll": [ - { - "label_type": 5, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 0, - "y": 0 - }, - "font_size": 20 - } - ], - "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/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/fri.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/fri.png deleted file mode 100644 index e080f60a..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/fri.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/mon.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/mon.png deleted file mode 100644 index 3e9729c8..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/mon.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/pre.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/pre.png deleted file mode 100644 index 3f8b20c2..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/pre.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/rain.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/rain.png deleted file mode 100644 index 26a5e63a..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/rain.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/sat.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/sat.png deleted file mode 100644 index 1dadb7b8..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/sat.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/snow.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/snow.png deleted file mode 100644 index b1b9abd7..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/snow.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/sun.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/sun.png deleted file mode 100644 index 4461b249..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/sun.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/sunny.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/sunny.png deleted file mode 100644 index 3663868f..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/sunny.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/thu.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/thu.png deleted file mode 100644 index 06223678..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/thu.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/tue.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/tue.png deleted file mode 100644 index e8becc59..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/tue.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/wed.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/wed.png deleted file mode 100644 index 1cbbe77f..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/wed.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/dial_style4.json b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/dial_style4.json index 0a62aab9..25d0b17c 100644 --- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/dial_style4.json +++ b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/dial_style4.json @@ -333,8 +333,8 @@ }, { "element_pos": { - "x": 50, - "y": 197 + "x": 35, + "y": 154 }, "element_cnt": 1, "act_type": 4, @@ -346,7 +346,7 @@ "img_cnt": 0, "img_ll": [ ], - "label_cnt": 1, + "label_cnt": 2, "label_ll": [ { "label_type": 5, @@ -360,7 +360,21 @@ "x": 0, "y": 0 }, - "font_size": 24 + "font_size": 22 + }, + { + "label_type": 27, + "text": "", + "text_color": { + "r": 255, + "g": 255, + "b": 255 + }, + "text_pos": { + "x": 0, + "y": -30 + }, + "font_size": 22 } ], "bar": { @@ -382,8 +396,8 @@ }, { "element_pos": { - "x": 50, - "y": 132 + "x": 35, + "y": 190 }, "element_cnt": 1, "act_type": 8, @@ -419,8 +433,8 @@ "b": 255 }, "text_pos": { - "x": -5, - "y": 30 + "x": 33, + "y": 0 }, "font_size": 20 } @@ -444,7 +458,7 @@ }, { "element_pos": { - "x": 120, + "x": 125, "y": 130 }, "element_cnt": 1, diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_ATRIAL_FIBRILLATION.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_ATRIAL_FIBRILLATION.png new file mode 100644 index 00000000..e731a540 Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_ATRIAL_FIBRILLATION.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_CALLLOG.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_CALLLOG.png index 5a9ef650..0909ab2b 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_CALLLOG.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_CALLLOG.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_PHONEBOOK.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_PHONEBOOK.png index c882b067..2891a0bb 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_PHONEBOOK.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_PHONEBOOK.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png index 320e55b2..b2a93fd8 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png index 69e86996..e280039a 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png index 22fc6ee6..a76c48b6 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_TOOL.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_TOOL.png index df78ee91..856fd2cd 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_TOOL.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_TOOL.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_WEATHER.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_WEATHER.png new file mode 100644 index 00000000..6e986847 Binary files /dev/null and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_WEATHER.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PEDOMETER.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PEDOMETER.png deleted file mode 100644 index f824fe61..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PEDOMETER.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_album.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_album.png deleted file mode 100644 index fde14e97..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_album.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_alipay.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_alipay.png deleted file mode 100644 index b69a76c4..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_alipay.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_camera.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_camera.png deleted file mode 100644 index 7312aab8..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_camera.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_dialpad.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_dialpad.png index d62e8b53..1e97d943 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_dialpad.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_dialpad.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png index 75eb21f0..cedff441 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_settings.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_settings.png index dff8d1f1..c1b6fe51 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_settings.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_settings.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_sms.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_sms.png index 8e18962a..06298c8b 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_sms.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_sms.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_videocall.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_videocall.png index b5b55476..bc471f93 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_videocall.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_videocall.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_wechat.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_wechat.png deleted file mode 100644 index b027308b..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_wechat.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png deleted file mode 100644 index adc704b0..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png deleted file mode 100644 index 74e81936..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png deleted file mode 100644 index ba173aa2..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png deleted file mode 100644 index 9033179a..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png deleted file mode 100644 index 58fa52b0..00000000 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png and /dev/null differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_barcode.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_barcode.png index fed867e4..b394dd78 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_barcode.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_barcode.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_bind_fail.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_bind_fail.png index 2e9a9be7..589bc9b6 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_bind_fail.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_bind_fail.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_bind_timeout.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_bind_timeout.png index 6842baa0..c227531a 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_bind_timeout.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_bind_timeout.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png index ccc7996d..d9629ec2 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_1.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_1.png index 0c72b815..40c7eeed 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_1.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_1.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_2.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_2.png index fa5e68ab..97c39080 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_2.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_2.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_3.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_3.png index 621320eb..c02a35f7 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_3.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_3.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_qrcode.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_qrcode.png index 99df857c..ddf9a9e2 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_qrcode.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_qrcode.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON.png index 06069afd..03de46b3 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON_PRESSED.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON_PRESSED.png index f21b48d2..61a42868 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON_PRESSED.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON_PRESSED.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_BG.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_BG.png index 515ca029..ef1b1dd2 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_BG.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_BG.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png index 0ff01b29..2458276d 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png index aad30a64..2217967c 100644 Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png and b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png differ diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index bc4ae4a9..6622ba4d 100644 --- a/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -131,7 +131,7 @@ #endif #ifdef USE_OEM_ZFB -#define USE_LV_WATCH_ALIPAY 1 +#define USE_LV_WATCH_ALIPAY 0 // 1 #else #define USE_LV_WATCH_ALIPAY 0 #endif @@ -162,12 +162,10 @@ #endif #define __MMI_ZHSX_SUPPORT_VIDEO_CALL__ -//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__ #define __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__ -//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__ -#define __MMI_WECHAT_SUPPORT__ -#define __MMI_WECHAT_RECEIVE_AUDIO_USE_MP3__ +//#define __MMI_WECHAT_SUPPORT__ +//#define __MMI_WECHAT_RECEIVE_AUDIO_USE_MP3__ #define __MMI_MAIN_MENU_ONE_PAGE_STYLE__ //#define __MMI_MAIN_MENU_FOUR_GRID_STYLE__ @@ -180,6 +178,8 @@ #define __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__ +#define __MMI_HEALTH_MEASURE_ATRIAL_FIBRILLATION_SUPPORT__ + //#define __MMI_APP_QRCODE_MENU_SUPPORT__ #define __MMI_APP_QRCODE_FROM_SERVER_SUPPORT__ #define __MMI_APP_QRCODE_AND_DEVICE_QRCODE_IN_ONE_SUPPORT__ @@ -189,12 +189,16 @@ #define __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ #define __MMI_ZHSX_SUPPORT_PHONEBOOK_LIST_STYLE__ +//#define __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__ #define __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ +#define __MMI_TOOL_MENU_SUPPORT__ + #if 0 != USE_LV_WATCH_WEATHER #define __MMI_WEATHER_MENU_SUPPORT__ #define __MMI_WEATHER_MENU_NOT_DISPLAY_TEMPERATURE_RANGE__ +#define __MMI_PAGE_MAIN_MENU_ADD_WEATHER__ #endif #define __MMI_POWER_ON_OFF_NO_RING__ @@ -227,14 +231,16 @@ #define __MMI_BP_CALIBRATE_SUPPORT__ -//#define __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__ - #define __MMI_SLEEP_FUNCTION_SUPPORT__ +//#define __Default_system_alarm__ + #define __MMI_ZHSX_SUPPORT_AUTHENTICATE__ #define __MMI_FZD_PROTOCOL_WITHOUT_PING_COMMAND_SUPPORT__ +#define __MMI_PEDOMETER_STEP_AND_GOAL_STYLE__ + #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_atrial_fibrillation.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_atrial_fibrillation.c new file mode 100644 index 00000000..ff3feb4d --- /dev/null +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_atrial_fibrillation.c @@ -0,0 +1,338 @@ + + + +#include "lv_watch.h" + +#ifdef __MMI_HEALTH_MEASURE_ATRIAL_FIBRILLATION_SUPPORT__ + +lv_atrial_fibrillation_obj_ext_t * health_atrial_fibrillation_get_ext(void) +{ + lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_HEALTH_MEASURE_ATRIAL_FIBRILLATION); + if(NULL == activity_obj) + { + return NULL; + } + + lv_obj_t * watch_obj; + lv_watch_get_child_obj(activity_obj, lv_watch_obj_signal, &watch_obj); + if(NULL != watch_obj) + { + lv_atrial_fibrillation_obj_ext_t * ext = lv_obj_get_ext_attr(watch_obj); + return ext; + } + return NULL; +} + +void health_atrial_fibrillation_display_update(void) +{ + lv_atrial_fibrillation_obj_ext_t * ext = health_atrial_fibrillation_get_ext(); + if(NULL == ext) + { + return; + } + + switch(ext->measure_state) + { + case STATE_ATRIAL_FIBRILLATION_MEASURING: + lv_obj_set_hidden(ext->img, TRUE); + + lv_label_set_text_id(ext->label_info, WATCH_TEXT_ID_MEASURING); + lv_obj_align(ext->label_info, ext->cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_INFO_Y); + + lv_label_set_text(ext->label_value, ext->heart_rate); + lv_obj_align(ext->label_value, ext->cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_VALUE_Y-10); + lv_obj_set_hidden(ext->label_value, ((strlen(ext->heart_rate)) ? FALSE : TRUE)); + + lv_label_set_text(ext->label_value_blood, ext->blood_low_high); + lv_obj_align(ext->label_value_blood, ext->cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_VALUE_Y+10); + lv_obj_set_hidden(ext->label_value_blood, TRUE); + + break; + + case STATE_ATRIAL_FIBRILLATION_MEASURE_FAIL: + lv_img_set_src(ext->img, ICON_HEART_RATE_MEASURE_FAIL); + lv_obj_set_hidden(ext->img, FALSE); + + lv_label_set_text_id(ext->label_info, WATCH_TEXT_ID_MEASURE_FAIL); + lv_obj_align(ext->label_info, ext->cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_INFO_Y); + + lv_obj_remove_style(ext->label_value, LV_LABEL_PART_MAIN, &lv_watch_font40); + lv_obj_add_style(ext->label_value, LV_LABEL_PART_MAIN, &lv_watch_font30); + lv_label_set_text_id(ext->label_value, WATCH_TEXT_ID_NOT_WEAR); + lv_obj_align(ext->label_value, ext->cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_VALUE_Y); + lv_obj_set_hidden(ext->label_value, FALSE); + break; + + case STATE_ATRIAL_FIBRILLATION_MEASURE_DONE: + lv_img_set_src(ext->img, ICON_HEART_RATE_MEASURE_DONE); + lv_obj_set_hidden(ext->img, FALSE); + + lv_label_set_text_id(ext->label_info, WATCH_TEXT_ID_MEASURE_DONE); + lv_obj_align(ext->label_info, ext->cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_INFO_Y); + + lv_label_set_text(ext->label_value, ext->heart_rate); + lv_obj_align(ext->label_value, ext->cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_VALUE_Y-10); + lv_obj_set_hidden(ext->label_value, FALSE); + + uint16_t blood_high_value = 0, blood_low_value = 0; + mmi_hsensor_blood_value_get(&blood_high_value,&blood_low_value); + //HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d/%d\n", __FUNCTION__, __LINE__, blood_low_value, blood_low_value); + + sprintf(ext->blood_low_high, "%d / %d mmHg", blood_high_value, blood_low_value); + + mmi_protocol_action_send_blood(blood_high_value, blood_low_value); + + lv_label_set_text(ext->label_value_blood, ext->blood_low_high); + #ifdef USE_LV_WATCH_UI_240_280 + lv_obj_align(ext->label_value_blood, ext->cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_VALUE_Y + 30); + #else + lv_obj_align(ext->label_value_blood, ext->cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_VALUE_Y+10); + #endif + lv_obj_set_hidden(ext->label_value_blood, FALSE); + + break; + + default: + break; + } +} + +static void health_atrial_fibrillation_measure_cycle_timeout(void * para) +{ + (void) para; + + lv_atrial_fibrillation_obj_ext_t * ext = health_atrial_fibrillation_get_ext(); + if(NULL != ext) + { + if(false == mmi_health_measure_wear_state_get() || HAL_CHG_CONNECTED == Hal_Charger_Get_Status()) + { + if(NULL != ext->cycle_timer_id) + { + Hal_Timer_Stop(ext->cycle_timer_id); + ext->cycle_timer_id = NULL; + } + if(NULL != ext->gif_info) + { + gif_close(ext->gif_info); + ext->gif_info = NULL; + } + lv_obj_del(ext->gif_cont); + + if(STATE_ATRIAL_FIBRILLATION_MEASURING == ext->measure_state) + { + mmi_health_measure_interrupt(); + } + ext->measure_state = STATE_ATRIAL_FIBRILLATION_MEASURE_FAIL; + watch_set_suspend_enable(true, ACT_ID_HEALTH_MEASURE_ATRIAL_FIBRILLATION, 0); + watch_wakeup_time_reset(); + } + else + { + if(true == mmi_health_measure_state_is_ui_measure()) + { + uint16_t value = 0; + + mmi_health_measure_heart_data_ui_get(&value); + if(MMI_HEART_RATE_VALUE_MIN <= value) // (value) + { + sprintf(ext->heart_rate, "%d bpm", value); + } + // uint16_t blood_high_value = 0; + // uint16_t blood_low_value = 0; + // mmi_hsensor_blood_value_get(&blood_high_value,&blood_low_value); + // sprintf(ext->blood_low_high, "%d / %d mmhg", blood_low_value,blood_high_value); + + //else + //{ + // sprintf(ext->heart_rate, "-- bpm"); + //} + ext->measure_state = STATE_ATRIAL_FIBRILLATION_MEASURING; + } + else + { + if(NULL != ext->cycle_timer_id) + { + Hal_Timer_Stop(ext->cycle_timer_id); + ext->cycle_timer_id = NULL; + } + if(NULL != ext->gif_info) + { + gif_close(ext->gif_info); + ext->gif_info = NULL; + } + lv_obj_del(ext->gif_cont); + ext->measure_state = STATE_ATRIAL_FIBRILLATION_MEASURE_DONE; + watch_set_suspend_enable(true, ACT_ID_HEALTH_MEASURE_ATRIAL_FIBRILLATION, 0); + watch_wakeup_time_reset(); + } + } + } + + health_atrial_fibrillation_display_update(); +} + +static void health_atrial_fibrillation_prepare_destory(lv_obj_t * activity_obj) +{ + HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + + watch_set_suspend_enable(true, ACT_ID_HEALTH_MEASURE_ATRIAL_FIBRILLATION, 0); + lv_watch_png_cache_all_free(); + + //lv_obj_t * watch_obj = NULL; + //lv_watch_get_child_obj(act, lv_watch_obj_signal, &watch_obj); + //lv_obj_t * cont = lv_obj_get_child(watch_obj, NULL); + + lv_atrial_fibrillation_obj_ext_t * ext = health_atrial_fibrillation_get_ext(); + if(NULL != ext) + { + if(NULL != ext->cycle_timer_id) + { + Hal_Timer_Stop(ext->cycle_timer_id); + ext->cycle_timer_id = NULL; + } + if(NULL != ext->gif_info) + { + gif_close(ext->gif_info); + ext->gif_info = NULL; + } + if(STATE_ATRIAL_FIBRILLATION_MEASURING == ext->measure_state) + { + mmi_health_measure_interrupt(); + } + + HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + } +} + +lv_obj_t * health_atrial_fibrillation_create(lv_obj_t * activity_obj) +{ + if(NULL == activity_obj) + { + lv_watch_activity_ext_t activity_ext = {0}; + + activity_ext.actId = ACT_ID_HEALTH_MEASURE_ATRIAL_FIBRILLATION; + activity_ext.create = health_atrial_fibrillation_create; + activity_ext.prepare_destory = health_atrial_fibrillation_prepare_destory; + + activity_obj = lv_watch_creat_activity_obj(&activity_ext); + LV_ASSERT_MEM(activity_obj); + if(NULL == activity_obj) + return NULL; + } + + lv_obj_t * watch_obj = lv_watch_obj_create(activity_obj); + if(NULL == watch_obj) + return NULL; + + lv_atrial_fibrillation_obj_ext_t * ext = lv_obj_allocate_ext_attr(watch_obj, sizeof(lv_atrial_fibrillation_obj_ext_t)); + if(NULL == ext) + return NULL; + + ext->gif_info = NULL; + ext->cycle_timer_id = NULL; + ext->cont = NULL; + ext->img = NULL; + ext->gif_cont = NULL; + ext->measure_state = STATE_ATRIAL_FIBRILLATION_MEASURE_NONE; + _lv_memset_00(ext->heart_rate, sizeof(ext->heart_rate)); + + lv_obj_t * cont = lv_cont_create(watch_obj, NULL); + lv_obj_set_size(cont, LV_HOR_RES, LV_VER_RES); + lv_obj_align(cont, watch_obj, LV_ALIGN_IN_BOTTOM_MID, 0, 0); + lv_obj_set_style_local_bg_color(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); + lv_obj_set_style_local_bg_opa(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP); + lv_obj_set_style_local_pad_left(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0); + lv_obj_set_style_local_pad_right(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0); + //lv_cont_set_layout(cont, LV_LAYOUT_ROW_MID); + lv_obj_set_click(cont, false); + //lv_obj_set_base_dir(cont, LV_BIDI_DIR_LTR); + lv_watch_obj_add_element(cont); + ext->cont = cont; + + lv_obj_t * img = lv_img_create(cont, NULL); + lv_img_set_src(img, ICON_HEART_RATE_MEASURE_FAIL); + lv_obj_align(img, NULL, LV_ALIGN_IN_TOP_MID, 0, HEART_MEASURE_IMAGE_Y); + lv_obj_set_hidden(img, true); + ext->img = img; + + lv_obj_t * label_info = lv_label_create(cont, NULL); + //lv_obj_set_size(label_info, LV_HOR_RES, 30); + lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &lv_watch_font20); + lv_label_set_text_id(label_info, WATCH_TEXT_ID_MEASURING); + //lv_label_set_align(label_info, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label_info, cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_INFO_Y); + lv_obj_set_click(label_info, false); + ext->label_info = label_info; + + lv_obj_t * label_value = lv_label_create(cont, NULL); + //lv_obj_set_size(label_value, LV_HOR_RES, 40); + lv_obj_add_style(label_value, LV_LABEL_PART_MAIN, &lv_watch_font24); + lv_label_set_text(label_value, ext->heart_rate); + //lv_label_set_align(label_value, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label_value, cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_VALUE_Y-10); + lv_obj_set_click(label_value, false); + ext->label_value = label_value; + + lv_obj_t * label_value_blood = lv_label_create(cont, NULL); + //lv_obj_set_size(label_value, LV_HOR_RES, 40); + lv_obj_add_style(label_value_blood, LV_LABEL_PART_MAIN, &lv_watch_font24); + lv_label_set_text(label_value_blood, ext->heart_rate); + //lv_label_set_align(label_value, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label_value_blood, cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_VALUE_Y+10); + lv_obj_set_click(label_value_blood, false); + ext->label_value_blood = label_value_blood; + + if(false == mmi_health_measure_wear_state_get() || HAL_CHG_CONNECTED == Hal_Charger_Get_Status()) + { + ext->measure_state = STATE_ATRIAL_FIBRILLATION_MEASURE_FAIL; + } + else + { + mmi_health_measure_ui_measure_start(MMI_HEALTH_MEASURE_HEART); + + lv_obj_t * gif_cont = lv_cont_create(cont, NULL); + lv_obj_set_size(gif_cont, LV_HOR_RES, 100); + lv_obj_set_style_local_bg_color(gif_cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); + lv_obj_align(gif_cont, cont, LV_ALIGN_IN_TOP_MID, 0, HEART_MEASURE_IMAGE_Y); + ext->gif_cont = gif_cont; + + ext->gif_info = gif_open(gif_cont, ANIM_HEART_RATE_MEASURING, 0); + if(!ext->gif_info) + { + HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: gif open fail\n", __FUNCTION__, __LINE__); + } + + ext->cycle_timer_id = Hal_Timer_Start(HEALTH_HEART_MEASURE_CYCLE, health_atrial_fibrillation_measure_cycle_timeout, NULL, TRUE); + + ext->measure_state = STATE_ATRIAL_FIBRILLATION_MEASURING; + watch_set_suspend_enable(false, ACT_ID_HEALTH_MEASURE_ATRIAL_FIBRILLATION, 0); + } + + health_atrial_fibrillation_display_update(); + + return watch_obj; +} + +void health_atrial_fibrillation_create_event_cb(lv_obj_t * btn, lv_event_t e) +{ + (void)btn; + if(LV_EVENT_CLICKED == e) + { + lv_obj_t * obj = health_atrial_fibrillation_create(NULL); + LV_ASSERT_MEM(obj); + } +} + +void mmi_health_atrial_fibrillation_screen_clean(void) +{ + lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_HEALTH_MEASURE_ATRIAL_FIBRILLATION); + if(NULL != activity_obj) + { + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + health_atrial_fibrillation_prepare_destory(NULL); + lv_obj_del(activity_obj); + } +} + +#endif + diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_atrial_fibrillation.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_atrial_fibrillation.h new file mode 100644 index 00000000..133a4337 --- /dev/null +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_atrial_fibrillation.h @@ -0,0 +1,132 @@ + + + +#ifndef __HEALTH_ATRIAL_FIBRILLATION_H__ +#define __HEALTH_ATRIAL_FIBRILLATION_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef LV_CONF_INCLUDE_SIMPLE +#include "lvgl.h" +#include "lv_ex_conf.h" +#else +#include "../../../lvgl/lvgl.h" +#include "../../../lv_ex_conf.h" +#endif + +#ifdef __MMI_HEALTH_MEASURE_ATRIAL_FIBRILLATION_SUPPORT__ + + +#define HEALTH_HEART_MEASURE_CYCLE (1000 * 1) + + +#ifdef USE_LV_WATCH_UI_CIRCLE + +#if USE_LV_WATCH_UI_240_240 +#define HEART_MEASURE_IMAGE_Y (25) +#define HEART_LABEL_INFO_X (0) +#define HEART_LABEL_INFO_Y (135) +#define HEART_LABEL_INFO_W (LV_HOR_RES - HEART_LABEL_INFO_X) +#define HEART_LABEL_INFO_H (30) + +#define HEART_LABEL_VALUE_X (0) +#define HEART_LABEL_VALUE_Y (165) +#define HEART_LABEL_VALUE_W (LV_HOR_RES - HEART_LABEL_VALUE_X) +#define HEART_LABEL_VALUE_H (50) + +#else +#define HEART_MEASURE_IMAGE_Y (40) +#define HEART_LABEL_INFO_X (0) +#define HEART_LABEL_INFO_Y (180) +#define HEART_LABEL_INFO_W (LV_HOR_RES - HEART_LABEL_INFO_X) +#define HEART_LABEL_INFO_H (30) + +#define HEART_LABEL_VALUE_X (0) +#define HEART_LABEL_VALUE_Y (220) +#define HEART_LABEL_VALUE_W (LV_HOR_RES - HEART_LABEL_VALUE_X) +#define HEART_LABEL_VALUE_H (50) + +#endif + +#else + +#if USE_LV_WATCH_UI_240_320 +#define HEART_MEASURE_IMAGE_Y (40) +#define HEART_LABEL_INFO_X (0) +#define HEART_LABEL_INFO_Y (180) +#define HEART_LABEL_INFO_W (LV_HOR_RES - HEART_LABEL_INFO_X) +#define HEART_LABEL_INFO_H (30) + +#define HEART_LABEL_VALUE_X (0) +#define HEART_LABEL_VALUE_Y (220) +#define HEART_LABEL_VALUE_W (LV_HOR_RES - HEART_LABEL_VALUE_X) +#define HEART_LABEL_VALUE_H (50) + +#elif USE_LV_WATCH_UI_240_280 +#define HEART_MEASURE_IMAGE_Y (40) +#define HEART_LABEL_INFO_X (0) +#define HEART_LABEL_INFO_Y (155) +#define HEART_LABEL_INFO_W (LV_HOR_RES - HEART_LABEL_INFO_X) +#define HEART_LABEL_INFO_H (30) + +#define HEART_LABEL_VALUE_X (0) +#define HEART_LABEL_VALUE_Y (195) +#define HEART_LABEL_VALUE_W (LV_HOR_RES - HEART_LABEL_VALUE_X) +#define HEART_LABEL_VALUE_H (50) + +#else +#define HEART_MEASURE_IMAGE_Y (40) +#define HEART_LABEL_INFO_X (0) +#define HEART_LABEL_INFO_Y (180) +#define HEART_LABEL_INFO_W (LV_HOR_RES - HEART_LABEL_INFO_X) +#define HEART_LABEL_INFO_H (30) + +#define HEART_LABEL_VALUE_X (0) +#define HEART_LABEL_VALUE_Y (220) +#define HEART_LABEL_VALUE_W (LV_HOR_RES - HEART_LABEL_VALUE_X) +#define HEART_LABEL_VALUE_H (50) + +#endif + +#endif + + +typedef enum +{ + STATE_ATRIAL_FIBRILLATION_MEASURE_NONE, + STATE_ATRIAL_FIBRILLATION_MEASURING, + STATE_ATRIAL_FIBRILLATION_MEASURE_DONE, + STATE_ATRIAL_FIBRILLATION_MEASURE_FAIL, + STATE_ATRIAL_FIBRILLATION_MEASURE_MAX, +}lv_atrial_fibrillation_state_e; + +typedef struct +{ + lv_watch_obj_ext_t lv_watch_obj; + /*New data for this type */ + gif_info_t * gif_info; + TIMER_ID cycle_timer_id; + lv_obj_t * cont; + lv_obj_t * img; + lv_obj_t * label_info; + lv_obj_t * label_value; + lv_obj_t * label_value_blood; + lv_obj_t * gif_cont; + lv_atrial_fibrillation_state_e measure_state; + char heart_rate[8]; + char blood_low_high[16]; +} lv_atrial_fibrillation_obj_ext_t; + + +void health_atrial_fibrillation_create_event_cb(lv_obj_t * btn, lv_event_t e); +void mmi_health_atrial_fibrillation_screen_clean(void); + +#endif + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif