From: CCC <2393524978@qq.com> Date: Fri, 22 Dec 2023 02:02:51 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=cebbb0c76b268c6a3fc4fffcf751bea62a98164f;p=mirrors%2FASR3603_Z5.git gengxin --- 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 b5ecba73..0d0152e3 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 @@ -882,6 +882,11 @@ const void * lang_text_ch[] = { "大图标", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_ONE_PAGE, "小图标", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST, "工具箱", // WATCH_TEXT_ID_TOOL, + "仅响铃", // WATCH_TEXT_ID_USER_PROFILE_RING_ONLY, + "响铃+震动", // WATCH_TEXT_ID_USER_PROFILE_RING_VIB, + "仅震动", // WATCH_TEXT_ID_USER_PROFILE_VIB_ONLY, + "静音", // WATCH_TEXT_ID_USER_PROFILE_SILENT, + "当前模式无需修改音量", // WATCH_TEXT_ID_NO_VOLUME_MODIFY, "该起床了", // WATCH_TEXT_ID_WAKE_UP_PROMPT, "该睡觉了", // WATCH_TEXT_ID_SLEEP_PROMPT, "该休息了", // WATCH_TEXT_ID_REST_BEGIN_PROMPT, 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 536e08d0..26539c57 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 @@ -883,6 +883,11 @@ const void * lang_text_en[] = { "Big icon", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_ONE_PAGE, "Small icon", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST, "Tool", // WATCH_TEXT_ID_TOOL, + "Ring only", // WATCH_TEXT_ID_USER_PROFILE_RING_ONLY, + "Ring & vibrate", // WATCH_TEXT_ID_USER_PROFILE_RING_VIB, + "Vibrate only", // WATCH_TEXT_ID_USER_PROFILE_VIB_ONLY, + "Silent", // WATCH_TEXT_ID_USER_PROFILE_SILENT, + "No need change voluem in current mode", // WATCH_TEXT_ID_NO_VOLUME_MODIFY, "time to wake up", // WATCH_TEXT_ID_WAKE_UP_PROMPT, "time to sleep", // WATCH_TEXT_ID_SLEEP_PROMPT, "time to rest", // WATCH_TEXT_ID_REST_BEGIN_PROMPT, diff --git a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h index d69b9601..fa787139 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h +++ b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h @@ -56,6 +56,9 @@ extern "C" { #endif #define NV_SECTION_UI_MAIN_MENU_STYLE_LEN (sizeof(nv_watch_main_menu_style_t)) #define NV_SECTION_UI_WATCH_SETTINGS_LEN (sizeof(nv_watch_setting_ext_t)) +#ifdef __MMI_USER_PROFILE_SUPPORT__ +#define NV_SECTION_UI_WATCH_USER_PROFILE_LEN (sizeof(nv_watch_user_profile_mode_t)) +#endif #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ #define NV_SECTION_UI_SIM_UNBIND_SWITCH_LEN (sizeof(nv_watch_switch_t)) #define NV_SECTION_UI_SIM_ICCID_DATA_LEN (sizeof(nv_watch_sim_iccid_t)) @@ -188,6 +191,9 @@ typedef lv_fs_dir_t ui_dir_t; #endif #define NV_SECTION_UI_MAIN_MENU_STYLE_FILE "ui_main_menu_style.nv" #define NV_SECTION_UI_WATCH_SETTINGS_FILE "ui_watch_settings.nv" +#ifdef __MMI_USER_PROFILE_SUPPORT__ +#define NV_SECTION_UI_WATCH_USER_PROFILE_FILE "ui_watch_user_profile.nv" +#endif #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ #define NV_SECTION_UI_SIM_UNBIND_SWITCH_FILE "ui_sim_unbind_switch.nv" #define NV_SECTION_UI_SIM_ICCID_DATA_FILE "ui_sim_iccid_data.nv" diff --git a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c index 79053d0f..23eaa87f 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c +++ b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c @@ -104,6 +104,10 @@ uint32_t UI_NV_Get_Section_Len(NV_UI_SECTION_ID SectionId) return (NV_SECTION_LEN(NV_SECTION_UI_MAIN_MENU_STYLE)); case NV_SECTION_UI_WATCH_SETTINGS: return (NV_SECTION_LEN(NV_SECTION_UI_WATCH_SETTINGS)); + #ifdef __MMI_USER_PROFILE_SUPPORT__ + case NV_SECTION_UI_WATCH_USER_PROFILE: + return (NV_SECTION_LEN(NV_SECTION_UI_WATCH_USER_PROFILE)); + #endif #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ case NV_SECTION_UI_SIM_UNBIND_SWITCH: return (NV_SECTION_LEN(NV_SECTION_UI_SIM_UNBIND_SWITCH)); @@ -251,6 +255,10 @@ char * UI_NV_Get_Section_path(NV_UI_SECTION_ID SectionId) return (NV_SECTION_FILE_PATH(NV_SECTION_UI_MAIN_MENU_STYLE)); case NV_SECTION_UI_WATCH_SETTINGS: return (NV_SECTION_FILE_PATH(NV_SECTION_UI_WATCH_SETTINGS)); + #ifdef __MMI_USER_PROFILE_SUPPORT__ + case NV_SECTION_UI_WATCH_USER_PROFILE: + return (NV_SECTION_FILE_PATH(NV_SECTION_UI_WATCH_USER_PROFILE)); + #endif #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ case NV_SECTION_UI_SIM_UNBIND_SWITCH: return (NV_SECTION_FILE_PATH(NV_SECTION_UI_SIM_UNBIND_SWITCH)); @@ -356,6 +364,9 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId) nv_watch_switch_t * mmi_switch_data; nv_watch_main_menu_style_t * main_menu_style; nv_watch_setting_ext_t * watch_settings; +#ifdef __MMI_USER_PROFILE_SUPPORT__ + nv_watch_user_profile_mode_t * watch_user_profile; +#endif #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ nv_watch_sim_iccid_t * sim_iccid_data; #endif @@ -614,6 +625,14 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId) TempData = (char *)watch_settings; break; + #ifdef __MMI_USER_PROFILE_SUPPORT__ + case NV_SECTION_UI_WATCH_USER_PROFILE: + watch_user_profile = lv_mem_alloc(SectionLen); + memset(watch_user_profile, 0x0, SectionLen); + TempData = (char *)watch_user_profile; + break; + #endif + #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ case NV_SECTION_UI_SIM_UNBIND_SWITCH: mmi_switch_data = lv_mem_alloc(SectionLen); diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h b/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h index 508c9db5..2e84e268 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h @@ -230,6 +230,9 @@ enum #ifdef __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__ ACT_ID_PHONEBOOK_CALLLOG, #endif +#ifdef __MMI_USER_PROFILE_SUPPORT__ + ACT_ID_USER_PROFILE, +#endif ACT_ID_MAX, diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h b/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h index eb024d20..b48302a3 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h @@ -313,10 +313,31 @@ typedef struct #ifdef __MMI_NEW_SMS_SILENT_SUPPORT__ uint8_t new_sms_silent_switch; #endif +#ifdef __MMI_USER_PROFILE_SUPPORT__ + uint8_t user_profile_index; +#endif } __packed nv_watch_setting_ext_t; +#ifdef __MMI_USER_PROFILE_SUPPORT__ +//#ifndef __MMI_ZHSX_NO_VIBRATION_SUPPORT__ +#define NV_USER_PROFILE_MODE_MAX_NUM (2) // 0-ring only; 1-ring & vibrate; + // 2-vibrate only: no volume vaule; 3-silent: no volume vaule + +typedef struct +{ + uint8_t volume_incoming_call; + uint8_t volume_new_sms; + uint8_t volume_media; +} __packed nv_watch_user_profile_info_t; + +typedef struct +{ + nv_watch_user_profile_info_t data[NV_USER_PROFILE_MODE_MAX_NUM]; +} __packed nv_watch_user_profile_mode_t; +#endif + #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ #define NV_WATCH_SIM_ICCID_DATA_LEN (20) @@ -632,6 +653,9 @@ enum #endif NV_SECTION_UI_MAIN_MENU_STYLE, // nv_watch_main_menu_style_t NV_SECTION_UI_WATCH_SETTINGS, // nv_watch_setting_ext_t +#ifdef __MMI_USER_PROFILE_SUPPORT__ + NV_SECTION_UI_WATCH_USER_PROFILE, // nv_watch_user_profile_mode_t +#endif #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ NV_SECTION_UI_SIM_UNBIND_SWITCH, // nv_watch_switch_t NV_SECTION_UI_SIM_ICCID_DATA, // nv_watch_sim_iccid_t 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 f858d973..90e73e82 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h @@ -889,6 +889,11 @@ enum WATCH_TEXT_ID_MAIN_MENU_SWITCH_ONE_PAGE, /* "大图标" "Big icon" */ WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST, /* "小图标" "Small icon" */ WATCH_TEXT_ID_TOOL, /* "工具箱" "Tool" */ + WATCH_TEXT_ID_USER_PROFILE_RING_ONLY, /* "仅响铃" "Ring only" */ + WATCH_TEXT_ID_USER_PROFILE_RING_VIB, /* "响铃+震动" "Ring & vibrate" */ + WATCH_TEXT_ID_USER_PROFILE_VIB_ONLY, /* "仅震动" "Vibrate only" */ + WATCH_TEXT_ID_USER_PROFILE_SILENT, /* "静音" "Silent" */ + WATCH_TEXT_ID_NO_VOLUME_MODIFY, /* "当前模式无需修改音量" "No need change voluem in current mode" */ WATCH_TEXT_ID_WAKE_UP_PROMPT, /* "该起床了" "time to wake up" */ WATCH_TEXT_ID_SLEEP_PROMPT, /* "该睡觉了" "time to sleep" */ WATCH_TEXT_ID_REST_BEGIN_PROMPT, /* "该休息了" "time to rest" */