From: CCC <2393524978@qq.com> Date: Tue, 12 Sep 2023 09:05:47 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=f210475e735fa8d62b2e83fe43041706f6a7b242;p=mirrors%2FASR3603_Z5.git 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 a618729f..ffcad86b 100644 --- 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 index 557e5892..00000000 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 index 63996d8b..00000000 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 index 21f4f2ce..00000000 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 index 8ed0d49d..00000000 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 index f03fd452..00000000 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 index 1e7396c5..00000000 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 index 6c1a1699..00000000 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 index 7da9723e..00000000 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 index e442d87f..00000000 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 index c9ed4f9f..00000000 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 index bc3e7c84..00000000 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 index dda1dc46..00000000 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 index f67ce3ad..00000000 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 index 7d01948a..00000000 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 index 5d817304..00000000 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 index a1e32bcf..00000000 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 index 9039e321..00000000 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 index 1f631142..00000000 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 index f750aab8..00000000 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 index 1cea9449..00000000 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 index 00000000..c882b067 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 index 00000000..69e86996 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 index 00000000..22fc6ee6 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 index 00000000..f824fe61 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 index 00000000..320e55b2 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 index 00000000..df78ee91 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 index 00000000..fde14e97 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 index 00000000..b69a76c4 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 index 00000000..7312aab8 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 index 00000000..5a9ef650 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 index 00000000..75eb21f0 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 index 00000000..8e18962a 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 index 00000000..dff8d1f1 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 index 00000000..b5b55476 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 index 00000000..b027308b 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 e6057bb2..a14dab7b 100644 --- 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 056c1ec5..d37538dd 100644 --- 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