From: xue <2144439972@qq.com> Date: Tue, 24 Jun 2025 09:55:07 +0000 (+0800) Subject: 增加ECG多国语音 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1884%2F1;p=mirrors%2FFD230.git 增加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 02f4aa83e..35cdf8e47 100644 --- 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, STR_START_CAL = 692, STR_CALIB_POSTURE_REQ = 693, - STR_FATIGUE_LEVEL = 694, - STR_MAX_ID = 695, + STR_ECG = 694, + STR_FATIGUE_LEVEL = 695, + STR_MAX_ID = 696, }; // UIResourceTextId 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 bc4a4e9b1..98e8132c3 100644 --- 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 cc0fdf73f..15cab91fc 100755 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 02f4aa83e..35cdf8e47 100755 --- 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, STR_START_CAL = 692, STR_CALIB_POSTURE_REQ = 693, - STR_FATIGUE_LEVEL = 694, - STR_MAX_ID = 695, + STR_ECG = 694, + STR_FATIGUE_LEVEL = 695, + STR_MAX_ID = 696, }; // UIResourceTextId 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 88e97b113..2881aa39f 100755 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 cc0fdf73f..15cab91fc 100644 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 02f4aa83e..35cdf8e47 100644 --- 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, STR_START_CAL = 692, STR_CALIB_POSTURE_REQ = 693, - STR_FATIGUE_LEVEL = 694, - STR_MAX_ID = 695, + STR_ECG = 694, + STR_FATIGUE_LEVEL = 695, + STR_MAX_ID = 696, }; // UIResourceTextId 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 88e97b113..2881aa39f 100644 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 5e0f6dc33..4a10758b0 100755 --- 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. 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. STR_START_CAL$Start calibration. -STR_CALIB_POSTURE_REQ$Calibration posture requirements. \ No newline at end of file +STR_CALIB_POSTURE_REQ$Calibration posture requirements. +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 85c2e48de..52b92cd0a 100755 --- 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 小时,各进行校准一次 STR_CALIB_POSTURE_GUIDE$请将手表佩戴在左手手腕,手表和手腕之间仅限一指距离贴紧佩戴手表,测量前建议至少休息五分钟以上,双脚平放无交叉,双手手背朝上,手臂平放在桌子上,测量过程中尽量保持静止,呼吸均匀平衡。 STR_START_CAL$开始校准 -STR_CALIB_POSTURE_REQ$校准姿势要求 \ No newline at end of file +STR_CALIB_POSTURE_REQ$校准姿势要求 +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 01baea4b4..8dfb9abd7 100755 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 c7b600c8a..2c4228c84 100755 --- a/tools/language_tool/Language_xml/language_en.xml +++ b/tools/language_tool/Language_xml/language_en.xml @@ -695,4 +695,5 @@ + diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml index 82a2b23e8..c4505ae4d 100755 --- a/tools/language_tool/Language_xml/language_zh.xml +++ b/tools/language_tool/Language_xml/language_zh.xml @@ -695,4 +695,5 @@ + diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang index cc0fdf73f..15cab91fc 100755 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 02f4aa83e..35cdf8e47 100755 --- 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, STR_START_CAL = 692, STR_CALIB_POSTURE_REQ = 693, - STR_FATIGUE_LEVEL = 694, - STR_MAX_ID = 695, + STR_ECG = 694, + STR_FATIGUE_LEVEL = 695, + STR_MAX_ID = 696, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang index 88e97b113..2881aa39f 100755 Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ