From: CCC <2393524978@qq.com>
Date: Wed, 31 May 2023 01:16:53 +0000 (+0800)
Subject: xiugai
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=6d77186e07260ab149ca91054fb095f2e6ccb9c2;p=mirrors%2FASR3603_Z5.git

xiugai
---

diff --git a/2.sdk/CC_0526.doc b/2.sdk/CC_0526.doc
new file mode 100644
index 00000000..5777d673
Binary files /dev/null and b/2.sdk/CC_0526.doc differ
diff --git a/2.sdk/CC_0526.txt b/2.sdk/CC_0526.txt
deleted file mode 100644
index 34f5a0c7..00000000
--- a/2.sdk/CC_0526.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################
-防走丢协议
-gui\lv_watch\mmi_protocol\mmi_protocol_fzd.c  mmi_protocol_fzd.h
-
-新增协议
-1.在 MMI_PROTOCOL_FZD_ACTION_ENUM 中添加 KEY_VALUE
-2.static unsigned char * mmi_protocol_fzd_action_string_get(MMI_PROTOCOL_FZD_ACTION_ENUM action) 中添加 KEY_STR 
-（KEY_STR 关键信息，对照协议文档查找）
-3.static bool mmi_protocol_fzd_content_parse(unsigned char * content_ptr, unsigned int content_length) 中
-添加对应KEY_VALUE 的 case 处理服务器的下行信息。如果服务器端不需要手表端回复，且手表端不需要响应则此步骤可以跳过
-4.第三步case 中的具体动作功能实现
-
-
-static bool mmi_protocol_fzd_request_without_data(MMI_PROTOCOL_FZD_ACTION_ENUM action)
-不带内容的信息发送接口
-
-static bool mmi_protocol_fzd_send_with_data(MMI_PROTOCOL_FZD_ACTION_ENUM action, unsigned char * content_buff, int content_lenth)
-带内容的信息发送接口
-###############################################################
-
-
-
-###############################################################
-短信指令
-gui\lv_watch\mmi_protocol\mmi_protocol_sms.c  mmi_protocol_sms.h
-
-新增指令
-1.在 s_sms_parse_info[] 中添加 指令字符串、指令字符串长度值、对应指令的功能处理接口
-2.实现第一步中的对应指令的功能处理接口
-############################################################### 
-
-
-
-############################################################### 
-添加字符串
-gui\lv_watch\include\ui_textid.h
-gui\lv_watch\framework\language\lang_ch.c  lang_en.c
-
-在.h 文件中添加字符串ID，在对应语言的.c 文件中添加对应的翻译
-注意新增项在各文件中顺序要保持一致
-############################################################### 
-
-
-
-############################################################### 
-添加图片及铃声
-gui\lv_watch\lv_watch_res.h
-
-定义添加的图片或铃声资源的ID及相对路径
-在gui\lv_watch\resource 的对应路径下添加相应文件
-############################################################### 
-
-
-
-############################################################### 
-一些默认值
-gui\lv_watch\mmi_customer_default.h
-
-服务器地址、心跳间隔、定位间隔等默认值
-
-多个项目时，建议每个项目定制一份此文件
-############################################################### 
-
-
-
-###############################################################
-主菜单
-gui\lv_watch\lv_apps\primary_menu\primary_menu_data.c
-
-各功能的接口都在此文件
-
-多个项目菜单个数顺序等不同时，建议每个项目定制一份此文件
-###############################################################
-
-
-
-###############################################################
-常用接口
-
-获取步数：
-uint32_t asl_pedometer_steps_get(void)
-
-获取步数、距离、卡路里：
-void app_adaptor_get_pedometer_info_req(app_adaptor_pedometer_record_t * record)
-
-获取已有的心率、体温等：
-void mmi_health_info_get(nv_watch_health_info_t * health_info)
-
-获取电量
-UINT8 Hal_Battery_Get_Status(VOID)
-
-获取时间
-VOID Hal_Rtc_Gettime(hal_rtc_t *time)
-
-
-
-###############################################################
-
-
-
-
-
diff --git a/2.sdk/gui/lv_watch/framework/language/lang_ch.c b/2.sdk/gui/lv_watch/framework/language/lang_ch.c
index 06917693..493d8f5a 100644
--- a/2.sdk/gui/lv_watch/framework/language/lang_ch.c
+++ b/2.sdk/gui/lv_watch/framework/language/lang_ch.c
@@ -130,7 +130,7 @@ const void * lang_text_ch[] = {
     "分",
 
     /*dail.c*/
-    "当前无SIM卡",
+    "无SIM卡",
 
     /*stopwatch.c*/
     "暂停计时",
diff --git a/2.sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c b/2.sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c
index 0d157548..f2233576 100644
--- a/2.sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c
+++ b/2.sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c
@@ -214,15 +214,15 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId)
         case NV_SECTION_UI_SETTINGS:
             setting = lv_mem_alloc(SectionLen);
             memset(setting, 0, SectionLen);
-
-            setting->ringvolume = 8;
-            setting->currentwallpaperindex = 1;
-            setting->backlightintensity = 10;
-            setting->backlighttimeout = 15;
-            setting->currentlanguage = 1;
-            setting->timesetflg = 0;
-            setting->simid = 0;
-            setting->searchswitch = 0;
+			mmi_watch_setting_data_nv_default(setting);
+            //setting->ringvolume = 8;
+            //setting->currentwallpaperindex = 1;
+            //setting->backlightintensity = 10;
+            //setting->backlighttimeout = 15;
+            //setting->currentlanguage = 1;
+            //setting->timesetflg = 0;
+            //setting->simid = 0;
+            //setting->searchswitch = 0;
             TempData = (char *)setting;
             break;
         case NV_SECTION_UI_PHONE:
@@ -277,10 +277,10 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId)
         case NV_SECTION_UI_PEDOMETER:
             pedometer = lv_mem_alloc(SectionLen);
             memset(pedometer, 0, SectionLen);
-
-            pedometer->pedosetting.height = 170;
-            pedometer->pedosetting.weight = 60;
-            pedometer->pedosetting.goal = 10000;
+			mmi_watch_pedometer_data_nv_default(pedometer);
+            //pedometer->pedosetting.height = 170;
+            //pedometer->pedosetting.weight = 60;
+            //pedometer->pedosetting.goal = 10000;
             TempData = (char *)pedometer;
             break;
         case NV_SECTION_UI_LAUNCHER:
diff --git a/2.sdk/gui/lv_watch/include/ui_nvm_interface.h b/2.sdk/gui/lv_watch/include/ui_nvm_interface.h
index fde930fa..da1af354 100644
--- a/2.sdk/gui/lv_watch/include/ui_nvm_interface.h
+++ b/2.sdk/gui/lv_watch/include/ui_nvm_interface.h
@@ -71,7 +71,7 @@ typedef struct
     uint8_t portrait_id;
 } __packed nv_watch_phonebook_info_t;
 
-#define NV_WATCH_MAX_CONTACT_NUM    30
+#define NV_WATCH_MAX_CONTACT_NUM    (50) // 30
 
 typedef struct
 {
diff --git a/2.sdk/gui/lv_watch/include/ui_textid.h b/2.sdk/gui/lv_watch/include/ui_textid.h
index d6d2787e..0590e920 100644
--- a/2.sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/gui/lv_watch/include/ui_textid.h
@@ -131,7 +131,7 @@ enum
     WATCH_TEXT_ID_MINUTES,                            /* "分"                         "m"                          */
 
     /*dail.c*/
-    WATCH_TEXT_ID_NO_SIM_CARD,                        /* "当前无SIM卡"                "No SIM Card"                     */
+    WATCH_TEXT_ID_NO_SIM_CARD,                        /* "无SIM卡"                "No SIM Card"                     */
 
     /*stopwatch.c*/
     WATCH_TEXT_ID_PAUSE,                              /* "暂停计时"                   "Pause"                           */
diff --git a/2.sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c b/2.sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
index d47f70d6..1cde69e1 100644
--- a/2.sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
+++ b/2.sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
@@ -107,6 +107,7 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj)
     lv_obj_add_style(title, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
     lv_obj_align(title, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
 
+#ifndef __MMI_ZHSX_SUPPORT__
     lv_obj_t * btn_add = lv_btn_create(obj, NULL);
     lv_obj_set_size(btn_add, LV_HOR_RES/5, LV_VER_RES/5);
     lv_obj_t * img_add = lv_img_create(btn_add, NULL);
@@ -118,6 +119,7 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj)
         lv_obj_align(btn_add, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 0);
     }
     lv_obj_set_event_cb(btn_add, alarm_list_add_btn_action);
+#endif
 
     lv_obj_t * list = lv_list_create(obj, NULL);
     lv_obj_set_size(list, LV_HOR_RES, LV_VER_RES*4/5);
diff --git a/2.sdk/gui/lv_watch/lv_apps/pedometer/bodyinfo.c b/2.sdk/gui/lv_watch/lv_apps/pedometer/bodyinfo.c
index 63c91cf4..8f6d9231 100644
--- a/2.sdk/gui/lv_watch/lv_apps/pedometer/bodyinfo.c
+++ b/2.sdk/gui/lv_watch/lv_apps/pedometer/bodyinfo.c
@@ -468,4 +468,14 @@ static void get_optstr_from_num(uint16_t num, char * stropt, uint8_t type)
 
 }
 
+
+#ifdef __MMI_ZHSX_SUPPORT__
+void mmi_watch_pedometer_data_nv_default(nv_watch_pedometer_t * pedometer)
+{
+	pedometer->pedosetting.height = MMI_PEDOMETER_BODY_HEIGHT_DEFAULT;
+	pedometer->pedosetting.weight = MMI_PEDOMETER_BODY_WEIGHT_DEFAULT;
+	pedometer->pedosetting.goal = MMI_PEDOMETER_STEP_GOAL_DEFAULT;
+}
+#endif
+
 #endif /*USE_LV_WATCH_BODYINFO*/
diff --git a/2.sdk/gui/lv_watch/lv_apps/pedometer/pedometer.h b/2.sdk/gui/lv_watch/lv_apps/pedometer/pedometer.h
index 80c699b4..a4417441 100644
--- a/2.sdk/gui/lv_watch/lv_apps/pedometer/pedometer.h
+++ b/2.sdk/gui/lv_watch/lv_apps/pedometer/pedometer.h
@@ -56,6 +56,7 @@ typedef struct {
 #ifdef __MMI_ZHSX_SUPPORT__
 lv_obj_t * pedometer_create(lv_obj_t * tileview, uint16_t id);
 lv_obj_t * bodyinfo_create(lv_obj_t * tileview, uint16_t id);
+void mmi_watch_pedometer_data_nv_default(nv_watch_pedometer_t * pedometer);
 #if USE_LV_WATCH_RECORD!= 0
 lv_obj_t * record_create(lv_obj_t * tileview, uint16_t id);
 #endif
diff --git a/2.sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c b/2.sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c
index 11344304..182d22b5 100644
--- a/2.sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c
+++ b/2.sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c
@@ -14,7 +14,7 @@ static watch_app_info_t s_primary_grid_menu[] =
 {
 	{ ICON_PHONEBOOK, WATCH_TEXT_ID_TELEPHONE, phonebook_create_btn_event_cb},
 #if USE_LV_WATCH_SMS_MSG != 0
-	{ ICON_SMS_MSG, WATCH_TEXT_ID_SMS_MSG,sms_msg_create_event_cb},
+	{ ICON_SMS_MSG, WATCH_TEXT_ID_SMS_MSG, sms_msg_create_event_cb},
 #endif
 	{ ICON_DIALPAD, WATCH_TEXT_ID_DIALPAD, dialpad_create_event_cb },
 	{ ICON_CALLLOG, WATCH_TEXT_ID_CALL_LOG, call_log_create_event_cb },
diff --git a/2.sdk/gui/lv_watch/lv_apps/setting/setting.c b/2.sdk/gui/lv_watch/lv_apps/setting/setting.c
index c98190b8..cea1e8c3 100644
--- a/2.sdk/gui/lv_watch/lv_apps/setting/setting.c
+++ b/2.sdk/gui/lv_watch/lv_apps/setting/setting.c
@@ -187,8 +187,14 @@ void setting_create_event_cb(lv_obj_t * btn, lv_event_t e)
     }
 }
 
-/**********************
- *   STATIC FUNCTIONS
- **********************/
+#ifdef __MMI_ZHSX_SUPPORT__
+void mmi_watch_setting_data_nv_default(nv_watch_settings_t * setting)
+{
+	setting->ringvolume = MMI_PHONE_RING_VOLUME_DEFAULT;
+	setting->backlightintensity = MMI_PHONE_BACKLIGHT_LEVEL_DEFAULT;
+	setting->backlighttimeout = MMI_PHONE_BACKLIGHT_TIMEOUT_DEFAULT;
+	setting->currentlanguage = MMI_PHONE_LANGUAGE_DEFAULT;
+}
+#endif
 
 #endif /*USE_LV_WATCH_SETTING*/
diff --git a/2.sdk/gui/lv_watch/lv_apps/setting/setting.h b/2.sdk/gui/lv_watch/lv_apps/setting/setting.h
index b26b892b..de792325 100644
--- a/2.sdk/gui/lv_watch/lv_apps/setting/setting.h
+++ b/2.sdk/gui/lv_watch/lv_apps/setting/setting.h
@@ -63,6 +63,10 @@ extern void setting_init(void);
 void voice_wakeup_create_btn_event_cb(lv_obj_t * btn, lv_event_t e);
 void voice_wakeup_init(void);
 #endif
+#ifdef __MMI_ZHSX_SUPPORT__
+void mmi_watch_setting_data_nv_default(nv_watch_settings_t * setting);
+#endif
+
 /**********************
  *      MACROS
  **********************/
diff --git a/2.sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c b/2.sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
index 017da86b..cf76062b 100644
--- a/2.sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
+++ b/2.sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
@@ -415,6 +415,16 @@ static void smsmsg_copy_info(nv_watch_sms_msg_info_t * dest, app_adp_new_sms_inf
 
 static void sms_msg_no_network_or_sim_create(lv_obj_t * obj)
 {
+#ifdef __MMI_ZHSX_SUPPORT__
+	lv_obj_t * label = lv_label_create(obj, NULL);
+	lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
+    lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+    lv_obj_set_click(label, false);
+    lv_label_set_text_id(label, WATCH_TEXT_ID_NO_SIM_CARD);
+    lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, 0);
+
+#else
+
 	lv_obj_t * label = lv_label_create(obj, NULL);
     if(1 == lv_lang_act()) {
         lv_obj_add_style(label, LV_LABEL_PART_MAIN,&lv_watch_font20);
@@ -426,8 +436,7 @@ static void sms_msg_no_network_or_sim_create(lv_obj_t * obj)
     lv_obj_set_click(label, false);
     lv_label_set_text_id(label, WATCH_TEXT_ID_NO_SIM_OR_NETWORK);
     lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, 0);
-
-    return;
+#endif
 }
 
 static lv_sms_msg_ext_t * sms_msg_get_ext(void)
diff --git a/2.sdk/gui/lv_watch/mmi_customer_default.h b/2.sdk/gui/lv_watch/mmi_customer_default.h
index e5e2c647..327e3500 100644
--- a/2.sdk/gui/lv_watch/mmi_customer_default.h
+++ b/2.sdk/gui/lv_watch/mmi_customer_default.h
@@ -128,6 +128,56 @@ extern "C"
 #endif
 
 
+//default language
+#ifdef MMI_CUSTOMER_LANGUAGE
+#define MMI_PHONE_LANGUAGE_DEFAULT		MMI_CUSTOMER_LANGUAGE
+#else
+#define MMI_PHONE_LANGUAGE_DEFAULT		(LANG_CH) // LANG_EN
+#endif
+
+//ring volume
+#ifdef MMI_CUSTOMER_RING_VOLUME
+#define MMI_PHONE_RING_VOLUME_DEFAULT		MMI_CUSTOMER_RING_VOLUME
+#else
+#define MMI_PHONE_RING_VOLUME_DEFAULT		(8)
+#endif
+
+//backlight level
+#ifdef MMI_CUSTOMER_BACKLIGHT_LEVEL
+#define MMI_PHONE_BACKLIGHT_LEVEL_DEFAULT		MMI_CUSTOMER_BACKLIGHT_LEVEL
+#else
+#define MMI_PHONE_BACKLIGHT_LEVEL_DEFAULT		(10)
+#endif
+
+//backlight timeout
+#ifdef MMI_CUSTOMER_BACKLIGHT_TIMEOUT
+#define MMI_PHONE_BACKLIGHT_TIMEOUT_DEFAULT		MMI_CUSTOMER_BACKLIGHT_TIMEOUT
+#else
+#define MMI_PHONE_BACKLIGHT_TIMEOUT_DEFAULT		(15) // unit:s
+#endif
+
+
+//pedometer body info
+#ifdef MMI_CUSTOMER_BODY_HEIGHT
+#define MMI_PEDOMETER_BODY_HEIGHT_DEFAULT		MMI_CUSTOMER_BODY_HEIGHT
+#else
+#define MMI_PEDOMETER_BODY_HEIGHT_DEFAULT		(170)
+#endif
+
+#ifdef MMI_CUSTOMER_BODY_WEIGHT
+#define MMI_PEDOMETER_BODY_WEIGHT_DEFAULT		MMI_CUSTOMER_BODY_WEIGHT
+#else
+#define MMI_PEDOMETER_BODY_WEIGHT_DEFAULT		(60)
+#endif
+
+#ifdef MMI_CUSTOMER_STEP_GOAL
+#define MMI_PEDOMETER_STEP_GOAL_DEFAULT		MMI_CUSTOMER_STEP_GOAL
+#else
+#define MMI_PEDOMETER_STEP_GOAL_DEFAULT		(10000)
+#endif
+
+
+
 
 
 #endif
diff --git a/2.sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c b/2.sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
index 0b3b9f3b..b19c132a 100644
--- a/2.sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
+++ b/2.sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
@@ -105,10 +105,6 @@ void mmi_watch_search_screen_destroy(void)
 	
 	mmi_watch_search_timer_stop();
 
-	//if (AUDIO_CTRL_PRIORITY_SEARCH == Hal_Audio_Manage_Start_Req(AUDIO_CTRL_PRIORITY_SEARCH, mmi_watch_search_audio_ctrl_callback))
-    //{
-    //    Hal_Tone_Play_End();
-    //}
 	Hal_NFFS_File_Play_End();
     Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_SEARCH);
 	Hal_Vibrator_Play_End();