gengxin

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/call/ICON_CALL_CALLING.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/call/ICON_CALL_CALLING.png
index 2fbf579..f78c3c4 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/call/ICON_CALL_CALLING.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/call/ICON_CALL_CALLING.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/call/ICON_CALL_INCOMING.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/call/ICON_CALL_INCOMING.png
index 670638f..ff28cf9 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/call/ICON_CALL_INCOMING.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/call/ICON_CALL_INCOMING.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/call/ICON_CALL_OUTGOING.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/call/ICON_CALL_OUTGOING.png
index bcfedb2..67b1471 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/call/ICON_CALL_OUTGOING.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/call/ICON_CALL_OUTGOING.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json
index 45cc940..9b19048 100644 (file)
--- a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json
+++ b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/dial_default_ambient/am_digit.json
@@ -6,7 +6,7 @@
   "element_ll": [
     {
       "element_pos": {
-        "x": 90,
+        "x": 140,
         "y": 180
       },
       "element_cnt": 1,

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_CALLLOG.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_CALLLOG.png
index 2764d8a..ed59c56 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_CALLLOG.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_CALLLOG.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_PHONEBOOK.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_PHONEBOOK.png
index 8db945c..7142179 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_PHONEBOOK.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_PHONEBOOK.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_SPO2.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_SPO2.png
index 91bb043..b912c8e 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_SPO2.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_SPO2.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_TEMPERATURE.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_TEMPERATURE.png
index 1be3372..b32e4d5 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_TEMPERATURE.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/ICON_TEMPERATURE.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/IMAGE_MAINMENU_APP_WSTORE.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/IMAGE_MAINMENU_APP_WSTORE.png
index 62531f2..0de536f 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/IMAGE_MAINMENU_APP_WSTORE.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/IMAGE_MAINMENU_APP_WSTORE.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/IMAGE_MAINMENU_APP_WSTORE_MANAGE.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/IMAGE_MAINMENU_APP_WSTORE_MANAGE.png
index 00597a9..cc3c52b 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/IMAGE_MAINMENU_APP_WSTORE_MANAGE.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/IMAGE_MAINMENU_APP_WSTORE_MANAGE.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/IMAGE_MAINMENU_VOICE.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/IMAGE_MAINMENU_VOICE.png
index 03ee4e5..ac1edb6 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/IMAGE_MAINMENU_VOICE.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/IMAGE_MAINMENU_VOICE.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_alarm.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_alarm.png
index 15d47af..86173f9 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_alarm.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_alarm.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_album.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_album.png
index 5597342..24ceaf3 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_album.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_album.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_alipay.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_alipay.png
index 263e694..677dc92 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_alipay.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_alipay.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_camera.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_camera.png
index cc74242..1163b6b 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_camera.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_camera.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_dialpad.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_dialpad.png
index 94027a6..b55020a 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_dialpad.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_dialpad.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_heart_rate.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_heart_rate.png
index eef407f..6181513 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_heart_rate.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_heart_rate.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_settings.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_settings.png
index 3effb74..ab0adfd 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_settings.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_settings.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_sms.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_sms.png
index 430df53..22eb488 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_sms.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_sms.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_sos.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_sos.png
index 9b01873..e917c98 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_sos.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_sos.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_step.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_step.png
index ef12d9b..df265ec 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_step.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_step.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_stopwatch.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_stopwatch.png
index 1f937eb..a1694c4 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_stopwatch.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_stopwatch.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_timer.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_timer.png
index b791e61..2b5cce0 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_timer.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_timer.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_videocall.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_videocall.png
index abb79f0..1ac207c 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_videocall.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_videocall.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_weather.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_weather.png
index 811757b..ca16504 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_weather.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_weather.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_wechat.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_wechat.png
index 3a22b1e..c960dfd 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_wechat.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/list/icon_wechat.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_CALLLOG.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_CALLLOG.png
deleted file mode 100644 (file)
index 5a9ef65..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_CALLLOG.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_PHONEBOOK.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_PHONEBOOK.png
deleted file mode 100644 (file)
index c882b06..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_PHONEBOOK.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png
deleted file mode 100644 (file)
index 69e8699..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_SPO2.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png
deleted file mode 100644 (file)
index 22fc6ee..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_TEMPERATURE.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_TOOL.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_TOOL.png
deleted file mode 100644 (file)
index df78ee9..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/ICON_TOOL.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PEDOMETER.png b/2.sdk/project/Z5_HA_K18/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/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PEDOMETER.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png
deleted file mode 100644 (file)
index 320e55b..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_album.png b/2.sdk/project/Z5_HA_K18/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/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_album.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_alipay.png b/2.sdk/project/Z5_HA_K18/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/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_alipay.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_camera.png b/2.sdk/project/Z5_HA_K18/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/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_camera.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_dialpad.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_dialpad.png
deleted file mode 100644 (file)
index d62e8b5..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_dialpad.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png
deleted file mode 100644 (file)
index 75eb21f..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_heart_rate.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_settings.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_settings.png
deleted file mode 100644 (file)
index dff8d1f..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_settings.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_sms.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_sms.png
deleted file mode 100644 (file)
index 8e18962..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_sms.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_videocall.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_videocall.png
deleted file mode 100644 (file)
index b5b5547..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_videocall.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_wechat.png b/2.sdk/project/Z5_HA_K18/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/Z5_HA_K18/gui/lv_watch/resource/png/primary_function/one_page/icon_wechat.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index c792828..a76e308 100644 (file)
--- a/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -171,8 +171,8 @@
 #define __MMI_WECHAT_SUPPORT__
 #define __MMI_WECHAT_RECEIVE_AUDIO_USE_MP3__
 
-#define __MMI_MAIN_MENU_SWITCH_MENU__
-#define __MMI_MAIN_MENU_ONE_PAGE_STYLE__
+//#define __MMI_MAIN_MENU_SWITCH_MENU__
+//#define __MMI_MAIN_MENU_ONE_PAGE_STYLE__
 #define __MMI_MAIN_MENU_LIST_STYLE__
 
 #define __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__