From: CCC <2393524978@qq.com>
Date: Sat, 23 Dec 2023 03:01:21 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=747303ff42bcbfefe928a5e7f5d83f391f69d691;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 0d0152e3..0a893fe7 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,11 +882,16 @@ 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_MODE,
     "仅响铃", // 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_NO_VOLUME_MODIFY,
+    "来电音量", // WATCH_TEXT_ID_INCOMING_CALL_VOLUME,
+    "短信音量", // WATCH_TEXT_ID_NEW_SMS_VOLUME,
+    "闹钟音量", // WATCH_TEXT_ID_ALARM_VOLUME,
+    "提醒音量", // WATCH_TEXT_ID_REMIND_VOLUME,
     "该起床了", // 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 26539c57..5f45bf60 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,11 +883,16 @@ 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,
+    "User profile", // WATCH_TEXT_ID_USER_PROFILE_MODE,
     "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,
+    "Not support change voluem in current mode", // WATCH_TEXT_ID_NO_VOLUME_MODIFY,
+    "Incoming call volume", // WATCH_TEXT_ID_INCOMING_CALL_VOLUME,
+    "New sms volume", // WATCH_TEXT_ID_NEW_SMS_VOLUME,
+    "Alarm volume", // WATCH_TEXT_ID_ALARM_VOLUME,
+    "Remind volume", // WATCH_TEXT_ID_REMIND_VOLUME,
     "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_api.c b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c
index 23eaa87f..8688953a 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
@@ -629,6 +629,7 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId)
 		case NV_SECTION_UI_WATCH_USER_PROFILE:
 			watch_user_profile = lv_mem_alloc(SectionLen);
 			memset(watch_user_profile, 0x0, SectionLen);
+			mmi_watch_user_profile_nv_default(watch_user_profile);
 			TempData = (char *)watch_user_profile;
 			break;
 	#endif
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 b48302a3..6b431743 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
@@ -321,15 +321,15 @@ typedef struct
 
 
 #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
+#define NV_USER_PROFILE_MODE_MAX_NUM    (4) // 0-ring only; 1-ring & vibrate; 2-vibrate only; 3-silent
 
 typedef struct
 {
 	uint8_t volume_incoming_call;
 	uint8_t volume_new_sms;
-	uint8_t volume_media;
+	uint8_t volume_alarm;
+	uint8_t volume_remind;
+	//uint8_t volume_media;
 } __packed nv_watch_user_profile_info_t;
 
 typedef struct
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 90e73e82..edaa2213 100644
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -889,11 +889,16 @@ 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_MODE,                    /* "情景模式"                    "User profile" */
     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_NO_VOLUME_MODIFY,                     /* "当前模式不支持修改音量"                    "Not support change voluem in current mode" */
+    WATCH_TEXT_ID_INCOMING_CALL_VOLUME,                 /* "来电音量"                    "Incoming call volume" */
+    WATCH_TEXT_ID_NEW_SMS_VOLUME,                       /* "短信音量"                    "New sms volume" */
+    WATCH_TEXT_ID_ALARM_VOLUME,                         /* "闹钟音量"                    "Alarm volume" */
+    WATCH_TEXT_ID_REMIND_VOLUME,                        /* "提醒音量"                    "Remind volume" */
     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" */
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_user_profile/mmi_user_profile.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_user_profile/mmi_user_profile.c
index 0ece6122..863eef84 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_user_profile/mmi_user_profile.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_user_profile/mmi_user_profile.c
@@ -14,25 +14,25 @@ void mmi_watch_user_profile_nv_default(nv_watch_user_profile_mode_t * watch_user
 	watch_user_profile->data[0].volume_incoming_call = MMI_USER_PROFILE_INDEX_0_VOLUME_INCOMING_CALL_DEFAULT;
 	watch_user_profile->data[0].volume_new_sms = MMI_USER_PROFILE_INDEX_0_VOLUME_NEW_SMS_DEFAULT;
 	watch_user_profile->data[0].volume_alarm= MMI_USER_PROFILE_INDEX_0_VOLUME_ALARM_DEFAULT;
-	watch_user_profile->data[0].volume_media = MMI_USER_PROFILE_INDEX_0_VOLUME_MEDIA_DEFAULT;
+	watch_user_profile->data[0].volume_remind = MMI_USER_PROFILE_INDEX_0_VOLUME_REMIND_DEFAULT;
 
 	// MMI_USER_PROFILE_MODE_RING_VIB
 	watch_user_profile->data[1].volume_incoming_call = MMI_USER_PROFILE_INDEX_1_VOLUME_INCOMING_CALL_DEFAULT;
 	watch_user_profile->data[1].volume_new_sms = MMI_USER_PROFILE_INDEX_1_VOLUME_NEW_SMS_DEFAULT;
 	watch_user_profile->data[1].volume_alarm= MMI_USER_PROFILE_INDEX_1_VOLUME_ALARM_DEFAULT;
-	watch_user_profile->data[1].volume_media = MMI_USER_PROFILE_INDEX_1_VOLUME_MEDIA_DEFAULT;
+	watch_user_profile->data[1].volume_remind = MMI_USER_PROFILE_INDEX_1_VOLUME_REMIND_DEFAULT;
 
 	// MMI_USER_PROFILE_MODE_VIB_ONLY
 	watch_user_profile->data[2].volume_incoming_call = MMI_USER_PROFILE_INDEX_2_VOLUME_INCOMING_CALL_DEFAULT;
 	watch_user_profile->data[2].volume_new_sms = MMI_USER_PROFILE_INDEX_2_VOLUME_NEW_SMS_DEFAULT;
 	watch_user_profile->data[2].volume_alarm= MMI_USER_PROFILE_INDEX_2_VOLUME_ALARM_DEFAULT;
-	watch_user_profile->data[2].volume_media = MMI_USER_PROFILE_INDEX_2_VOLUME_MEDIA_DEFAULT;
+	watch_user_profile->data[2].volume_remind = MMI_USER_PROFILE_INDEX_2_VOLUME_REMIND_DEFAULT;
 
 	// MMI_USER_PROFILE_MODE_SILENT
 	watch_user_profile->data[3].volume_incoming_call = MMI_USER_PROFILE_INDEX_3_VOLUME_INCOMING_CALL_DEFAULT;
 	watch_user_profile->data[3].volume_new_sms = MMI_USER_PROFILE_INDEX_3_VOLUME_NEW_SMS_DEFAULT;
 	watch_user_profile->data[3].volume_alarm= MMI_USER_PROFILE_INDEX_3_VOLUME_ALARM_DEFAULT;
-	watch_user_profile->data[3].volume_media = MMI_USER_PROFILE_INDEX_3_VOLUME_MEDIA_DEFAULT;
+	watch_user_profile->data[3].volume_remind = MMI_USER_PROFILE_INDEX_3_VOLUME_REMIND_DEFAULT;
 }
 
 void mmi_watch_user_profile_nv_read(void)
@@ -109,20 +109,20 @@ void mmi_user_profile_current_mode_alarm_volume_set(uint8_t volume)
 	}
 }
 
-uint8_t mmi_user_profile_current_mode_media_volume_get(void)
+uint8_t mmi_user_profile_current_mode_remind_volume_get(void)
 {
 	uint8_t mode_index = mmi_user_profile_index_get();
 
-	return (s_watch_user_profile.data[mode_index].volume_media);
+	return (s_watch_user_profile.data[mode_index].volume_remind);
 }
 
-void mmi_user_profile_current_mode_media_volume_set(uint8_t volume)
+void mmi_user_profile_current_mode_remind_volume_set(uint8_t volume)
 {
 	MMI_USER_PROFILE_MODE_E mode_index = (MMI_USER_PROFILE_MODE_E)mmi_user_profile_index_get();
 
 	if(MMI_USER_PROFILE_MODE_RING_ONLY == mode_index || MMI_USER_PROFILE_MODE_RING_VIB == mode_index)
 	{
-		s_watch_user_profile.data[mode_index].volume_media = volume;
+		s_watch_user_profile.data[mode_index].volume_remind = volume;
 		mmi_watch_user_profile_nv_write();
 	}
 }
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_user_profile/mmi_user_profile.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_user_profile/mmi_user_profile.h
index 9d9d2a04..76473021 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_user_profile/mmi_user_profile.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_user_profile/mmi_user_profile.h
@@ -61,8 +61,8 @@ uint8_t mmi_user_profile_current_mode_new_sms_volume_get(void);
 void mmi_user_profile_current_mode_new_sms_volume_set(uint8_t volume);
 uint8_t mmi_user_profile_current_mode_alarm_volume_get(void);
 void mmi_user_profile_current_mode_alarm_volume_set(uint8_t volume);
-uint8_t mmi_user_profile_current_mode_media_volume_get(void);
-void mmi_user_profile_current_mode_media_volume_set(uint8_t volume);
+uint8_t mmi_user_profile_current_mode_remind_volume_get(void);
+void mmi_user_profile_current_mode_remind_volume_set(uint8_t volume);
 
 bool mmi_user_profile_is_ring_only_mode(void);
 bool mmi_user_profile_is_ring_vib_mode(void);
diff --git a/2.sdk/sdk/gui/lv_watch/mmi_default.h b/2.sdk/sdk/gui/lv_watch/mmi_default.h
index d36fa4ff..03c44d33 100644
--- a/2.sdk/sdk/gui/lv_watch/mmi_default.h
+++ b/2.sdk/sdk/gui/lv_watch/mmi_default.h
@@ -271,6 +271,102 @@ extern "C"
 #endif
 
 
+// user profile
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX
+#define MMI_USER_PROFILE_INDEX_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX
+#else
+#define MMI_USER_PROFILE_INDEX_DEFAULT		(0) // 0-ring only; 1-ring & vibrate; 2-vibrate only; 3-silent
+#endif
+
+// MMI_USER_PROFILE_MODE_RING_ONLY
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_0_VOLUME_INCOMING_CALL
+#define MMI_USER_PROFILE_INDEX_0_VOLUME_INCOMING_CALL_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_0_VOLUME_INCOMING_CALL
+#else
+#define MMI_USER_PROFILE_INDEX_0_VOLUME_INCOMING_CALL_DEFAULT		(8) // 0-10
+#endif
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_0_VOLUME_NEW_SMS
+#define MMI_USER_PROFILE_INDEX_0_VOLUME_NEW_SMS_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_0_VOLUME_NEW_SMS
+#else
+#define MMI_USER_PROFILE_INDEX_0_VOLUME_NEW_SMS_DEFAULT		(8) // 0-10
+#endif
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_0_VOLUME_ALARM
+#define MMI_USER_PROFILE_INDEX_0_VOLUME_ALARM_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_0_VOLUME_ALARM
+#else
+#define MMI_USER_PROFILE_INDEX_0_VOLUME_ALARM_DEFAULT		(8) // 0-10
+#endif
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_0_VOLUME_REMIND
+#define MMI_USER_PROFILE_INDEX_0_VOLUME_REMIND_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_0_VOLUME_REMIND
+#else
+#define MMI_USER_PROFILE_INDEX_0_VOLUME_REMIND_DEFAULT		(8) // 0-10
+#endif
+
+// MMI_USER_PROFILE_MODE_RING_VIB
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_1_VOLUME_INCOMING_CALL
+#define MMI_USER_PROFILE_INDEX_1_VOLUME_INCOMING_CALL_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_1_VOLUME_INCOMING_CALL
+#else
+#define MMI_USER_PROFILE_INDEX_1_VOLUME_INCOMING_CALL_DEFAULT		(10) // 0-10
+#endif
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_1_VOLUME_NEW_SMS
+#define MMI_USER_PROFILE_INDEX_1_VOLUME_NEW_SMS_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_1_VOLUME_NEW_SMS
+#else
+#define MMI_USER_PROFILE_INDEX_1_VOLUME_NEW_SMS_DEFAULT		(10) // 0-10
+#endif
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_1_VOLUME_ALARM
+#define MMI_USER_PROFILE_INDEX_1_VOLUME_ALARM_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_1_VOLUME_ALARM
+#else
+#define MMI_USER_PROFILE_INDEX_1_VOLUME_ALARM_DEFAULT		(10) // 0-10
+#endif
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_1_VOLUME_REMIND
+#define MMI_USER_PROFILE_INDEX_1_VOLUME_REMIND_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_1_VOLUME_REMIND
+#else
+#define MMI_USER_PROFILE_INDEX_1_VOLUME_REMIND_DEFAULT		(10) // 0-10
+#endif
+
+// MMI_USER_PROFILE_MODE_VIB_ONLY
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_2_VOLUME_INCOMING_CALL
+#define MMI_USER_PROFILE_INDEX_2_VOLUME_INCOMING_CALL_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_2_VOLUME_INCOMING_CALL
+#else
+#define MMI_USER_PROFILE_INDEX_2_VOLUME_INCOMING_CALL_DEFAULT		(0) // 0-10
+#endif
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_2_VOLUME_NEW_SMS
+#define MMI_USER_PROFILE_INDEX_2_VOLUME_NEW_SMS_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_2_VOLUME_NEW_SMS
+#else
+#define MMI_USER_PROFILE_INDEX_2_VOLUME_NEW_SMS_DEFAULT		(0) // 0-10
+#endif
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_2_VOLUME_ALARM
+#define MMI_USER_PROFILE_INDEX_2_VOLUME_ALARM_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_2_VOLUME_ALARM
+#else
+#define MMI_USER_PROFILE_INDEX_2_VOLUME_ALARM_DEFAULT		(0) // 0-10
+#endif
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_2_VOLUME_REMIND
+#define MMI_USER_PROFILE_INDEX_2_VOLUME_REMIND_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_2_VOLUME_REMIND
+#else
+#define MMI_USER_PROFILE_INDEX_2_VOLUME_REMIND_DEFAULT		(0) // 0-10
+#endif
+
+// MMI_USER_PROFILE_MODE_SILENT
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_3_VOLUME_INCOMING_CALL
+#define MMI_USER_PROFILE_INDEX_3_VOLUME_INCOMING_CALL_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_3_VOLUME_INCOMING_CALL
+#else
+#define MMI_USER_PROFILE_INDEX_3_VOLUME_INCOMING_CALL_DEFAULT		(0) // 0-10
+#endif
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_3_VOLUME_NEW_SMS
+#define MMI_USER_PROFILE_INDEX_3_VOLUME_NEW_SMS_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_3_VOLUME_NEW_SMS
+#else
+#define MMI_USER_PROFILE_INDEX_3_VOLUME_NEW_SMS_DEFAULT		(0) // 0-10
+#endif
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_3_VOLUME_ALARM
+#define MMI_USER_PROFILE_INDEX_3_VOLUME_ALARM_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_3_VOLUME_ALARM
+#else
+#define MMI_USER_PROFILE_INDEX_3_VOLUME_ALARM_DEFAULT		(0) // 0-10
+#endif
+#ifdef MMI_CUSTOMER_USER_PROFILE_INDEX_3_VOLUME_REMIND
+#define MMI_USER_PROFILE_INDEX_3_VOLUME_REMIND_DEFAULT		MMI_CUSTOMER_USER_PROFILE_INDEX_3_VOLUME_REMIND
+#else
+#define MMI_USER_PROFILE_INDEX_3_VOLUME_REMIND_DEFAULT		(0) // 0-10
+#endif
+
+