gengxin

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_K12/gui/lv_watch/mmi_default_CUSTOM.h
index a618729..ffcad86 100644 (file)
--- a/2.sdk/project/Z5_K12/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_K12/gui/lv_watch/mmi_default_CUSTOM.h
@@ -21,7 +21,7 @@
 
 
 //
-#define MMI_CUSTOMER_HEARTBEAT_ACTION_INTERVAL         (5 * 60) // unit:s
+#define MMI_CUSTOMER_HEARTBEAT_ACTION_INTERVAL         (7 * 60) // (5 * 60) // unit:s
 
 #define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL          (30 * 60) // unit:s
 
@@ -41,19 +41,19 @@
 //health measure timed
 #define MMI_CUSTOMER_HEART_TIMED_FLAG          false
 
-#define MMI_CUSTOMER_HEART_TIMED_INTERVAL              (20 * 60) // unit:s
+#define MMI_CUSTOMER_HEART_TIMED_INTERVAL              (60 * 60) // unit:s
 
 #define MMI_CUSTOMER_TEMPERATURE_TIMED_FLAG            false
 
-#define MMI_CUSTOMER_TEMPERATURE_TIMED_INTERVAL                (20 * 60) // unit:s
+#define MMI_CUSTOMER_TEMPERATURE_TIMED_INTERVAL                (60 * 60) // unit:s
 
 #define MMI_CUSTOMER_BLOOD_TIMED_FLAG          false
 
-#define MMI_CUSTOMER_BLOOD_TIMED_INTERVAL              (20 * 60) // unit:s
+#define MMI_CUSTOMER_BLOOD_TIMED_INTERVAL              (60 * 60) // unit:s
 
 #define MMI_CUSTOMER_SPO2_TIMED_FLAG           false
 
-#define MMI_CUSTOMER_SPO2_TIMED_INTERVAL               (20 * 60) // unit:s
+#define MMI_CUSTOMER_SPO2_TIMED_INTERVAL               (60 * 60) // unit:s
 
 
 //default language
@@ -80,6 +80,10 @@
 #define MMI_CUSTOMER_DIAL_PAD_SWITCH           (1)
 
 
+//main menu style
+#define MMI_CUSTOMER_MAIN_MENU_STYLE           (MMI_MAIN_MENU_STYLE_ONE_PAGE)
+
+
 
 #endif
 

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

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

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

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

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

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_album.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_album.png
deleted file mode 100644 (file)
index 1e7396c..0000000
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_album.png and /dev/null differ

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_alipay.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_alipay.png
deleted file mode 100644 (file)
index 6c1a169..0000000
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_alipay.png and /dev/null differ

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_calculator.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_calculator.png
deleted file mode 100644 (file)
index 7da9723..0000000
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_calculator.png and /dev/null differ

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

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

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

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

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

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_message.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_message.png
deleted file mode 100644 (file)
index 7d01948..0000000
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_message.png and /dev/null differ

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

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

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_stopwatch.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_stopwatch.png
deleted file mode 100644 (file)
index 9039e32..0000000
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_stopwatch.png and /dev/null differ

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_timer.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_timer.png
deleted file mode 100644 (file)
index 1f63114..0000000
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_timer.png and /dev/null differ

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

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_wechat.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_wechat.png
deleted file mode 100644 (file)
index 1cea944..0000000
Binary files a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/icon_wechat.png and /dev/null differ

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

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

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

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PEDOMETER.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PEDOMETER.png
new file mode 100644 (file)
index 0000000..f824fe6
Binary files /dev/null and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PEDOMETER.png differ

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

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

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/icon_album.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/icon_album.png
new file mode 100644 (file)
index 0000000..fde14e9
Binary files /dev/null and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/icon_album.png differ

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/icon_alipay.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/icon_alipay.png
new file mode 100644 (file)
index 0000000..b69a76c
Binary files /dev/null and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/icon_alipay.png differ

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/icon_camera.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/icon_camera.png
new file mode 100644 (file)
index 0000000..7312aab
Binary files /dev/null and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/icon_camera.png differ

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

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

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

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

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

diff --git a/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/icon_wechat.png b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/icon_wechat.png
new file mode 100644 (file)
index 0000000..b027308
Binary files /dev/null and b/2.sdk/project/Z5_K12/gui/lv_watch/resource/png/primary_function/one_page/icon_wechat.png differ

diff --git a/2.sdk/project/Z5_K12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_K12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index e6057bb..a14dab7 100644 (file)
--- a/2.sdk/project/Z5_K12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_K12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -162,6 +162,8 @@
 
 #define __MMI_WECHAT_SUPPORT__
 
+#define __MMI_ZHSX_SUPPORT_MAIN_MENU_ONE_PAGE__
+
 #define __MMI_HEALTH_MEASURE_HEART_SUPPORT__
 
 #define __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
@@ -172,7 +174,7 @@
 
 #define __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
 
-#define __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
+//#define __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
 
 #define __MMI_ZHSX_SUPPORT_PHONEBOOK_LIST_STYLE__
 

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h
index 056c1ec..d37538d 100644 (file)
--- a/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h
@@ -80,6 +80,10 @@
 #define MMI_CUSTOMER_DIAL_PAD_SWITCH           (1)
 
 
+//main menu style
+#define MMI_CUSTOMER_MAIN_MENU_STYLE           (MMI_MAIN_MENU_STYLE_FOUR_GRID)
+
+
 
 #endif