From: @CHENG <2393524978@qq.com>
Date: Sat, 6 Jan 2024 06:33:27 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=a4e751fd696d19aab5bbac8caced9111d1cdd72c;p=mirrors%2FASR3603_Z5.git

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 2fbf579c..f78c3c42 100644
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 670638f9..ff28cf99 100644
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 bcfedb2c..67b1471f 100644
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 45cc940c..9b190483 100644
--- 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 2764d8a1..ed59c560 100644
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 8db945c2..71421799 100644
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 91bb0431..b912c8ef 100644
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 1be33728..b32e4d58 100644
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 62531f20..0de536f4 100644
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 00597a97..cc3c52bc 100644
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 03ee4e55..ac1edb68 100644
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 15d47af8..86173f9c 100644
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 5597342f..24ceaf38 100644
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 263e6941..677dc92f 100644
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 cc74242f..1163b6b8 100644
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 94027a6d..b55020ad 100644
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 eef407fd..61815136 100644
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 3effb742..ab0adfd8 100644
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 430df530..22eb488c 100644
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 9b01873c..e917c98b 100644
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 ef12d9b2..df265ecd 100644
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 1f937eb6..a1694c44 100644
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 b791e61d..2b5cce0c 100644
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 abb79f06..1ac207c0 100644
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 811757b0..ca16504e 100644
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 3a22b1ee..c960dfd0 100644
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
index 5a9ef650..00000000
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
index c882b067..00000000
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
index 69e86996..00000000
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
index 22fc6ee6..00000000
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
index df78ee91..00000000
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
index f824fe61..00000000
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
index 320e55b2..00000000
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
index fde14e97..00000000
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
index b69a76c4..00000000
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
index 7312aab8..00000000
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
index d62e8b53..00000000
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
index 75eb21f0..00000000
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
index dff8d1f1..00000000
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
index 8e18962a..00000000
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
index b5b55476..00000000
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
index b027308b..00000000
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 c7928287..a76e3085 100644
--- 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__