gengxin
author@CHENG <2393524978@qq.com>
Tue, 7 May 2024 09:02:00 +0000 (17:02 +0800)
committer@CHENG <2393524978@qq.com>
Tue, 7 May 2024 09:02:00 +0000 (17:02 +0800)
165 files changed:
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/mmi_default_CUSTOM.h
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/R_WECHAT_RECV.mp3 [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/audio_wechat_receive.mid [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/audio_wechat_receive.mp3 [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALBUM.mp3 [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALIPAY.mp3 [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ATRIAL_FIBRILLATION.mp3 [new file with mode: 0644]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CALL_LOG.mp3
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CAMERA.mp3 [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_DIALPAD.mp3
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_HEART_RATE.mp3
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_PHONEBOOK.mp3
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SETTINGS.mp3
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SMS.mp3
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SOS.mp3
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SPO2.mp3
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_STEP.mp3 [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TEMPERATURE.mp3
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TOOL.mp3
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_VIDEO_CALL.mp3
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_WEATHER.mp3 [new file with mode: 0644]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_WECHAT.mp3 [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/gif/anim_sos.gif
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/album/icon_del_all_bg.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/call_log/icon_call_missed_2.png [new file with mode: 0644]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/common/ICON_COMMON_BG_BLACK.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/common/ICON_COMMON_BG_WHITE.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial/buildin_dial_list.db
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/bear_watch.json [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_bear.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_bear_nose.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_clock.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_hour.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_min.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_bear/icon_dial_bear_sec.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/default_watch.json [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_clock.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_dot.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_hour.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_min.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default/icon_dial_default_sec.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_digit_con_colon.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_default_ambient/am_none.json [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch.json [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_dial_rocket.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_rocket/rocket_watch.json [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/bg.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/dial_style1.json [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/heart.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/spo2.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/step.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/0.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/1.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/2.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/3.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/4.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/5.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/6.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/7.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/8.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/9.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/time/colon.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style1/view.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/0.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/1.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/2.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/3.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/4.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/5.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/6.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/7.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/8.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/9.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/bg.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/cloundy.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/degree.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/dial_style2.json [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/fri.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/mon.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/pre.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/rain.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/sat.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/snow.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/sun.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/sunny.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/thu.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/tue.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/wed.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style4/dial_style4.json
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_ATRIAL_FIBRILLATION.png [new file with mode: 0644]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_CALLLOG.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_PHONEBOOK.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_TOOL.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_WEATHER.png [new file with mode: 0644]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PEDOMETER.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_album.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_alipay.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_camera.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_dialpad.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_settings.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_sms.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_videocall.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/icon_wechat.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png [deleted file]
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_barcode.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_bind_fail.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_bind_timeout.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_1.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_2.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_menu_3.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/upay/upay_qrcode.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_RECORD_BUTTON_PRESSED.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_BG.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_FAILED.png
2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/wechat/ICON_WECHAT_SENDING_SUCC.png
2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_atrial_fibrillation.c [new file with mode: 0644]
2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_atrial_fibrillation.h [new file with mode: 0644]

index 2c94c6e..eef70bf 100644 (file)
@@ -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
 
 #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
 // 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 (file)
index 3d263db..0000000
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 (file)
index e68d119..0000000
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 (file)
index 2d51bb8..0000000
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 (file)
index 24c5916..0000000
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 (file)
index ad4e42f..0000000
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 (file)
index 0000000..7b6d5b6
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
index 7507c61..09e6747 100644 (file)
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 (file)
index b1e8c24..0000000
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
index 8bfff82..01570ca 100644 (file)
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
index 32a8a31..7c7234d 100644 (file)
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
index 60e4813..4e77cc4 100644 (file)
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
index 81129ab..b281337 100644 (file)
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
index 7c7f9d3..85f76dc 100644 (file)
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
index 403ce1c..7f20c31 100644 (file)
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
index 1c2b274..bf0d008 100644 (file)
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 (file)
index 07b90be..0000000
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
index 247fc25..0d1061d 100644 (file)
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
index 0bb726e..92edfda 100644 (file)
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
index c96d9c6..2865122 100644 (file)
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 (file)
index 0000000..2f2bde7
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 (file)
index 4de4c1b..0000000
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
index d7e04f6..27dbc77 100644 (file)
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
index 6867196..6202432 100644 (file)
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 (file)
index 0000000..ab80e32
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
index 3329c79..9bba95c 100644 (file)
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
index 81bc88e..e34642c 100644 (file)
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
index 1c2db89..b04df37 100644 (file)
@@ -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 (file)
index 5a4df6f..0000000
+++ /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 (file)
index 30ddb96..0000000
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 (file)
index 21253cb..0000000
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 (file)
index 20d9e1e..0000000
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 (file)
index 1cbcdf6..0000000
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 (file)
index 0ca71e4..0000000
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 (file)
index 2442fbd..0000000
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 (file)
index ea9a664..0000000
+++ /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 (file)
index 71e9742..0000000
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 (file)
index a52205a..0000000
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 (file)
index eacf44d..0000000
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 (file)
index 7dba5fd..0000000
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 (file)
index cd0c21e..0000000
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 (file)
index 9bb64f6..0000000
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 (file)
index b5b175e..0000000
+++ /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 (file)
index 9bba95c..0000000
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 (file)
index d9343b8..0000000
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 (file)
index dd9a26a..0000000
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 (file)
index 92f569d..0000000
+++ /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 (file)
index 8def041..0000000
+++ /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 (file)
index 4f4fdb8..0000000
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 (file)
index c51755b..0000000
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 (file)
index 6f71e73..0000000
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 (file)
index 8094ce7..0000000
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 (file)
index f1be80e..0000000
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 (file)
index 3b28ecf..0000000
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 (file)
index 9066c26..0000000
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 (file)
index 9feebfc..0000000
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 (file)
index 04d5f16..0000000
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 (file)
index 3f6b55b..0000000
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 (file)
index 0a0e4ef..0000000
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 (file)
index c5bfc43..0000000
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 (file)
index ff4e2cd..0000000
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 (file)
index 59a7371..0000000
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 (file)
index a691d2c..0000000
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 (file)
index 7ddfe18..0000000
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 (file)
index cc136b6..0000000
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 (file)
index 108501b..0000000
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 (file)
index e143323..0000000
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 (file)
index 6eeeebb..0000000
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 (file)
index ab65196..0000000
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 (file)
index c540767..0000000
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 (file)
index 31dfe45..0000000
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 (file)
index 50f735e..0000000
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 (file)
index e7a337c..0000000
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 (file)
index 8a3ab35..0000000
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 (file)
index 21c6d09..0000000
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 (file)
index 93ebe59..0000000
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 (file)
index dc53a5f..0000000
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 (file)
index 35d901a..0000000
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 (file)
index ccd9e55..0000000
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 (file)
index e2c69fd..0000000
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 (file)
index 4874b3b..0000000
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 (file)
index 8e8517f..0000000
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 (file)
index 7b6549f..0000000
+++ /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 (file)
index e0998e6..0000000
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 (file)
index 5ea86ef..0000000
+++ /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 (file)
index 519608b..0000000
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 (file)
index 15cb89d..0000000
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 (file)
index 385213b..0000000
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 (file)
index def8e2c..0000000
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 (file)
index 5f40517..0000000
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 (file)
index 149e760..0000000
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 (file)
index 1b66e2b..0000000
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 (file)
index 143e3c0..0000000
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 (file)
index 7cee636..0000000
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 (file)
index d18b208..0000000
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 (file)
index 3b62028..0000000
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 (file)
index 6dbd9f3..0000000
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 (file)
index e88f1b5..0000000
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 (file)
index 21eca50..0000000
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 (file)
index d4d0827..0000000
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 (file)
index b63f4d3..0000000
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 (file)
index 23ce1cb..0000000
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 (file)
index 7560613..0000000
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 (file)
index 8aa9664..0000000
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 (file)
index 86c53aa..0000000
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 (file)
index 67ee008..0000000
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 (file)
index c028667..0000000
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 (file)
index bc794b9..0000000
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 (file)
index f2580de..0000000
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 (file)
index b073782..0000000
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 (file)
index 9bba95c..0000000
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 (file)
index bc1edac..0000000
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 (file)
index 080a3fb..0000000
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 (file)
index aa30cb9..0000000
+++ /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 (file)
index e080f60..0000000
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 (file)
index 3e9729c..0000000
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 (file)
index 3f8b20c..0000000
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 (file)
index 26a5e63..0000000
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 (file)
index 1dadb7b..0000000
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 (file)
index b1b9abd..0000000
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 (file)
index 4461b24..0000000
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 (file)
index 3663868..0000000
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 (file)
index 0622367..0000000
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 (file)
index e8becc5..0000000
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 (file)
index 1cbbe77..0000000
Binary files a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/dial_style2/wed.png and /dev/null differ
index 0a62aab..25d0b17 100644 (file)
     },
          {
       "element_pos": {
-        "x": 50,
-        "y": 197
+        "x": 35,
+        "y": 154
       },
       "element_cnt": 1,
       "act_type": 4,
           "img_cnt": 0,
           "img_ll": [
           ],
-          "label_cnt": 1,
+          "label_cnt": 2,
           "label_ll": [
             {
               "label_type": 5,
                 "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": {
     },
     {
       "element_pos": {
-        "x": 50,
-        "y": 132
+        "x": 35,
+        "y": 190
       },
       "element_cnt": 1,
       "act_type": 8,
                 "b": 255
               },
               "text_pos": {
-                "x": -5,
-                "y": 30
+                "x": 33,
+                "y": 0
               },
               "font_size": 20
             }
     },
     {
       "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 (file)
index 0000000..e731a54
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
index 5a9ef65..0909ab2 100644 (file)
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
index c882b06..2891a0b 100644 (file)
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
index 320e55b..b2a93fd 100644 (file)
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
index 69e8699..e280039 100644 (file)
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
index 22fc6ee..a76c48b 100644 (file)
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
index df78ee9..856fd2c 100644 (file)
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 (file)
index 0000000..6e98684
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 (file)
index f824fe6..0000000
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 (file)
index fde14e9..0000000
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 (file)
index b69a76c..0000000
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 (file)
index 7312aab..0000000
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
index d62e8b5..1e97d94 100644 (file)
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
index 75eb21f..cedff44 100644 (file)
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
index dff8d1f..c1b6fe5 100644 (file)
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
index 8e18962..06298c8 100644 (file)
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
index b5b5547..bc471f9 100644 (file)
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 (file)
index b027308..0000000
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 (file)
index adc704b..0000000
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 (file)
index 74e8193..0000000
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 (file)
index ba173aa..0000000
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 (file)
index 9033179..0000000
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 (file)
index 58fa52b..0000000
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
index fed867e..b394dd7 100644 (file)
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
index 2e9a9be..589bc9b 100644 (file)
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
index 6842baa..c227531 100644 (file)
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
index ccc7996..d9629ec 100644 (file)
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
index 0c72b81..40c7eee 100644 (file)
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
index fa5e68a..97c3908 100644 (file)
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
index 621320e..c02a35f 100644 (file)
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
index 99df857..ddf9a9e 100644 (file)
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
index 06069af..03de46b 100644 (file)
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
index f21b48d..61a4286 100644 (file)
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
index 515ca02..ef1b1dd 100644 (file)
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
index 0ff01b2..2458276 100644 (file)
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
index aad30a6..2217967 100644 (file)
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
index bc4ae4a..6622ba4 100644 (file)
 #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
 #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__
 
 #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__
 #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__
 
 #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 (file)
index 0000000..ff3feb4
--- /dev/null
@@ -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 (file)
index 0000000..133a433
--- /dev/null
@@ -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