From: @CHENG <2393524978@qq.com> Date: Tue, 18 Feb 2025 06:42:47 +0000 (+0800) Subject: Z5_HA_K18_NFC X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=8f072e2b7ad410852746d2b9d94dbf94a240c055;p=mirrors%2FASR3603_Z5.git Z5_HA_K18_NFC --- diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/mmi_default_CUSTOM.h index 231ac3ef..01f2822f 100644 --- a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/mmi_default_CUSTOM.h +++ b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/mmi_default_CUSTOM.h @@ -59,7 +59,7 @@ #define MMI_CUSTOMER_LANGUAGE (LANG_CH) // LANG_EN //ring volume -#define MMI_CUSTOMER_RING_VOLUME (2) // (10) +#define MMI_CUSTOMER_RING_VOLUME (5) // (10) //backlight level #define MMI_CUSTOMER_BACKLIGHT_LEVEL (10) @@ -78,7 +78,7 @@ #define MMI_CUSTOMER_WHITE_LIST_SWITCH (MMI_WATCH_SWITCH_OFF) //main menu style -#define MMI_CUSTOMER_MAIN_MENU_STYLE (MMI_MAIN_MENU_STYLE_LIST) +#define MMI_CUSTOMER_MAIN_MENU_STYLE (MMI_MAIN_MENU_STYLE_ONE_PAGE) // sim unbind #define MMI_CUSTOMER_SIM_UNBIND_SWITCH (MMI_WATCH_SWITCH_ON) @@ -87,13 +87,6 @@ #define MMI_CUSTOMER_CHIP_TEMP_HIGH_THRESHOLD (70) #define MMI_CUSTOMER_CHIP_TEMP_LOW_THRESHOLD (60) -// sleep setting -#define MMI_CUSTOMER_SLEEP_SETTING_TIME_SWITCH (MMI_WATCH_SWITCH_ON) // 0-close; 1-open -#define MMI_CUSTOMER_SLEEP_SETTING_TIME_BHOUR (20) // 0-23 -#define MMI_CUSTOMER_SLEEP_SETTING_TIME_BMIN (0) // 0-59 -#define MMI_CUSTOMER_SLEEP_SETTING_TIME_EHOUR (10) // 0-23 -#define MMI_CUSTOMER_SLEEP_SETTING_TIME_EMIN (0) // 0-59 - #endif diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/audio/audio_wechat_receive.mid b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/audio/audio_wechat_receive.mid deleted file mode 100644 index e68d119f..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/audio/audio_wechat_receive.mid and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/audio/audio_wechat_receive.mp3 b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/audio/audio_wechat_receive.mp3 deleted file mode 100644 index 2d51bb85..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/audio/audio_wechat_receive.mp3 and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/camera/icon_camera_shoot.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/camera/icon_camera_shoot.png deleted file mode 100644 index 84c30b4e..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/camera/icon_camera_shoot.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/camera/icon_imgview.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/camera/icon_imgview.png deleted file mode 100644 index 3ed68d8d..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/camera/icon_imgview.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/camera/icon_memory.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/camera/icon_memory.png deleted file mode 100644 index 5fdfd586..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/camera/icon_memory.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_ALERT.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_ALERT.png deleted file mode 100644 index 238cae42..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_ALERT.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_ATTEMPT_MODE.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_ATTEMPT_MODE.png deleted file mode 100644 index 0bd1f2da..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_ATTEMPT_MODE.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_BOTTOM_BTN_BG.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_BOTTOM_BTN_BG.png deleted file mode 100644 index 45a3fa68..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_BOTTOM_BTN_BG.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_BTN_BG.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_BTN_BG.png deleted file mode 100644 index 8a97ae28..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_BTN_BG.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_CALIBRATION_MODE.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_CALIBRATION_MODE.png deleted file mode 100644 index 85c14e4d..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_CALIBRATION_MODE.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_CALIBRATION_RECORD.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_CALIBRATION_RECORD.png deleted file mode 100644 index 41fbfa1e..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_CALIBRATION_RECORD.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_DOWN_ARROW.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_DOWN_ARROW.png deleted file mode 100644 index ccc8f5c5..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_DOWN_ARROW.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_LEFT_ARROW.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_LEFT_ARROW.png deleted file mode 100644 index 5155c428..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_LEFT_ARROW.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_MEASURE_MODE.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_MEASURE_MODE.png deleted file mode 100644 index 6f188715..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_MEASURE_MODE.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_0.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_0.png deleted file mode 100644 index 6a83f411..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_0.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_1.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_1.png deleted file mode 100644 index a8c04ea2..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_1.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_2.png deleted file mode 100644 index 4e7a36b1..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_2.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_RIGHT_ARROW.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_RIGHT_ARROW.png deleted file mode 100644 index bec129b4..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_RIGHT_ARROW.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_SUCCESS.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_SUCCESS.png deleted file mode 100644 index 75334bf7..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_SUCCESS.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_UP_ARROW.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_UP_ARROW.png deleted file mode 100644 index 1b21b061..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_UP_ARROW.png and /dev/null differ diff --git "a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/\345\234\206\345\275\242 23.png" "b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/\345\234\206\345\275\242 23.png" deleted file mode 100644 index a608317b..00000000 Binary files "a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/custom_function/\345\234\206\345\275\242 23.png" and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial/buildin_dial_list.db b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial/buildin_dial_list.db index e71b569b..fef722e8 100644 --- a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial/buildin_dial_list.db +++ b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial/buildin_dial_list.db @@ -1,10 +1,2 @@ -default_digit -R:/png/dial_digital/dial_digital.json -rokcket -R:/png/dial_rocket/rocket_watch.json -dolphin -R:/png/dial_dolphin/dolphin_watch.json style1 R:/png/dial_style1/dial_style1.json -dial_style3 -R:/png/dial_style3/dial_style3.json diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/0.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/0.png deleted file mode 100644 index ca71ec36..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/0.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/1.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/1.png deleted file mode 100644 index 6426da81..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/1.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/2.png deleted file mode 100644 index 4b1df1b3..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/2.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/3.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/3.png deleted file mode 100644 index 57673770..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/3.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/4.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/4.png deleted file mode 100644 index 1ec6840f..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/4.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/5.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/5.png deleted file mode 100644 index c8993c0b..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/5.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/6.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/6.png deleted file mode 100644 index c58fb0b0..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/6.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/7.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/7.png deleted file mode 100644 index 0a0cc5f6..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/7.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/8.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/8.png deleted file mode 100644 index 4015b5e1..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/8.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/9.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/9.png deleted file mode 100644 index e5d11d14..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/9.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/am_none.json b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/am_none.json deleted file mode 100644 index 92f569d1..00000000 --- a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/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/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/bg.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/bg.png deleted file mode 100644 index 19c4d50f..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/bg.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/colon.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/colon.png deleted file mode 100644 index 4ca73d3b..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/colon.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/dial_digital.json b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/dial_digital.json deleted file mode 100644 index 97001554..00000000 --- a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/dial_digital.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "name": "数字时钟", - "preview_img": "R:/png/dial_digital/pre.png", - "bg_img": "R:/png/dial_digital/bg.png", - "configurable": 0, - "element_ll": [ - { - "element_pos": { - "x": 28, - "y": 144 - }, - "element_cnt": 1, - "act_type": 1, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 1, - "element_name": "数字时钟", - "img_cnt": 5, - "img_ll": [ - { - "img_type": 10, - "img_pos": { - "x": 0, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_digital/0.png" - }, - { - "sub_img": "R:/png/dial_digital/1.png" - }, - { - "sub_img": "R:/png/dial_digital/2.png" - }, - { - "sub_img": "R:/png/dial_digital/3.png" - }, - { - "sub_img": "R:/png/dial_digital/4.png" - }, - { - "sub_img": "R:/png/dial_digital/5.png" - }, - { - "sub_img": "R:/png/dial_digital/6.png" - }, - { - "sub_img": "R:/png/dial_digital/7.png" - }, - { - "sub_img": "R:/png/dial_digital/8.png" - }, - { - "sub_img": "R:/png/dial_digital/9.png" - } - ] - }, - { - "img_type": 11, - "img_pos": { - "x": 90, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_digital/0.png" - }, - { - "sub_img": "R:/png/dial_digital/1.png" - }, - { - "sub_img": "R:/png/dial_digital/2.png" - }, - { - "sub_img": "R:/png/dial_digital/3.png" - }, - { - "sub_img": "R:/png/dial_digital/4.png" - }, - { - "sub_img": "R:/png/dial_digital/5.png" - }, - { - "sub_img": "R:/png/dial_digital/6.png" - }, - { - "sub_img": "R:/png/dial_digital/7.png" - }, - { - "sub_img": "R:/png/dial_digital/8.png" - }, - { - "sub_img": "R:/png/dial_digital/9.png" - } - ] - }, - { - "img_type": 16, - "img_pos": { - "x": 180, - "y": 0 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_digital/colon.png" - } - ] - }, - { - "img_type": 12, - "img_pos": { - "x": 229, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_digital/0.png" - }, - { - "sub_img": "R:/png/dial_digital/1.png" - }, - { - "sub_img": "R:/png/dial_digital/2.png" - }, - { - "sub_img": "R:/png/dial_digital/3.png" - }, - { - "sub_img": "R:/png/dial_digital/4.png" - }, - { - "sub_img": "R:/png/dial_digital/5.png" - }, - { - "sub_img": "R:/png/dial_digital/6.png" - }, - { - "sub_img": "R:/png/dial_digital/7.png" - }, - { - "sub_img": "R:/png/dial_digital/8.png" - }, - { - "sub_img": "R:/png/dial_digital/9.png" - } - ] - }, - { - "img_type": 13, - "img_pos": { - "x": 319, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_digital/0.png" - }, - { - "sub_img": "R:/png/dial_digital/1.png" - }, - { - "sub_img": "R:/png/dial_digital/2.png" - }, - { - "sub_img": "R:/png/dial_digital/3.png" - }, - { - "sub_img": "R:/png/dial_digital/4.png" - }, - { - "sub_img": "R:/png/dial_digital/5.png" - }, - { - "sub_img": "R:/png/dial_digital/6.png" - }, - { - "sub_img": "R:/png/dial_digital/7.png" - }, - { - "sub_img": "R:/png/dial_digital/8.png" - }, - { - "sub_img": "R:/png/dial_digital/9.png" - } - ] - } - ], - "label_cnt": 0, - "label_ll": [ - { - "label_type": 0, - "text": "", - "text_color": { - "r": 0, - "g": 0, - "b": 0 - }, - "text_pos": { - "x": 0, - "y": 0 - }, - "font_size": 0 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 0, - "y": 0 - }, - "bar_color": { - "r": 0, - "g": 0, - "b": 0 - }, - "bar_w": 0, - "bar_h": 0 - } - } - ] - } - ] -} diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/pre.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/pre.png deleted file mode 100644 index 5e46e5b2..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_digital/pre.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json deleted file mode 100644 index 603a04f0..00000000 --- a/2.sdk/project/Z5_HA_K18_NFC/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": 50, - "y": 100 - }, - "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": 60, - "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": 110 - }, - "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": 60, - "y": 110 - }, - "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": 50, - "y": 325 - }, - "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": 30 - }, - { - "label_type": 10, - "text": "-", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 35, - "y": 0 - }, - "font_size": 30 - }, - { - "label_type": 9, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 50, - "y": 0 - }, - "font_size": 30 - } - ], - "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": 140, - "y": 325 - }, - "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": 30 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - } - ] -} diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png deleted file mode 100644 index f05cef24..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin.png deleted file mode 100644 index e951ae55..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png deleted file mode 100644 index 7f6b029f..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png deleted file mode 100644 index ef32f504..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png deleted file mode 100644 index e7c439fb..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png deleted file mode 100644 index 528a9f6b..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png deleted file mode 100644 index f8963b98..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png deleted file mode 100644 index 44d48a46..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png deleted file mode 100644 index 8ab26d07..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png deleted file mode 100644 index 947cffa3..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png deleted file mode 100644 index 583ee6af..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png deleted file mode 100644 index e44ed155..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_dial_rocket.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_dial_rocket.png deleted file mode 100644 index 2c7a1404..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_dial_rocket.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png deleted file mode 100644 index 579d82e0..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png deleted file mode 100644 index ca71ec36..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png deleted file mode 100644 index 6426da81..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png deleted file mode 100644 index 4b1df1b3..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png deleted file mode 100644 index 57673770..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png deleted file mode 100644 index 1ec6840f..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png deleted file mode 100644 index c8993c0b..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png deleted file mode 100644 index c58fb0b0..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png deleted file mode 100644 index 0a0cc5f6..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png deleted file mode 100644 index 4015b5e1..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png deleted file mode 100644 index e5d11d14..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png deleted file mode 100644 index 67fd0173..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png deleted file mode 100644 index 9da108c8..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png deleted file mode 100644 index 2891ab3d..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png deleted file mode 100644 index dc9f232c..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png deleted file mode 100644 index 3d2edafe..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png deleted file mode 100644 index f6ef53ca..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png deleted file mode 100644 index 0079ff76..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png deleted file mode 100644 index 4ebd9c42..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png deleted file mode 100644 index 5edb49cf..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png deleted file mode 100644 index 81bb7546..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json deleted file mode 100644 index edf50828..00000000 --- a/2.sdk/project/Z5_HA_K18_NFC/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": 230, - "y": 80 - }, - "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": 90, - "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": 88, - "y": 170 - }, - "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": 135, - "y": 170 - }, - "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": 215, - "y": 330 - }, - "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": 30 - }, - { - "label_type": 10, - "text": "月", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 32, - "y": 0 - }, - "font_size": 30 - }, - { - "label_type": 9, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 65, - "y": 0 - }, - "font_size": 30 - }, - { - "label_type": 10, - "text": "日", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 98, - "y": 0 - }, - "font_size": 30 - } - ], - "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": 345, - "y": 330 - }, - "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": 30 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - } - ] -} diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/0.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/0.png deleted file mode 100644 index 37e44424..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/0.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/1.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/1.png deleted file mode 100644 index bc9cde6b..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/1.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/2.png deleted file mode 100644 index 74493e23..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/2.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/3.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/3.png deleted file mode 100644 index 7fe4371b..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/3.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/4.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/4.png deleted file mode 100644 index 9c82db0c..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/4.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/5.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/5.png deleted file mode 100644 index 86a86fd8..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/5.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/6.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/6.png deleted file mode 100644 index a81f554c..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/6.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/7.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/7.png deleted file mode 100644 index 0ac6c3c1..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/7.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/8.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/8.png deleted file mode 100644 index ffa00df1..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/8.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/9.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/9.png deleted file mode 100644 index d62f37f4..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/9.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/bg.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/bg.png deleted file mode 100644 index c2a773c6..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/bg.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie.png deleted file mode 100644 index 51f41b33..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/0.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/0.png deleted file mode 100644 index 4e3787ca..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/0.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/1.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/1.png deleted file mode 100644 index 03fe1dce..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/1.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/10.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/10.png deleted file mode 100644 index 3ead9874..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/10.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/2.png deleted file mode 100644 index 0238f117..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/2.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/3.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/3.png deleted file mode 100644 index 3e49b3c9..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/3.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/4.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/4.png deleted file mode 100644 index 680734b8..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/4.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/5.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/5.png deleted file mode 100644 index deeb1d63..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/5.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/6.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/6.png deleted file mode 100644 index 96aa08a2..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/6.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/7.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/7.png deleted file mode 100644 index 08b01ddd..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/7.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/8.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/8.png deleted file mode 100644 index 74055d8a..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/8.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/9.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/9.png deleted file mode 100644 index 9bdb048b..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/calorie/9.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/colon.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/colon.png deleted file mode 100644 index 480af979..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/colon.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/dial_style3.json b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/dial_style3.json deleted file mode 100644 index 5807ad37..00000000 --- a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/dial_style3.json +++ /dev/null @@ -1,627 +0,0 @@ -{ - "name": "火力全开", - "preview_img": "R:/png/dial_style3/pre.png", - "bg_img": "R:/png/dial_style3/bg.png", - "configurable": 0, - "element_ll": [ - { - "element_pos": { - "x": 76, - "y": 173 - }, - "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": -5, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style3/0.png" - }, - { - "sub_img": "R:/png/dial_style3/1.png" - }, - { - "sub_img": "R:/png/dial_style3/2.png" - }, - { - "sub_img": "R:/png/dial_style3/3.png" - }, - { - "sub_img": "R:/png/dial_style3/4.png" - }, - { - "sub_img": "R:/png/dial_style3/5.png" - }, - { - "sub_img": "R:/png/dial_style3/6.png" - }, - { - "sub_img": "R:/png/dial_style3/7.png" - }, - { - "sub_img": "R:/png/dial_style3/8.png" - }, - { - "sub_img": "R:/png/dial_style3/9.png" - } - ] - }, - { - "img_type": 11, - "img_pos": { - "x": 67, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style3/0.png" - }, - { - "sub_img": "R:/png/dial_style3/1.png" - }, - { - "sub_img": "R:/png/dial_style3/2.png" - }, - { - "sub_img": "R:/png/dial_style3/3.png" - }, - { - "sub_img": "R:/png/dial_style3/4.png" - }, - { - "sub_img": "R:/png/dial_style3/5.png" - }, - { - "sub_img": "R:/png/dial_style3/6.png" - }, - { - "sub_img": "R:/png/dial_style3/7.png" - }, - { - "sub_img": "R:/png/dial_style3/8.png" - }, - { - "sub_img": "R:/png/dial_style3/9.png" - } - ] - }, - { - "img_type": 12, - "img_pos": { - "x": 174, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style3/0.png" - }, - { - "sub_img": "R:/png/dial_style3/1.png" - }, - { - "sub_img": "R:/png/dial_style3/2.png" - }, - { - "sub_img": "R:/png/dial_style3/3.png" - }, - { - "sub_img": "R:/png/dial_style3/4.png" - }, - { - "sub_img": "R:/png/dial_style3/5.png" - }, - { - "sub_img": "R:/png/dial_style3/6.png" - }, - { - "sub_img": "R:/png/dial_style3/7.png" - }, - { - "sub_img": "R:/png/dial_style3/8.png" - }, - { - "sub_img": "R:/png/dial_style3/9.png" - } - ] - }, - { - "img_type": 13, - "img_pos": { - "x": 246, - "y": 0 - }, - "sub_img_cnt": 10, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style3/0.png" - }, - { - "sub_img": "R:/png/dial_style3/1.png" - }, - { - "sub_img": "R:/png/dial_style3/2.png" - }, - { - "sub_img": "R:/png/dial_style3/3.png" - }, - { - "sub_img": "R:/png/dial_style3/4.png" - }, - { - "sub_img": "R:/png/dial_style3/5.png" - }, - { - "sub_img": "R:/png/dial_style3/6.png" - }, - { - "sub_img": "R:/png/dial_style3/7.png" - }, - { - "sub_img": "R:/png/dial_style3/8.png" - }, - { - "sub_img": "R:/png/dial_style3/9.png" - } - ] - }, - { - "img_type": 16, - "img_pos": { - "x": 144, - "y": 0 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style3/colon.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": 80, - "y": 60 - }, - "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": 9, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 0, - "y": 0 - }, - "font_size": 40 - }, - { - "label_type": 10, - "text": "/", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 52, - "y": 7 - }, - "font_size": 30 - }, - { - "label_type": 8, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 67, - "y": 0 - }, - "font_size": 40 - } - ], - "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": 89, - "y": 105 - }, - "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": 40 - } - ], - "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": 260, - "y": 0 - }, - "element_cnt": 1, - "act_type": 7, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 7, - "element_name": "卡路里", - "img_cnt": 2, - "img_ll": [ - { - "img_type": 70, - "img_pos": { - "x": 60, - "y": 50 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style3/calorie.png" - } - ] - }, - { - "img_type": 75, - "img_pos": { - "x": 0, - "y": 0 - }, - "sub_img_cnt": 11, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style3/calorie/0.png" - }, - { - "sub_img": "R:/png/dial_style3/calorie/1.png" - }, - { - "sub_img": "R:/png/dial_style3/calorie/2.png" - }, - { - "sub_img": "R:/png/dial_style3/calorie/3.png" - }, - { - "sub_img": "R:/png/dial_style3/calorie/4.png" - }, - { - "sub_img": "R:/png/dial_style3/calorie/5.png" - }, - { - "sub_img": "R:/png/dial_style3/calorie/6.png" - }, - { - "sub_img": "R:/png/dial_style3/calorie/7.png" - }, - { - "sub_img": "R:/png/dial_style3/calorie/8.png" - }, - { - "sub_img": "R:/png/dial_style3/calorie/9.png" - }, - { - "sub_img": "R:/png/dial_style3/calorie/10.png" - } - ] - } - ], - "label_cnt": 2, - "label_ll": [ - { - "label_type": 15, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 0, - "y": 90 - }, - "font_size": 30 - }, - { - "label_type": 16, - "text": "KCAL", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 0, - "y": 120 - }, - "font_size": 30 - } - ], - "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": 40, - "y": 300 - }, - "element_cnt": 1, - "act_type": 13, - "layer": 0, - "element_dsc_ll": [ - { - "element_type": 13, - "element_name": "心率", - "img_cnt": 2, - "img_ll": [ - { - "img_type": 130, - "img_pos": { - "x": 50, - "y": 65 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style3/heart.png" - } - ] - }, - { - "img_type": 135, - "img_pos": { - "x": 0, - "y": 0 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - - { - "sub_img": "R:/png/dial_style3/heart_image.png" - } - ] - } - ], - "label_cnt": 2, - "label_ll": [ - { - "label_type": 24, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 105, - "y": 0 - }, - "font_size": 30 - }, - { - "label_type": 25, - "text": "BPM", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 105, - "y": 30 - }, - "font_size": 30 - } - ], - "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": 260, - "y": 330 - }, - "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": 30, - "y": 0 - }, - "sub_img_cnt": 1, - "sub_img_ll": [ - { - "sub_img": "R:/png/dial_style3/step.png" - } - ] - } - ], - "label_cnt": 1, - "label_ll": [ - { - "label_type": 17, - "text": "", - "text_color": { - "r": 255, - "g": 255, - "b": 255 - }, - "text_pos": { - "x": 20, - "y": 50 - }, - "font_size": 30 - } - ], - "bar": { - "bar_type": 0, - "bar_pos": { - "x": 8, - "y": 9 - }, - "bar_color": { - "r": 77, - "g": 88, - "b": 99 - }, - "bar_w": 11, - "bar_h": 12 - } - } - ] - } - ] -} diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/heart.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/heart.png deleted file mode 100644 index 10b3d585..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/heart.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/heart_image.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/heart_image.png deleted file mode 100644 index bd409c12..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/heart_image.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/pre.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/pre.png deleted file mode 100644 index e923eb80..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/pre.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/step.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/step.png deleted file mode 100644 index 37ac9680..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dial_style3/step.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_BLOOD_PRESSURE.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_BLOOD_PRESSURE.png deleted file mode 100644 index 04691f22..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_BLOOD_PRESSURE.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_CALLLOG.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_CALLLOG.png deleted file mode 100644 index ed59c560..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_CALLLOG.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_PHONEBOOK.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_PHONEBOOK.png deleted file mode 100644 index 71421799..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_PHONEBOOK.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_SLEEP.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_SLEEP.png deleted file mode 100644 index 519359f8..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_SLEEP.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_alarm.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_alarm.png deleted file mode 100644 index 86173f9c..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_alarm.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_dialpad.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_dialpad.png deleted file mode 100644 index b55020ad..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_dialpad.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_sms.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_sms.png deleted file mode 100644 index 22eb488c..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_sms.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_sos.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_sos.png deleted file mode 100644 index e917c98b..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_sos.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_stopwatch.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_stopwatch.png deleted file mode 100644 index a1694c44..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_stopwatch.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_timer.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_timer.png deleted file mode 100644 index 2b5cce0c..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_timer.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_weather.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_weather.png deleted file mode 100644 index ca16504e..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_weather.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_wechat.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_wechat.png deleted file mode 100644 index c960dfd0..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_wechat.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_SPO2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png similarity index 100% rename from 2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_SPO2.png rename to 2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_TEMPERATURE.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png similarity index 100% rename from 2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/ICON_TEMPERATURE.png rename to 2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_heart_rate.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png similarity index 100% rename from 2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_heart_rate.png rename to 2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_settings.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_settings.png similarity index 100% rename from 2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_settings.png rename to 2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_settings.png diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_step.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_step.png similarity index 100% rename from 2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/list/icon_step.png rename to 2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/primary_function/one_page/icon_step.png diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/sleep/ICON_SLEEP_PROMPT.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/sleep/ICON_SLEEP_PROMPT.png deleted file mode 100644 index 178e5b40..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/sleep/ICON_SLEEP_PROMPT.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/stopwatch/icon_stopwatch_background.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/stopwatch/icon_stopwatch_background.png deleted file mode 100644 index ca0c503f..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/stopwatch/icon_stopwatch_background.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/stopwatch/icon_stopwatch_pause.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/stopwatch/icon_stopwatch_pause.png deleted file mode 100644 index 225dec23..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/stopwatch/icon_stopwatch_pause.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/stopwatch/icon_stopwatch_reset.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/stopwatch/icon_stopwatch_reset.png deleted file mode 100644 index 0ffb76bf..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/stopwatch/icon_stopwatch_reset.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/stopwatch/icon_stopwatch_start.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/stopwatch/icon_stopwatch_start.png deleted file mode 100644 index 6286de4e..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/stopwatch/icon_stopwatch_start.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/ICON_OVERCAST.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/ICON_OVERCAST.png deleted file mode 100644 index e704172f..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/ICON_OVERCAST.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_cloudy.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_cloudy.png deleted file mode 100644 index 8efcd37f..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_cloudy.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_fog.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_fog.png deleted file mode 100644 index 7b67a102..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_fog.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_haze.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_haze.png deleted file mode 100644 index db9ef8b1..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_haze.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_heavy_rain.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_heavy_rain.png deleted file mode 100644 index 77bedc7a..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_heavy_rain.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_heavy_snow.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_heavy_snow.png deleted file mode 100644 index 150b02ae..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_heavy_snow.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_light_rain.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_light_rain.png deleted file mode 100644 index e189c506..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_light_rain.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_light_snow.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_light_snow.png deleted file mode 100644 index 96e23307..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_light_snow.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_no_network.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_no_network.png deleted file mode 100644 index 2e99b03e..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_no_network.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_sunny.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_sunny.png deleted file mode 100644 index 56dd4bd5..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_sunny.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_weather_others.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_weather_others.png deleted file mode 100644 index 5601bb46..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/weather/icon_weather_others.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_MY_VOICE_ITEM_BG.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_MY_VOICE_ITEM_BG.png deleted file mode 100644 index 2ed1a5f0..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_MY_VOICE_ITEM_BG.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_MY_VOICE_ITEM_PLAYING1.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_MY_VOICE_ITEM_PLAYING1.png deleted file mode 100644 index 71ed9009..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_MY_VOICE_ITEM_PLAYING1.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_MY_VOICE_ITEM_PLAYING2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_MY_VOICE_ITEM_PLAYING2.png deleted file mode 100644 index 0a965122..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_MY_VOICE_ITEM_PLAYING2.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_MY_VOICE_ITEM_PLAYING3.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_MY_VOICE_ITEM_PLAYING3.png deleted file mode 100644 index 1142859d..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_MY_VOICE_ITEM_PLAYING3.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_OTHER_VOICE_ITEM_BG.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_OTHER_VOICE_ITEM_BG.png deleted file mode 100644 index 8f9b7b43..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_OTHER_VOICE_ITEM_BG.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_OTHER_VOICE_ITEM_PLAYING1.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_OTHER_VOICE_ITEM_PLAYING1.png deleted file mode 100644 index 776f2168..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_OTHER_VOICE_ITEM_PLAYING1.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_OTHER_VOICE_ITEM_PLAYING2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_OTHER_VOICE_ITEM_PLAYING2.png deleted file mode 100644 index e8361ed3..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_OTHER_VOICE_ITEM_PLAYING2.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_OTHER_VOICE_ITEM_PLAYING3.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_OTHER_VOICE_ITEM_PLAYING3.png deleted file mode 100644 index 5d6f491c..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_OTHER_VOICE_ITEM_PLAYING3.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON.png deleted file mode 100644 index ca657bcc..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON_PRESSED.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON_PRESSED.png deleted file mode 100644 index d7fb0d6d..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON_PRESSED.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_TEXT_ITEM_BG.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_TEXT_ITEM_BG.png deleted file mode 100644 index 219c1b41..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_TEXT_ITEM_BG.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_UNREAD_FLAG.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_UNREAD_FLAG.png deleted file mode 100644 index e8e89f3a..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_UNREAD_FLAG.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_VOICE_ITEM_DAMAGE.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_VOICE_ITEM_DAMAGE.png deleted file mode 100644 index 1bb84f8a..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/ICON_WECHAT_VOICE_ITEM_DAMAGE.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/icon_bkg.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/icon_bkg.png deleted file mode 100644 index ce1c1e06..00000000 Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/wechat/icon_bkg.png and /dev/null differ diff --git a/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index c4a4f044..e85378f5 100644 --- a/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -13,7 +13,7 @@ #define USE_LV_WATCH_PRIMARY_MENU 1 #define USE_LV_WATCH_STATUS_AND_SETTING 1 #define USE_LV_WATCH_QUICK_FUNCTION 0 -#define USE_LV_WATCH_WEATHER 1 +#define USE_LV_WATCH_WEATHER 0 // 1 #define USE_LV_WATCH_PEDOMETER 1 #define USE_LV_WATCH_BODYINFO 1 #define USE_LV_WATCH_RECORD 0 // 1 @@ -26,7 +26,7 @@ #define USE_LV_WATCH_SETTING_ABOUT 1 #define USE_LV_WATCH_SHUTDOWN 1 #define USE_LV_WATCH_LANGUAGE 1 -#define USE_LV_WATCH_DIAL_SWITCH 1 +#define USE_LV_WATCH_DIAL_SWITCH 0 // 1 //#define USE_LV_WATCH_DIAL_DEFAULT_CLOCK 1 //#define USE_LV_WATCH_DIAL_DOLPHIN 1 //#define USE_LV_WATCH_DIAL_ROCKET 1 @@ -44,7 +44,7 @@ #define USE_LV_WATCH_ALARM 1 #define USE_LV_WATCH_ALARM_SET 1 #define USE_LV_WATCH_POWER_OFF_CHARGING 1 -#define USE_LV_WATCH_CALCULATOR 1 +#define USE_LV_WATCH_CALCULATOR 0 // 1 #define USE_LV_WATCH_FACTORY_MODE 1 #define USE_LV_WATCH_VOICE_MSG 0 // 1 #define USE_LV_WATCH_RESTART_AND_RESET 1 @@ -64,7 +64,7 @@ #define USE_LV_WATCH_KEYPAD 1 #define USE_LV_WATCH_MOBILE_NETWORK 1 #define USE_LV_WATCH_COMPASS 0 -#define USE_LV_WATCH_TIMER 1 +#define USE_LV_WATCH_TIMER 0 // 1 #define USE_LV_WATCH_EXERCISE 0 #define USE_LV_WATCH_SLEEP 0 #define USE_LV_WATCH_ELEVATION 0 @@ -115,7 +115,7 @@ #define USE_LV_WATCH_SIMCHECK 0 -#define USE_LV_WATCH_CALL_LOG 1 +#define USE_LV_WATCH_CALL_LOG 0 // 1 #define USE_LV_WATCH_MESSAGE 0 // 1 @@ -136,7 +136,7 @@ #define USE_LV_WATCH_ALIPAY 0 #endif -#define USE_LV_WATCH_SMS_MSG 1 +#define USE_LV_WATCH_SMS_MSG 0 // 1 #define USE_LV_WATCH_UPGRADE 0 // 1 #define USE_LV_WATCH_UPGRADE_RS 0 @@ -154,27 +154,17 @@ #define __MMI_ZHSX_SUPPORT_FZD__ #define __MMI_ZHSX_SUPPORT_AUTHENTICATE__ -#define __MMI_ZHSX_SUPPORT_SMS__ +//#define __MMI_ZHSX_SUPPORT_SMS__ // project mmi #define MMI_PROJECT_Z5_HA_K18 +#define MMI_PROJECT_Z5_HA_K18_NFC -#if 0 != USE_LV_WATCH_ALIPAY -#define __MMI_ZHSX_SUPPORT_ALIPAY__ -#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_MAIN_MENU_SWITCH_MENU__ -//#define __MMI_MAIN_MENU_ONE_PAGE_STYLE__ -#define __MMI_MAIN_MENU_LIST_STYLE__ +#define __MMI_MAIN_MENU_ONE_PAGE_STYLE__ +//#define __MMI_MAIN_MENU_LIST_STYLE__ #define __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__ @@ -215,11 +205,6 @@ #define __MMI_CHIP_TEMPERATURE_MONITOR_SUPPORT__ -#define __MMI_SLEEP_FUNCTION_SUPPORT__ -//#define __MMI_CUSTOM_HENGAI_SLEEP__ -#define __MMI_CUSTOM_HENGAI_SLEEP_K18__ - -#define __MMI_CUSTOM_HENGAI_MICRO_HEALTH_CHECKUP__ #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c b/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c index fbb6aa1f..f321ddc6 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c @@ -461,7 +461,9 @@ static void launcher_long_press_handler(lv_obj_t * tabview) lv_watch_png_cache_all_free(); lv_obj_t * launcher_act_obj = lv_watch_get_activity_obj(ACT_ID_LAUNCHER); if(launcher_act_obj == lv_watch_get_top_activity_obj()) { + #if USE_LV_WATCH_DIAL_SWITCH != 0 dial_switch_create(NULL, 0); + #endif } else { printf("not create dial switch when other act(e.g. phone) create above launcher\n"); } diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c index 058357c6..8ff41d11 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c @@ -80,6 +80,22 @@ static watch_app_info_t s_main_menu_four_grid[] = // one page #ifdef __MMI_MAIN_MENU_ONE_PAGE_STYLE__ +#ifdef MMI_PROJECT_Z5_HA_K18_NFC +static mmi_page_main_menu_info_t s_main_menu_one_page[] = +{ +#ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__ + {{ ICON_HEART_RATE_ONE_PAGE, WATCH_TEXT_ID_HEART_RATE, health_heart_rate_create_event_cb}, NULL}, +#endif +#ifdef __MMI_HEALTH_MEASURE_SPO2_SUPPORT__ + {{ ICON_SPO2_ONE_PAGE, WATCH_TEXT_ID_SPO2, health_spo2_create_event_cb}, NULL}, +#endif +#ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__ + {{ ICON_TEMPERATURE_ONE_PAGE, WATCH_TEXT_ID_TEMPERATURE, health_temperature_create_event_cb}, NULL}, +#endif + {{ ICON_SETTING_ONE_PAGE, WATCH_TEXT_ID_SETTINGS, setting_create_event_cb}, NULL}, +}; + +#else //static watch_app_info_t s_main_menu_one_page[] = static mmi_page_main_menu_info_t s_main_menu_one_page[] = { @@ -123,6 +139,7 @@ static mmi_page_main_menu_info_t s_main_menu_one_page[] = #endif {{ ICON_SETTING_ONE_PAGE, WATCH_TEXT_ID_SETTINGS, setting_create_event_cb}, AUDIO_MAIN_MENU_SETTINGS}, }; +#endif #ifdef __MMI_PAGE_MAIN_MENU_TTS_SUPPORT__ diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/sos/sos.c b/2.sdk/sdk/gui/lv_watch/lv_apps/sos/sos.c index cd40e837..a92871c4 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/sos/sos.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/sos/sos.c @@ -305,6 +305,11 @@ lv_obj_t * sos_create(lv_obj_t * activity_obj) lv_res_t mmi_key_back_sos_btn_action(void) { + +#ifdef MMI_PROJECT_Z5_HA_K18_NFC + return LV_RES_INV; +#endif + if(false == watch_modem_sim_present_check_req()) { printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);