增加ECG多国语音

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
index 02f4aa8..35cdf8e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
@@ -704,8 +704,9 @@ enum UIResourceTextId : uint16_t {
     STR_CALIB_POSTURE_GUIDE = 691,\r
     STR_START_CAL = 692,\r
     STR_CALIB_POSTURE_REQ = 693,\r
-    STR_FATIGUE_LEVEL = 694,\r
-    STR_MAX_ID = 695,\r
+    STR_ECG = 694,\r
+    STR_FATIGUE_LEVEL = 695,\r
+    STR_MAX_ID = 696,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
index bc4a4e9..98e8132 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
@@ -69,7 +69,7 @@ namespace OHOS
 // #endif
     #if defined(BOARD_W9) || defined(BOARD_N9)
         //ECG
-        {VIEW_ECG, PNG_APPLIST_ECG_IMAGE_BIG, PNG_APPLIST_ECG_IMAGE, PNG_APPLIST_DEFAULT_IMG, "ECG", STR_BP_CHECK, nullptr},
+        {VIEW_ECG, PNG_APPLIST_ECG_IMAGE_BIG, PNG_APPLIST_ECG_IMAGE, PNG_APPLIST_DEFAULT_IMG, "ECG", STR_ECG, nullptr},
         //情绪
         {VIEW_UNCONNECTED, PNG_APPLIST_EMOTION_IMAGE_BIG, PNG_APPLIST_EMOTION_IMAGE, PNG_APPLIST_DEFAULT_IMG, "情绪", STR_EMOTION, nullptr},
         //压力

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
index cc0fdf7..15cab91 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
index 02f4aa8..35cdf8e 100755 (executable)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
@@ -704,8 +704,9 @@ enum UIResourceTextId : uint16_t {
     STR_CALIB_POSTURE_GUIDE = 691,\r
     STR_START_CAL = 692,\r
     STR_CALIB_POSTURE_REQ = 693,\r
-    STR_FATIGUE_LEVEL = 694,\r
-    STR_MAX_ID = 695,\r
+    STR_ECG = 694,\r
+    STR_FATIGUE_LEVEL = 695,\r
+    STR_MAX_ID = 696,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
index 88e97b1..2881aa3 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/en.lang
index cc0fdf7..15cab91 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/en.lang differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/ui_resource_string.h
index 02f4aa8..35cdf8e 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/ui_resource_string.h
@@ -704,8 +704,9 @@ enum UIResourceTextId : uint16_t {
     STR_CALIB_POSTURE_GUIDE = 691,\r
     STR_START_CAL = 692,\r
     STR_CALIB_POSTURE_REQ = 693,\r
-    STR_FATIGUE_LEVEL = 694,\r
-    STR_MAX_ID = 695,\r
+    STR_ECG = 694,\r
+    STR_FATIGUE_LEVEL = 695,\r
+    STR_MAX_ID = 696,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/zh.lang
index 88e97b1..2881aa3 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/zh.lang differ

diff --git a/tools/language_tool/Language_xml/input_list_en.txt b/tools/language_tool/Language_xml/input_list_en.txt
index 5e0f6dc..4a10758 100755 (executable)
--- a/tools/language_tool/Language_xml/input_list_en.txt
+++ b/tools/language_tool/Language_xml/input_list_en.txt
@@ -693,4 +693,5 @@ STR_SAME_ARM_CALIB$3.Please use the same arm for both calibration and actual blo
 STR_HYPERTENSIVE_PREPOST_CAL$4.For hypertensive users under medication, please calibrate once before taking medication and once 3-4 hours after.\r
 STR_CALIB_POSTURE_GUIDE$Wear the watch tightly on your left wrist with a one-finger gap. Rest for at least 5 minutes before measurement. Keep your feet flat and uncrossed, hands palms up, arms resting flat on a table. Remain still and breathe evenly during the process.\r
 STR_START_CAL$Start calibration.\r
-STR_CALIB_POSTURE_REQ$Calibration posture requirements.
\ No newline at end of file
+STR_CALIB_POSTURE_REQ$Calibration posture requirements.\r
+STR_ECG$ECG
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/input_list_zh.txt b/tools/language_tool/Language_xml/input_list_zh.txt
index 85c2e48..52b92cd 100755 (executable)
--- a/tools/language_tool/Language_xml/input_list_zh.txt
+++ b/tools/language_tool/Language_xml/input_list_zh.txt
@@ -693,4 +693,5 @@ STR_SAME_ARM_CALIB$3、校准过程和实际血压测量请使用同一只手
 STR_HYPERTENSIVE_PREPOST_CAL$4、若是高血压正在接受药物治疗的用户，请在服药前和服药后 3-4 小时，各进行校准一次\r
 STR_CALIB_POSTURE_GUIDE$请将手表佩戴在左手手腕，手表和手腕之间仅限一指距离贴紧佩戴手表，测量前建议至少休息五分钟以上，双脚平放无交叉，双手手背朝上，手臂平放在桌子上，测量过程中尽量保持静止，呼吸均匀平衡。\r
 STR_START_CAL$开始校准\r
-STR_CALIB_POSTURE_REQ$校准姿势要求
\ No newline at end of file
+STR_CALIB_POSTURE_REQ$校准姿势要求\r
+STR_ECG$ECG
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/language_custom.xlsx b/tools/language_tool/Language_xml/language_custom.xlsx
index 01baea4..8dfb9ab 100755 (executable)
Binary files a/tools/language_tool/Language_xml/language_custom.xlsx and b/tools/language_tool/Language_xml/language_custom.xlsx differ

diff --git a/tools/language_tool/Language_xml/language_en.xml b/tools/language_tool/Language_xml/language_en.xml
index c7b600c..2c4228c 100755 (executable)
--- a/tools/language_tool/Language_xml/language_en.xml
+++ b/tools/language_tool/Language_xml/language_en.xml
@@ -695,4 +695,5 @@
        <lanstr id="STR_CALIB_POSTURE_GUIDE" value="Wear the watch tightly on your left wrist with a one-finger gap. Rest for at least 5 minutes before measurement. Keep your feet flat and uncrossed, hands palms up, arms resting flat on a table. Remain still and breathe evenly during the process."/>
        <lanstr id="STR_START_CAL" value="Start calibration."/>
        <lanstr id="STR_CALIB_POSTURE_REQ" value="Calibration posture requirements."/>
+       <lanstr id="STR_ECG" value="ECG"/>
 </language>

diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index 82a2b23..c4505ae 100755 (executable)
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -695,4 +695,5 @@
        <lanstr id="STR_CALIB_POSTURE_GUIDE" value="请将手表佩戴在左手手腕，手表和手腕之间仅限一指距离贴紧佩戴手表，测量前建议至少休息五分钟以上，双脚平放无交叉，双手手背朝上，手臂平放在桌子上，测量过程中尽量保持静止，呼吸均匀平衡。"/>
        <lanstr id="STR_START_CAL" value="开始校准"/>
        <lanstr id="STR_CALIB_POSTURE_REQ" value="校准姿势要求"/>
+       <lanstr id="STR_ECG" value="ECG"/>
 </language>

diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang
index cc0fdf7..15cab91 100755 (executable)
Binary files a/tools/language_tool/font/en.lang and b/tools/language_tool/font/en.lang differ

diff --git a/tools/language_tool/font/ui_resource_string.h b/tools/language_tool/font/ui_resource_string.h
index 02f4aa8..35cdf8e 100755 (executable)
--- a/tools/language_tool/font/ui_resource_string.h
+++ b/tools/language_tool/font/ui_resource_string.h
@@ -704,8 +704,9 @@ enum UIResourceTextId : uint16_t {
     STR_CALIB_POSTURE_GUIDE = 691,\r
     STR_START_CAL = 692,\r
     STR_CALIB_POSTURE_REQ = 693,\r
-    STR_FATIGUE_LEVEL = 694,\r
-    STR_MAX_ID = 695,\r
+    STR_ECG = 694,\r
+    STR_FATIGUE_LEVEL = 695,\r
+    STR_MAX_ID = 696,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang
index 88e97b1..2881aa3 100755 (executable)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ