From: CCC <2393524978@qq.com> Date: Wed, 29 Nov 2023 08:58:45 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9bebf6aac583ccc590e9b7186b13d9afb177f2e4;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index ae9db6c0..dfbb1d47 100644 --- a/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -149,6 +149,8 @@ #define __MMI_ZHSX_SUPPORT__ +#define __MMI_ZHSX_SUPPORT_CUSTOME_DEBUG_VERSION__ + #define __MMI_ZHSX_SUPPORT_FZD__ #define __MMI_ZHSX_SUPPORT_SMS__ diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c index 9f572b0a..0e506308 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c +++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c @@ -899,6 +899,15 @@ const void * lang_text_ch[] = { "4小时", // WATCH_TEXT_ID_4_HOUR, "6小时", // WATCH_TEXT_ID_6_HOUR, "8小时", // WATCH_TEXT_ID_8_HOUR, + "活体校准", // WATCH_TEXT_ID_LIVE_CALIBRATION, + "校准数据", // WATCH_TEXT_ID_CALIBRATION_DATA, + "请将设备对空", // WATCH_TEXT_ID_LIVE_CALIBRATION_PROMPT, + "佩戴测试", // WATCH_TEXT_ID_WEAR_TEST, + "佩戴状态", // WATCH_TEXT_ID_WEAR_STATE, + "已佩戴", // WATCH_TEXT_ID_WEARING, + "未佩戴", // WATCH_TEXT_ID_NO_WEAR, + "漏光测试", // WATCH_TEXT_ID_LIGHT_LEAK_TEST, + "漏光数据", // WATCH_TEXT_ID_LIGHT_LEAK_DATA, //CHENG_MODIFY diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c index 5e0a89cf..259f419a 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c +++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c @@ -900,6 +900,15 @@ const void * lang_text_en[] = { "4 hours", // WATCH_TEXT_ID_4_HOUR, "6 hours", // WATCH_TEXT_ID_6_HOUR, "8 hours", // WATCH_TEXT_ID_8_HOUR, + "live calibration", // WATCH_TEXT_ID_LIVE_CALIBRATION, + "calibration data", // WATCH_TEXT_ID_CALIBRATION_DATA, + "align the device with the air", // WATCH_TEXT_ID_LIVE_CALIBRATION_PROMPT, + "wear test", // WATCH_TEXT_ID_WEAR_TEST, + "wear state", // WATCH_TEXT_ID_WEAR_STATE, + "wearing", // WATCH_TEXT_ID_WEARING, + "not wear", // WATCH_TEXT_ID_NO_WEAR, + "light leak", // WATCH_TEXT_ID_LIGHT_LEAK_TEST, + "light leak data", // WATCH_TEXT_ID_LIGHT_LEAK_DATA, //CHENG_MODIFY diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h index a966df8d..8df36d56 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h @@ -906,6 +906,15 @@ enum WATCH_TEXT_ID_4_HOUR, /* "4小时" "4 hours" */ WATCH_TEXT_ID_6_HOUR, /* "6小时" "6 hours" */ WATCH_TEXT_ID_8_HOUR, /* "8小时" "8 hours" */ + WATCH_TEXT_ID_LIVE_CALIBRATION, /* "活体校准" "live calibration" */ + WATCH_TEXT_ID_CALIBRATION_DATA, /* "校准数据" "calibration data" */ + WATCH_TEXT_ID_LIVE_CALIBRATION_PROMPT, /* "请将设备对空" "align the device with the air" */ + WATCH_TEXT_ID_WEAR_TEST, /* "佩戴测试" "wear test" */ + WATCH_TEXT_ID_WEAR_STATE, /* "佩戴状态" "wear state" */ + WATCH_TEXT_ID_WEARING, /* "已佩戴" "wearing" */ + WATCH_TEXT_ID_NO_WEAR, /* "未佩戴" "not wear" */ + WATCH_TEXT_ID_LIGHT_LEAK_TEST, /* "漏光测试" "light leak" */ + WATCH_TEXT_ID_LIGHT_LEAK_DATA, /* "漏光数据" "light leak data" */ //CHENG_MODIFY 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 4303700b..d5be6fd9 100644 --- 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 @@ -8,6 +8,12 @@ #ifdef __MMI_ZHSX_SUPPORT__ +// custome debug version +#ifdef __MMI_ZHSX_SUPPORT_CUSTOME_DEBUG_VERSION__ +#define WATCH_TEXT_ID_SETTINGS (WATCH_TEXT_ID_OK) +#endif + + //count need not greater than WATCH_APP_MAX_COUNT !! // four grid @@ -19,7 +25,9 @@ static watch_app_info_t s_main_menu_four_grid[] = { ICON_SMS_MSG, WATCH_TEXT_ID_SMS_MSG, sms_msg_create_event_cb}, #endif { ICON_DIALPAD, WATCH_TEXT_ID_DIALPAD, dialpad_create_event_cb }, +#ifndef __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__ { ICON_CALLLOG, WATCH_TEXT_ID_CALL_LOG, call_log_create_event_cb }, +#endif #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__ { ICON_HEART_RATE, WATCH_TEXT_ID_HEART_RATE, health_heart_rate_create_event_cb}, @@ -73,7 +81,9 @@ static watch_app_info_t s_main_menu_one_page[] = { ICON_SMS_MSG_ONE_PAGE, WATCH_TEXT_ID_SMS_MSG, sms_msg_create_event_cb}, #endif { ICON_DIALPAD_ONE_PAGE, WATCH_TEXT_ID_DIALPAD, dialpad_create_event_cb }, +#ifndef __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__ { ICON_CALLLOG_ONE_PAGE, WATCH_TEXT_ID_CALL_LOG, call_log_create_event_cb }, +#endif #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__ { ICON_HEART_RATE_ONE_PAGE, WATCH_TEXT_ID_HEART_RATE, health_heart_rate_create_event_cb}, @@ -119,7 +129,9 @@ static watch_app_info_t s_main_menu_list[] = { ICON_SMS_MSG_LIST, WATCH_TEXT_ID_SMS_MSG, sms_msg_create_event_cb}, #endif { ICON_DIALPAD_LIST, WATCH_TEXT_ID_DIALPAD, dialpad_create_event_cb }, +#ifndef __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__ { ICON_CALLLOG_LIST, WATCH_TEXT_ID_CALL_LOG, call_log_create_event_cb }, +#endif #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__ { ICON_HEART_RATE_LIST, WATCH_TEXT_ID_HEART_RATE, health_heart_rate_create_event_cb},