From: CCC <2393524978@qq.com>
Date: Thu, 7 Dec 2023 09:01:55 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=928994dbc4a0e5ce9fb167cb29b4120655213ff7;p=mirrors%2FASR3603_Z5.git

gengxin
---

diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_SEDENTARY.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_SEDENTARY.mp3
new file mode 100644
index 00000000..059b18a9
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_SEDENTARY.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALBUM.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALBUM.mp3
new file mode 100644
index 00000000..24c59164
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALBUM.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALIPAY.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALIPAY.mp3
new file mode 100644
index 00000000..ad4e42f5
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_ALIPAY.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CALL_LOG.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CALL_LOG.mp3
new file mode 100644
index 00000000..7507c61c
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CALL_LOG.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CAMERA.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CAMERA.mp3
new file mode 100644
index 00000000..b1e8c242
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_CAMERA.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_DIALPAD.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_DIALPAD.mp3
new file mode 100644
index 00000000..8bfff82f
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_DIALPAD.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_HEART_RATE.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_HEART_RATE.mp3
new file mode 100644
index 00000000..32a8a313
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_HEART_RATE.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_PHONEBOOK.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_PHONEBOOK.mp3
new file mode 100644
index 00000000..60e48132
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_PHONEBOOK.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SETTINGS.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SETTINGS.mp3
new file mode 100644
index 00000000..81129abc
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SETTINGS.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SMS.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SMS.mp3
new file mode 100644
index 00000000..7c7f9d3b
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SMS.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SOS.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SOS.mp3
new file mode 100644
index 00000000..403ce1cd
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SOS.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SPO2.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SPO2.mp3
new file mode 100644
index 00000000..1c2b274e
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_SPO2.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_STEP.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_STEP.mp3
new file mode 100644
index 00000000..07b90be6
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_STEP.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TEMPERATURE.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TEMPERATURE.mp3
new file mode 100644
index 00000000..247fc25d
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TEMPERATURE.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TOOL.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TOOL.mp3
new file mode 100644
index 00000000..0bb726e7
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_TOOL.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_VIDEO_CALL.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_VIDEO_CALL.mp3
new file mode 100644
index 00000000..c96d9c63
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_VIDEO_CALL.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_WECHAT.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_WECHAT.mp3
new file mode 100644
index 00000000..4de4c1b3
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/main_menu/AUDIO_MAIN_MENU_WECHAT.mp3 differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SEDENTARY_REMIND_IMAGE.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SEDENTARY_REMIND_IMAGE.png
new file mode 100644
index 00000000..ed023528
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SEDENTARY_REMIND_IMAGE.png differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SEDENTARY_REMIND_SET_BG.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SEDENTARY_REMIND_SET_BG.png
new file mode 100644
index 00000000..b1c15cc8
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SEDENTARY_REMIND_SET_BG.png differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SEDENTARY_REMIND_SET_LEFT.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SEDENTARY_REMIND_SET_LEFT.png
new file mode 100644
index 00000000..ddbe55e2
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SEDENTARY_REMIND_SET_LEFT.png differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SEDENTARY_REMIND_SET_RIGHT.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SEDENTARY_REMIND_SET_RIGHT.png
new file mode 100644
index 00000000..d3cf4a66
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SEDENTARY_REMIND_SET_RIGHT.png differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SETTING_PAGE_MAIN_MENU_TTS.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SETTING_PAGE_MAIN_MENU_TTS.png
new file mode 100644
index 00000000..43acb4a4
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SETTING_PAGE_MAIN_MENU_TTS.png differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SETTING_SEDENTARY_REMIND.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SETTING_SEDENTARY_REMIND.png
new file mode 100644
index 00000000..86c571e9
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SETTING_SEDENTARY_REMIND.png differ
diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 0ec8d4d7..fe529aef 100644
--- a/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -131,7 +131,7 @@
 #endif
 
 #ifdef USE_OEM_ZFB
-#define USE_LV_WATCH_ALIPAY 0 // 1
+#define USE_LV_WATCH_ALIPAY 1
 #else
 #define USE_LV_WATCH_ALIPAY 0
 #endif
@@ -184,6 +184,7 @@
 #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__
 
@@ -200,6 +201,9 @@
 
 #define __MMI_KEY_BACK_RUN_PHONEBOOK_WHEN_IN_DIAL__
 
+//#define __MMI_SEDENTARY_REMIND_SUPPORT__
+
+//#define __MMI_PAGE_MAIN_MENU_TTS_SUPPORT__
 
 
 #endif