gengxin

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_HA_K18/gui/lv_watch/mmi_default_CUSTOM.h
index 3dd91c1..0cf5fdb 100644 (file)
--- a/2.sdk/project/Z5_HA_K18/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K18/gui/lv_watch/mmi_default_CUSTOM.h
@@ -38,19 +38,19 @@
 
 
 //health measure timed
-#define MMI_CUSTOMER_HEART_TIMED_FLAG          true
+#define MMI_CUSTOMER_HEART_TIMED_FLAG          false
 
 #define MMI_CUSTOMER_HEART_TIMED_INTERVAL              (10 * 60) // unit:s
 
-#define MMI_CUSTOMER_TEMPERATURE_TIMED_FLAG            true
+#define MMI_CUSTOMER_TEMPERATURE_TIMED_FLAG            false
 
 #define MMI_CUSTOMER_TEMPERATURE_TIMED_INTERVAL                (60 * 60) // unit:s
 
-#define MMI_CUSTOMER_BLOOD_TIMED_FLAG          true
+#define MMI_CUSTOMER_BLOOD_TIMED_FLAG          false
 
 #define MMI_CUSTOMER_BLOOD_TIMED_INTERVAL              (60 * 60) // unit:s
 
-#define MMI_CUSTOMER_SPO2_TIMED_FLAG           true
+#define MMI_CUSTOMER_SPO2_TIMED_FLAG           false
 
 #define MMI_CUSTOMER_SPO2_TIMED_INTERVAL               (60 * 60) // unit:s
 

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/audio/AUDIO_REMIND_SLEEP.mp3 b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/audio/AUDIO_REMIND_SLEEP.mp3
new file mode 100644 (file)
index 0000000..120958c
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/audio/AUDIO_REMIND_SLEEP.mp3 differ

diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.h b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.h
index 2ed07af..f9352a3 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.h
+++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.h
@@ -16,7 +16,7 @@ extern "C" {
 #if 1 // def __MMI_ZHSX_SUPPORT__
 
 
-//#define __MMI_TIMING_DEBUG__
+#define __MMI_TIMING_DEBUG__
 #ifdef __MMI_TIMING_DEBUG__
 #define TIMING_DEBUG_PRINTF(fmt, ...)  printf("[TIMING]"fmt, ##__VA_ARGS__)
 #else

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c
index 330c979..45eba48 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c
@@ -86,7 +86,7 @@ static mmi_page_main_menu_info_t s_main_menu_one_page[] =
        {{ ICON_CALLLOG_ONE_PAGE, WATCH_TEXT_ID_CALL_LOG, call_log_create_event_cb}, AUDIO_MAIN_MENU_CALL_LOG},
 #endif
 #ifdef MMI_PROJECT_Z5_DS_Z12_COMMON
-       {{ ICON_SOS_ONE_PAGE, WATCH_TEXT_ID_SOS, sos_create_event_cb}, AUDIO_MAIN_MENU_CALL_LOG},
+       {{ ICON_SOS_ONE_PAGE, WATCH_TEXT_ID_SOS, sos_create_event_cb}, AUDIO_MAIN_MENU_SOS},
 #endif
 #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
        {{ ICON_HEART_RATE_ONE_PAGE, WATCH_TEXT_ID_HEART_RATE, health_heart_rate_create_event_cb}, AUDIO_MAIN_MENU_HEART_RATE},

diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
index 711bf8e..5c94fae 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
@@ -44,7 +44,7 @@ extern "C" {
 #ifdef __MMI_REMIND_WAKE_UP_SUPPORT__
 #define AUDIO_REMIND_WAKE_UP                 "R:/audio/AUDIO_REMIND_WAKE_UP.mp3"
 #endif
-#if defined(__MMI_REMIND_SLEEP_SUPPORT__) || defined(__MMI_CUSTOM_HENG_AI__)
+#if defined(__MMI_REMIND_SLEEP_SUPPORT__) || defined(__MMI_CUSTOM_HENGAI_SLEEP__)
 #define AUDIO_REMIND_SLEEP                   "R:/audio/AUDIO_REMIND_SLEEP.mp3"
 #endif
 #ifdef __MMI_REMIND_REST_SUPPORT__
@@ -76,6 +76,9 @@ extern "C" {
 #ifndef __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__
 #define AUDIO_MAIN_MENU_CALL_LOG                   "R:/audio/main_menu/AUDIO_MAIN_MENU_CALL_LOG.mp3"
 #endif
+#ifdef MMI_PROJECT_Z5_DS_Z12_COMMON
+#define AUDIO_MAIN_MENU_SOS                   "R:/audio/main_menu/AUDIO_MAIN_MENU_SOS.mp3"
+#endif
 #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
 #define AUDIO_MAIN_MENU_HEART_RATE                   "R:/audio/main_menu/AUDIO_MAIN_MENU_HEART_RATE.mp3"
 #endif
@@ -110,6 +113,7 @@ extern "C" {
 #define AUDIO_MAIN_MENU_SMS                    NULL
 #define AUDIO_MAIN_MENU_DIALPAD                NULL
 #define AUDIO_MAIN_MENU_CALL_LOG       NULL
+#define AUDIO_MAIN_MENU_SOS                    NULL
 #define AUDIO_MAIN_MENU_HEART_RATE     NULL
 #define AUDIO_MAIN_MENU_SPO2           NULL
 #define AUDIO_MAIN_MENU_TEMPERATURE    NULL