From: xue <2144439972@qq.com> Date: Mon, 23 Jun 2025 02:26:19 +0000 (+0800) Subject: 增加多国语言 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1879%2F2;p=mirrors%2FFD230.git 增加多国语言 --- 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 b7caec622..02f4aa83e 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 @@ -678,7 +678,34 @@ enum UIResourceTextId : uint16_t { STR_WARN_THRESH = 665, STR_BP_WARN_CONSULT_DOC = 666, STR_MEAS_FAILED = 667, - STR_MAX_ID = 668, + STR_CALIBRATING = 668, + STR_S = 669, + STR_PRESSURE = 670, + STR_WEAR_WATCH_DET = 671, + STR_RE_MEAS = 672, + STR_DATA_ANAL_WAIT = 673, + STR_EMOTION = 674, + STR_PLEASURE = 675, + STR_COMPLEX_NEG_EMO = 676, + STR_MEASURE = 677, + STR_FINGER_LEAD_PORT = 678, + STR_START_MEAS = 679, + STR_WEAR_TIGHT_FINGER_LEAD = 680, + STR_NO_FINGER_MOVE = 681, + STR_CONNECT_APP_4G = 682, + STR_FINGER_LEAD_TILL_VAL = 683, + STR_SINUS_HR = 684, + STR_APP_REPORT_NOT_CLIN = 685, + STR_FATIGUE_LVL = 686, + STR_BP_MODEL_2CAL = 687, + STR_RECAL_MONTHLY = 688, + STR_SAME_ARM_CALIB = 689, + STR_HYPERTENSIVE_PREPOST_CAL = 690, + STR_CALIB_POSTURE_GUIDE = 691, + STR_START_CAL = 692, + STR_CALIB_POSTURE_REQ = 693, + STR_FATIGUE_LEVEL = 694, + STR_MAX_ID = 695, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationErrorView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationErrorView.h index e0156af3f..6f22c717b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationErrorView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationErrorView.h @@ -30,7 +30,7 @@ namespace OHOS UIImageView *error = nullptr; UILabelExt *titleLable = nullptr; UILabelExt *resultremindLable = nullptr; - UILabelButton *checkButton{nullptr}; + UILabelButtonExt *checkButton{nullptr}; UIViewGroup *group{nullptr}; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationMindView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationMindView.h index 5896335d5..974883c5a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationMindView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationMindView.h @@ -29,7 +29,7 @@ namespace OHOS UIImageView *mind = nullptr; UILabelExt *titleLabel = nullptr; UILabelExt *mindLabel = nullptr; - UILabelButton *checkButton{nullptr}; + UILabelButtonExt *checkButton{nullptr}; UIViewGroup *group{nullptr}; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationPassView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationPassView.h index 917f4752f..60324384b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationPassView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationPassView.h @@ -28,7 +28,7 @@ namespace OHOS UIImageView *pass = nullptr; UILabelExt *titleLable = nullptr; UILabelExt *resultremindLable = nullptr; - UILabelButton *checkButton{nullptr}; + UILabelButtonExt *checkButton{nullptr}; UIViewGroup *group{nullptr}; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalPosReqView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalPosReqView.cpp index 99d8badce..61ea3a154 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalPosReqView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalPosReqView.cpp @@ -1,18 +1,10 @@ #include "bloodpressure/include/BPMainPresenter.h" #include "bloodpressure/include/BPCalPosReqView.h" #include "wearable_log.h" +#include "ui_resource_string.h" namespace OHOS { -#define BPCALPOSREQVIEW_LABEL "校准提醒" -#define BPCALPOSREQVIEW_LABEL_1 "1、建立血压模型需要进行两个轮次校准；" -#define BPCALPOSREQVIEW_LABEL_2 "2、建议每个月都重新校准；" -#define BPCALPOSREQVIEW_LABEL_3 "3、校准过程和实际血压测量请 使用同一只手；" -#define BPCALPOSREQVIEW_LABEL_4 "4、若是高血压正在接受药物治疗的用户,请在服药前和服药后3-4小时,各进行校准一次。" -#define BPCALPOSREQVIEW_LABEL_4 "4、若是高血压正在接受药物治疗的用户,请在服药前和服药后3-4小时,各进行校准一次。" -#define BPCALPOSREQVIEW_LABEL_5 "校准姿势要求" -#define BPCALPOSREQVIEW_LABEL_6 "请将手表佩戴在左手手腕，手表和手腕之间仅限一指距离贴紧佩戴手表，测量前建议至少休息五分钟以上，双脚平放无交叉，双手手背朝上，手臂平放在桌子上，测量过程中尽量保持静止，呼吸均匀平衡。" -#define BPCALPOSREQVIEW_LABEL_7 "开始校准" #define BPCALPOSREQVIEW_LABEL_W 432 // 宽度 #define BPCALPOSREQVIEW_LABEL_TEXT_SIZE 33 // 字体大小 #define BPCALPOSREQVIEW_LABEL_LINE_HEIGHT 48 // 字体大小 @@ -80,11 +72,11 @@ namespace OHOS bool BPCalPosReqView::InitLabelAndImage() { - const char *str[] = { - BPCALPOSREQVIEW_LABEL_1, - BPCALPOSREQVIEW_LABEL_2, - BPCALPOSREQVIEW_LABEL_3, - BPCALPOSREQVIEW_LABEL_4, + const uint16_t str[] = { + STR_BP_MODEL_2CAL, + STR_RECAL_MONTHLY, + STR_SAME_ARM_CALIB, + STR_HYPERTENSIVE_PREPOST_CAL, }; for (int i = 0; i < (sizeof(str) / sizeof(str[0])); i++) { @@ -106,7 +98,7 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "label[%d]->GetY() = %d", i, label[i]->GetY()); label[i]->SetStyle(STYLE_TEXT_FONT, BPCALPOSREQVIEW_LABEL_TEXT_SIZE); label[i]->SetStyle(STYLE_LINE_HEIGHT, BPCALPOSREQVIEW_LABEL_LINE_HEIGHT); - label[i]->SetText(str[i]); + label[i]->SetTextId(str[i]); label[i]->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); label[i]->SetRollSpeed(23); label[i]->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); @@ -126,7 +118,7 @@ namespace OHOS label2->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, label[i]->GetY() + label[i]->GetHeight() + BPCALPOSREQVIEW_LABEL_GAP, 300, BPCALPOSREQVIEW_LABEL_LINE_HEIGHT); label2->SetStyle(STYLE_TEXT_FONT, BPCALPOSREQVIEW_LABEL_TEXT_SIZE); label2->SetStyle(STYLE_LINE_HEIGHT, BPCALPOSREQVIEW_LABEL_LINE_HEIGHT); - label2->SetText(BPCALPOSREQVIEW_LABEL_5); + label2->SetTextId(STR_CALIB_POSTURE_REQ); label2->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); label2->SetRollSpeed(23); label2->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -158,7 +150,7 @@ namespace OHOS label3->SetPosition((HORIZONTAL_RESOLUTION - BPCALPOSREQVIEW_LABEL_W) / 2, image->GetY() + image->GetHeight() + BPCALPOSREQVIEW_LABEL_GAP, BPCALPOSREQVIEW_LABEL_W, BPCALPOSREQVIEW_LABEL_LINE_HEIGHT); label3->SetStyle(STYLE_TEXT_FONT, BPCALPOSREQVIEW_LABEL_TEXT_SIZE); label3->SetStyle(STYLE_LINE_HEIGHT, BPCALPOSREQVIEW_LABEL_LINE_HEIGHT); - label3->SetText(BPCALPOSREQVIEW_LABEL_6); + label3->SetTextId(STR_CALIB_POSTURE_GUIDE); label3->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); label3->SetRollSpeed(23); label3->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); @@ -212,7 +204,7 @@ namespace OHOS titleLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, 67, 300, BPCALPOSREQVIEW_LABEL_LINE_HEIGHT); titleLabel->SetStyle(STYLE_TEXT_FONT, BPCALPOSREQVIEW_LABEL_TEXT_SIZE); titleLabel->SetStyle(STYLE_LINE_HEIGHT, BPCALPOSREQVIEW_LABEL_LINE_HEIGHT); - titleLabel->SetText(BPCALPOSREQVIEW_LABEL); + titleLabel->SetTextId(STR_CALIBRATION_REMINDER); titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); titleLabel->SetRollSpeed(23); titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -220,7 +212,7 @@ namespace OHOS scrollview->Add(titleLabel); if (!InitLabelAndImage()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabel error!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelExt error!"); return nullptr; } if (startCalibrationButton == nullptr) @@ -236,7 +228,7 @@ namespace OHOS startCalibrationButton->SetStyle(STYLE_TEXT_FONT, BPCALPOSREQVIEW_LABEL_TEXT_SIZE); startCalibrationButton->SetStyle(STYLE_LINE_HEIGHT, BPCALPOSREQVIEW_LABEL_LINE_HEIGHT); startCalibrationButton->SetAlign(TEXT_ALIGNMENT_CENTER); - startCalibrationButton->SetText(BPCALPOSREQVIEW_LABEL_7); + startCalibrationButton->SetTextId(STR_START_CAL); startCalibrationButton->SetViewId(STARTCALIBRATIONBUTTON); startCalibrationButton->SetStyle(STYLE_BACKGROUND_COLOR, Color::Gray().full); startCalibrationButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, BPCALPOSREQVIEW_LABEL_TEXT_SIZE); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp index 3c05a61ea..56f5dede8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp @@ -67,7 +67,7 @@ namespace OHOS */ bool BPCalibrationErrorView::AddButton() { - InitLabelButton(checkButton, 125, 365, 217, 63, "errorcheckButton", "重新校准", 35); + InitButtonExt(checkButton, 125, 365, 217, 63, "errorcheckButton", STR_RECALIBRATE, 35); checkButton->SetViewId(ERRORCHECKBUTTON); checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); // 设置按键颜色 checkButton->SetTextColor(Color::White()); @@ -85,7 +85,7 @@ namespace OHOS bool BPCalibrationErrorView::InitLable() { - InitLabel(titleLable, 145, 38, 165, 45, "titleLable", "校准失败", DEFAULT_VECTOR_FONT_FILENAME, 36); + InitLabelExt(titleLable, 145, 38, 165, 45, "titleLable", STR_CALIBRATION_FAILED, DEFAULT_VECTOR_FONT_FILENAME, 36); InitLabel(resultremindLable, 64, 113, 337, 70, "resultremindLable", "校准失败,请重新校准", DEFAULT_VECTOR_FONT_FILENAME, 32); resultremindLable->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); resultremindLable->SetTextColor(Color::Red()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp index 700f9ab1b..044746d07 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp @@ -73,7 +73,7 @@ namespace OHOS */ bool BPCalibrationMindView::AddButton() { - InitLabelButton(checkButton, 125, 365, 217, 63, "mindcheckButton", "我已测完", 35); + InitButtonExt(checkButton, 125, 365, 217, 63, "mindcheckButton", STR_MEASUREMENT_DONE, 35); checkButton->SetViewId(MINDCHECKBUTTON); checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); // 设置按键颜色 checkButton->SetTextColor(Color::White()); @@ -91,8 +91,8 @@ namespace OHOS bool BPCalibrationMindView::InitLable() { - InitLabel(titleLabel, 83, 40, 300, 45, "calibration", "校准提醒", DEFAULT_VECTOR_FONT_FILENAME, 36); - InitLabel(mindLabel, 81, 101, 300, 70, "calibration", "请用传统血压计测量同一只手", DEFAULT_VECTOR_FONT_FILENAME, 32); + InitLabelExt(titleLabel, 83, 40, 300, 45, "calibration", STR_CALIBRATION_REMINDER, DEFAULT_VECTOR_FONT_FILENAME, 36); + InitLabelExt(mindLabel, 81, 101, 300, 70, "calibration", STR_USE_TRAD_SPHYGM, DEFAULT_VECTOR_FONT_FILENAME, 32); mindLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); mindLabel->SetTextColor(Color::Red()); /*初始化检测时间*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationPassView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationPassView.cpp index d7e6a19f4..6e2b763fa 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationPassView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationPassView.cpp @@ -67,7 +67,7 @@ namespace OHOS */ bool BPCalibrationPassView::AddButton() { - InitLabelButton(checkButton, 125, 365, 217, 63, "passcheckButton", "确认", 35); + InitButtonExt(checkButton, 125, 365, 217, 63, "passcheckButton", STR_CONFIRM, 35); checkButton->SetViewId(PASSCAECKBUTTON); checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); // 设置按键颜色 checkButton->SetTextColor(Color::White()); @@ -85,8 +85,8 @@ namespace OHOS bool BPCalibrationPassView::InitLable() { - InitLabel(titleLable, 145, 38, 165, 45, "titleLable", "校准完成", DEFAULT_VECTOR_FONT_FILENAME, 36); - InitLabel(resultremindLable, 64, 113, 337, 70, "resultremindLable", "校准结果已上传,30天后可重新校准", DEFAULT_VECTOR_FONT_FILENAME, 32); + InitLabelExt(titleLable, 145, 38, 165, 45, "titleLable",STR_CALIBRATION_DONE, DEFAULT_VECTOR_FONT_FILENAME, 36); + InitLabelExt(resultremindLable, 64, 113, 337, 70, "resultremindLable", STR_CAL_RES_UPLOADED_30D, DEFAULT_VECTOR_FONT_FILENAME, 32); resultremindLable->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); resultremindLable->SetTextColor(Color::Red()); /*初始化检测时间*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPResultAnalysisView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPResultAnalysisView.cpp index 50ba9e393..4afc3a0bd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPResultAnalysisView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPResultAnalysisView.cpp @@ -63,8 +63,8 @@ namespace OHOS bool BPResultAnalysisView::InitLable() { - InitLabel(calibrationLabel, 73, 40, 300, 45, "calibration", "结果分析中", DEFAULT_VECTOR_FONT_FILENAME, 36); - InitLabel(mindLabel, 38, 201, 360, 70, "mindLabel", "分析中请勿退出，过程中尽量保持静止，呼吸均匀平衡", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(calibrationLabel, 73, 40, 300, 45, "calibration", STR_RES_ANALYZING, DEFAULT_VECTOR_FONT_FILENAME, 36); + InitLabelExt(mindLabel, 38, 201, 360, 70, "mindLabel", STR_ANALYZING_DONT_EXIT, DEFAULT_VECTOR_FONT_FILENAME, 30); mindLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); mindLabel->SetTextColor(Color::Red()); /*初始化检测时间*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPSecUnderCalibrationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPSecUnderCalibrationView.cpp index be0f390b3..e89475893 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPSecUnderCalibrationView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPSecUnderCalibrationView.cpp @@ -88,11 +88,11 @@ namespace OHOS bool BPSecUnderCalibrationView::InitLable() { - InitLabel(calibrationLabel, 83, 32, 300, 40, "calibration", "校准中...", DEFAULT_VECTOR_FONT_FILENAME, 35); - InitLabel(remindLabel, 63, 278, 360, 35, "remind", "二轮校准中，过程中尽量保持静止，呼吸均匀平衡", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(calibrationLabel, 83, 32, 300, 40, "calibration",STR_CALIBRATING, DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabelExt(remindLabel, 63, 278, 360, 35, "remind", STR_SECOND_CAL_KEEP_STILL, DEFAULT_VECTOR_FONT_FILENAME, 30); remindLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); remindLabel->SetTextColor(Color::Red()); - InitLabel(timeLabel, 165, 400, 300, 35, "timeLabel", "秒", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(timeLabel, 165, 400, 300, 35, "timeLabel",STR_S, DEFAULT_VECTOR_FONT_FILENAME, 30); InitUILabel(timenumLabel, 133, 300, 200, 200, "timenumLabel", "30", DEFAULT_VECTOR_FONT_FILENAME, 100); group->Add(calibrationLabel); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPUnderCalibrationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPUnderCalibrationView.cpp index a4ff44290..c24f9ba3b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPUnderCalibrationView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPUnderCalibrationView.cpp @@ -88,11 +88,11 @@ namespace OHOS bool BPUnderCalibrationView::InitLable() { - InitLabel(calibrationLabel, 83, 32, 300, 40, "calibration", "校准中...", DEFAULT_VECTOR_FONT_FILENAME, 35); - InitLabel(remindLabel, 63, 278, 360, 35, "remind", "首轮校准中，过程中尽量保持静止，呼吸均匀平衡", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(calibrationLabel, 83, 32, 300, 40, "calibration", STR_CALIBRATING, DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabelExt(remindLabel, 63, 278, 360, 35, "remind",STR_FIRST_CAL_KEEP_STILL, DEFAULT_VECTOR_FONT_FILENAME, 30); remindLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); remindLabel->SetTextColor(Color::Red()); - InitLabel(timeLabel, 165, 400, 300, 35, "timeLabel", "秒", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(timeLabel, 165, 400, 300, 35, "timeLabel", STR_S, DEFAULT_VECTOR_FONT_FILENAME, 30); InitUILabel(timenumLabel, 133, 300, 200, 200, "timenumLabel", "30", DEFAULT_VECTOR_FONT_FILENAME, 100); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPValueView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPValueView.cpp index 4cb5ea0fc..1832d8434 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPValueView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPValueView.cpp @@ -122,9 +122,9 @@ namespace OHOS bool BPValueView::InitLable() { - InitLabel(titleLabel, 109, 38, 239, 35, "title", "请输入血压计量", DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabel(SBPLabel, 63, 170, 100, 29, "SBP", "收缩压", DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabel(DBPLabel, 63, 270, 100, 29, "DBP", "舒张压", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(titleLabel, 109, 38, 239, 35, "title", STR_ENTER_BP_READ, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(SBPLabel, 63, 170, 100, 29, "SBP", STR_SBP, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(DBPLabel, 63, 270, 100, 29, "DBP", STR_DBP, DEFAULT_VECTOR_FONT_FILENAME, 30); InitUILabel(SBPValue, 210, 150, 200, 60, "SBPValue", "120", DEFAULT_VECTOR_FONT_FILENAME, 50); InitUILabel(DBPValue, 210, 270, 200, 60, "DBPValue", "80", DEFAULT_VECTOR_FONT_FILENAME, 50); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectBeginView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectBeginView.cpp index 4b8d4a0f6..c895f63d9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectBeginView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectBeginView.cpp @@ -153,11 +153,11 @@ namespace OHOS bool BPDetectBeginView::InitLable() { - InitLabel(calibrationLabel, 83, 32, 300, 40, "calibration", "测量中...", DEFAULT_VECTOR_FONT_FILENAME, 35); - InitLabel(remindLabel, 63, 278, 360, 35, "remind", "测量中，过程中尽量保持静止，呼吸均匀平衡", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(calibrationLabel, 83, 32, 300, 40, "calibration", STR_MEARURING, DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabelExt(remindLabel, 63, 278, 360, 35, "remind", STR_MEASURING_KEEP_STILL, DEFAULT_VECTOR_FONT_FILENAME, 30); remindLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); remindLabel->SetTextColor(Color::Red()); - InitLabel(timeLabel, 165, 400, 300, 35, "timeLabel", "秒", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(timeLabel, 165, 400, 300, 35, "timeLabel", STR_S, DEFAULT_VECTOR_FONT_FILENAME, 30); InitUILabel(timenumLabel, 133, 300, 200, 200, "timenumLabel", "30", DEFAULT_VECTOR_FONT_FILENAME, 100); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp index 83b612276..039825900 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp @@ -136,11 +136,11 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectEndInit is begin"); /*初始化label*/ - InitLabel(DBPTitleLabel, 20, 66, 200, 60, "calibration", "收缩压", DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabel(SBPTitleText, 240, 66, 200, 60, "calibration", "舒张压", DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabel(NomalText, 0, 295, 200, 60, "calibration", "正常", DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabel(HighText, 133, 295, 200, 60, "calibration", "偏高", DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabel(AlertText, 266, 295, 200, 60, "calibration", "预警", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(DBPTitleLabel, 20, 66, 200, 60, "calibration", STR_SBP, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(SBPTitleText, 240, 66, 200, 60, "calibration", STR_DBP, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(NomalText, 0, 295, 200, 60, "calibration", STR_NORMAL, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(HighText, 133, 295, 200, 60, "calibration", STR_ELEVATED, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(AlertText, 266, 295, 200, 60, "calibration", STR_WARNING, DEFAULT_VECTOR_FONT_FILENAME, 30); InitUILabel(DBPText, 20, 120, 200, 60, "calibration", "110", DEFAULT_VECTOR_FONT_FILENAME, 50); InitUILabel(SBPText, 240, 120, 200, 60, "calibration", "68", DEFAULT_VECTOR_FONT_FILENAME, 50); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectErrorView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectErrorView.cpp index 2cfcb543a..2ffc5c205 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectErrorView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectErrorView.cpp @@ -108,12 +108,12 @@ namespace OHOS group->Add(background); /*初始化label*/ - InitLabel(titlelabel, 133, 57, 200, 60, "titlelabel", "收缩压偏高", DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabel(alertlabel, 133, 115, 200, 60, "alertlabel", "预警值:120", DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabel(notelabel, 58, 180, 350, 150, "notelabel", "血压达到预警值，请密切关注 自身情况，如有不适或必要时， 请询问医生。", DEFAULT_VECTOR_FONT_FILENAME, 26); + InitLabelExt(titlelabel, 133, 57, 200, 60, "titlelabel", STR_SBP_ELEVATED, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(alertlabel, 133, 115, 200, 60, "alertlabel", STR_WARN_THRESH, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(notelabel, 58, 180, 350, 150, "notelabel", STR_BP_WARN_CONSULT_DOC, DEFAULT_VECTOR_FONT_FILENAME, 26); InitLabel(soslabel, 54, 366, 200, 60, BP_SOS_CLICK, "SOS", DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabel(exitlabel, 215, 366, 200, 60, EXIE_CLICK, "知道了", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(exitlabel, 215, 366, 200, 60, EXIE_CLICK, STR_KONW, DEFAULT_VECTOR_FONT_FILENAME, 30); soslabel->SetTouchable(true); exitlabel->SetTouchable(true); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFailView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFailView.cpp index 10fe6ce39..75b346dbb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFailView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFailView.cpp @@ -69,7 +69,7 @@ namespace OHOS InitImageView(icon_fail, 131, 131, 100, 100, "image_bp", image_bp); - InitLabel(titlefail, 133, 57, 200, 50, "titlefail","测量失败", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(titlefail, 133, 57, 200, 50, "titlefail",STR_MEAS_FAILED, DEFAULT_VECTOR_FONT_FILENAME, 30); InitButtonExt(ReCheckButton, 118, 360, 230, 80, RE_CLICK_FAIL,STR_RECHECK, 30); ReCheckButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffFF8A36); // 设置按键颜色 diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFirstView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFirstView.cpp index ed95293af..22ec4edc2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFirstView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFirstView.cpp @@ -181,8 +181,8 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectionViewInit is begin"); /*初始化label*/ - InitLabel(DBPTitleLabel, 20, 66, 200, 60, "calibration", "收缩压", DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabel(SBPTitleText, 240, 66, 200, 60, "calibration", "舒张压", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(DBPTitleLabel, 20, 66, 200, 60, "calibration", STR_SBP, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(SBPTitleText, 240, 66, 200, 60, "calibration", STR_DBP, DEFAULT_VECTOR_FONT_FILENAME, 30); InitUILabel(DBPText, 20, 120, 200, 60, "calibration", "108", DEFAULT_VECTOR_FONT_FILENAME, 50); InitUILabel(SBPText, 240, 120, 200, 60, "calibration", "68", DEFAULT_VECTOR_FONT_FILENAME, 50); InitUILabel(timeLabel, 133, 115, 200, 60, "calibration", "2025/06/18 \n 15:00", DEFAULT_VECTOR_FONT_FILENAME, 20); diff --git a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgResetTestOfSuccView.cpp b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgResetTestOfSuccView.cpp index f4c7bbfdb..68c8ab40e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgResetTestOfSuccView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgResetTestOfSuccView.cpp @@ -1,5 +1,6 @@ #include "ecg/include/EcgResetTestOfSuccView.h" #include "ecg/include/EcgPresenter.h" +#include "ui_resource_string.h" #include "wearable_log.h" namespace OHOS @@ -99,7 +100,7 @@ namespace OHOS remindLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, image->GetHeight() + image->GetY(), 300, 35); remindLabel->SetStyle(STYLE_TEXT_FONT, 30); remindLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - remindLabel->SetText("请把手指放在导联口"); + remindLabel->SetTextId(STR_FINGER_LEAD_PORT); remindLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); remindLabel->SetRollSpeed(23); remindLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -119,7 +120,7 @@ namespace OHOS resetTestSuccButton->SetStyle(STYLE_TEXT_FONT, 30); resetTestSuccButton->SetStyle(STYLE_LINE_HEIGHT, 35); resetTestSuccButton->SetAlign(TEXT_ALIGNMENT_CENTER); - resetTestSuccButton->SetText("重新测量"); + resetTestSuccButton->SetTextId(STR_RE_MEAS); resetTestSuccButton->SetViewId(RESETTESTSUCCBUTTON); resetTestSuccButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36); resetTestSuccButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); diff --git a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgStartTestView.cpp b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgStartTestView.cpp index 9ae1ad13a..111f48da0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgStartTestView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgStartTestView.cpp @@ -1,6 +1,7 @@ #include "ecg/include/EcgStartTestView.h" #include "ecg/include/EcgPresenter.h" #include "wearable_log.h" +#include "ui_resource_string.h" namespace OHOS { @@ -98,7 +99,7 @@ namespace OHOS startEcgTestButton->SetStyle(STYLE_TEXT_FONT, 30); startEcgTestButton->SetStyle(STYLE_LINE_HEIGHT, 35); startEcgTestButton->SetAlign(TEXT_ALIGNMENT_CENTER); - startEcgTestButton->SetText("开始测量"); + startEcgTestButton->SetTextId(STR_START_MEAS); startEcgTestButton->SetViewId(STARTECGTESTBUTTON); startEcgTestButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36); startEcgTestButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); diff --git a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestAnalysisView.cpp b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestAnalysisView.cpp index 2644c4f8e..2f728c85e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestAnalysisView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestAnalysisView.cpp @@ -3,6 +3,7 @@ #include "wearable_log.h" #include "UiConfig.h" #include "common/image_cache_manager.h" +#include "ui_resource_string.h" namespace OHOS { @@ -163,7 +164,7 @@ namespace OHOS remindLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, 360, 300, 35); remindLabel->SetStyle(STYLE_TEXT_FONT, 30); remindLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - remindLabel->SetText("数据分析中，请耐心等待结果"); + remindLabel->SetTextId(STR_DATA_ANAL_WAIT); remindLabel->SetTextColor(Color::GetColorFromRGBA(0xff, 0x3a, 0x3a, 0xff)); remindLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); remindLabel->SetRollSpeed(23); diff --git a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestFailedNoValueView.cpp b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestFailedNoValueView.cpp index 698ced65c..12011a23a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestFailedNoValueView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestFailedNoValueView.cpp @@ -1,5 +1,6 @@ #include "ecg/include/EcgTestFailedNoValueView.h" #include "ecg/include/EcgPresenter.h" +#include "ui_resource_string.h" #include "wearable_log.h" namespace OHOS @@ -101,7 +102,7 @@ namespace OHOS resetTestBtn->SetStyle(STYLE_TEXT_FONT, 30); resetTestBtn->SetStyle(STYLE_LINE_HEIGHT, 35); resetTestBtn->SetAlign(TEXT_ALIGNMENT_CENTER); - resetTestBtn->SetText("重新测量"); + resetTestBtn->SetTextId(STR_RE_MEAS); resetTestBtn->SetViewId(RESET_TEST_BTN); resetTestBtn->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36); resetTestBtn->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); diff --git a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestFailedNoWearingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestFailedNoWearingView.cpp index 379a2651e..066592d5c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestFailedNoWearingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestFailedNoWearingView.cpp @@ -1,5 +1,6 @@ #include "ecg/include/EcgTestFailedNoWearingView.h" #include "ecg/include/EcgPresenter.h" +#include "ui_resource_string.h" #include "wearable_log.h" namespace OHOS @@ -87,7 +88,7 @@ namespace OHOS remindLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, 100, 300, 35); remindLabel->SetStyle(STYLE_TEXT_FONT, 30); remindLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - remindLabel->SetText("请戴紧手表将手指放到导联口直到出值"); + remindLabel->SetTextId(STR_WEAR_TIGHT_FINGER_LEAD); remindLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); remindLabel->SetRollSpeed(23); remindLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -120,7 +121,7 @@ namespace OHOS resetTestBtn->SetStyle(STYLE_TEXT_FONT, 30); resetTestBtn->SetStyle(STYLE_LINE_HEIGHT, 35); resetTestBtn->SetAlign(TEXT_ALIGNMENT_CENTER); - resetTestBtn->SetText("重新测量"); + resetTestBtn->SetTextId(STR_RE_MEAS); resetTestBtn->SetViewId(RESETTESTBTN); resetTestBtn->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36); resetTestBtn->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); diff --git a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestNeedAppOrNetworkView.cpp b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestNeedAppOrNetworkView.cpp index eb926fa87..42f9dff59 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestNeedAppOrNetworkView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestNeedAppOrNetworkView.cpp @@ -1,5 +1,6 @@ #include "ecg/include/EcgTestNeedAppOrNetworkView.h" #include "ecg/include/EcgPresenter.h" +#include "ui_resource_string.h" #include "wearable_log.h" namespace OHOS @@ -64,7 +65,7 @@ namespace OHOS reminderLabel->SetPosition((HORIZONTAL_RESOLUTION - 400) / 2, 201, 400, 77); reminderLabel->SetStyle(STYLE_TEXT_FONT, 36); reminderLabel->SetStyle(STYLE_LINE_HEIGHT, 77); - reminderLabel->SetText("请连接APP或开启4G网络"); + reminderLabel->SetTextId(STR_CONNECT_APP_4G); reminderLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); reminderLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); reminderLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 36); diff --git a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestReminderView.cpp b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestReminderView.cpp index b57f8ff53..0eadb2e95 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestReminderView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestReminderView.cpp @@ -1,6 +1,7 @@ #include "ecg/include/EcgTestReminderView.h" #include "ecg/include/EcgPresenter.h" #include "wearable_log.h" +#include "ui_resource_string.h" namespace OHOS { @@ -83,7 +84,7 @@ namespace OHOS reminderLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, 110, 300, 35); reminderLabel->SetStyle(STYLE_TEXT_FONT, 30); reminderLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - reminderLabel->SetText("测量时，请把手指放在导联口直到出值。"); + reminderLabel->SetTextId(STR_FINGER_LEAD_PORT); reminderLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); reminderLabel->SetRollSpeed(23); reminderLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); diff --git a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestResultView.cpp index 1230320cb..498734b69 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestResultView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestResultView.cpp @@ -1,5 +1,7 @@ #include "ecg/include/EcgTestResultView.h" #include "ecg/include/EcgPresenter.h" +#include "ui_resource_string.h" + #include "wearable_log.h" namespace OHOS @@ -99,7 +101,7 @@ namespace OHOS remindLabel1->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, image->GetHeight() + image->GetY(), 300, 35); remindLabel1->SetStyle(STYLE_TEXT_FONT, 30); remindLabel1->SetStyle(STYLE_LINE_HEIGHT, 35); - remindLabel1->SetText("窦性心率"); + remindLabel1->SetTextId(STR_SINUS_HR); remindLabel1->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); remindLabel1->SetRollSpeed(23); remindLabel1->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -117,7 +119,7 @@ namespace OHOS remindLabel2->SetPosition((HORIZONTAL_RESOLUTION - 400) / 2, remindLabel1->GetHeight() + remindLabel1->GetY(), 400, 35); remindLabel2->SetStyle(STYLE_TEXT_FONT, 30); remindLabel2->SetStyle(STYLE_LINE_HEIGHT, 35); - remindLabel2->SetText("可在APP上查看详细报告以上信息不作为临床诊断依据"); + remindLabel2->SetTextId(STR_APP_REPORT_NOT_CLIN); remindLabel2->SetTextColor(Color::GetColorFromRGBA(0xff, 0x3a, 0x3a, 0xff)); remindLabel2->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); remindLabel2->SetRollSpeed(23); diff --git a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestingView.cpp index f370542a7..a848232d7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestingView.cpp @@ -1,5 +1,6 @@ #include "ecg/include/EcgTestingView.h" #include "ecg/include/EcgPresenter.h" +#include "ui_resource_string.h" #include "wearable_log.h" namespace OHOS @@ -170,7 +171,7 @@ namespace OHOS reminderLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, TimeLabel->GetY() + TimeLabel->GetHeight() + 10, 300, 35); reminderLabel->SetStyle(STYLE_TEXT_FONT, 30); reminderLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - reminderLabel->SetText("测量时手指不要移开，身体保持静止"); + reminderLabel->SetTextId(STR_NO_FINGER_MOVE); reminderLabel->SetTextColor(Color::GetColorFromRGBA(0xff, 0x3a, 0x3a, 0xff)); reminderLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); reminderLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); diff --git a/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestAnalysisView.cpp b/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestAnalysisView.cpp index a5b85358a..b9938732f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestAnalysisView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestAnalysisView.cpp @@ -3,6 +3,7 @@ #include "wearable_log.h" #include "UiConfig.h" #include "common/image_cache_manager.h" +#include "ui_resource_string.h" namespace OHOS { @@ -142,7 +143,7 @@ namespace OHOS remindLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, 360, 300, 35); remindLabel->SetStyle(STYLE_TEXT_FONT, 30); remindLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - remindLabel->SetText("数据分析中，请耐心等待结果"); + remindLabel->SetTextId(STR_DATA_ANAL_WAIT); // remindLabel->SetTextColor(Color::GetColorFromRGBA(0xff, 0x3a, 0x3a, 0xff)); remindLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); remindLabel->SetRollSpeed(23); diff --git a/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestFailedNoValueView.cpp b/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestFailedNoValueView.cpp index 9d80d8b14..8f3a8e0fb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestFailedNoValueView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestFailedNoValueView.cpp @@ -1,6 +1,7 @@ #include "emotion/include/EmoTestFailedNoValueView.h" #include "emotion/include/EmoPresenter.h" #include "wearable_log.h" +#include "ui_resource_string.h" namespace OHOS { @@ -101,7 +102,7 @@ namespace OHOS resetTestBtn->SetStyle(STYLE_TEXT_FONT, 30); resetTestBtn->SetStyle(STYLE_LINE_HEIGHT, 35); resetTestBtn->SetAlign(TEXT_ALIGNMENT_CENTER); - resetTestBtn->SetText("重新测量"); + resetTestBtn->SetTextId(STR_RE_MEAS); resetTestBtn->SetViewId(EMO_RESET_TEST_BTN); resetTestBtn->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36); resetTestBtn->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); diff --git a/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestFailedNoWearingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestFailedNoWearingView.cpp index 944c821b8..f9df770e2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestFailedNoWearingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestFailedNoWearingView.cpp @@ -1,6 +1,7 @@ #include "emotion/include/EmoTestFailedNoWearingView.h" #include "emotion/include/EmoPresenter.h" #include "wearable_log.h" +#include "ui_resource_string.h" namespace OHOS { @@ -87,7 +88,7 @@ namespace OHOS remindLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, 100, 300, 35); remindLabel->SetStyle(STYLE_TEXT_FONT, 30); remindLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - remindLabel->SetText("请正确佩戴手表检测"); + remindLabel->SetTextId(STR_WEAR_WATCH_DET); remindLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); remindLabel->SetRollSpeed(23); remindLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -120,7 +121,7 @@ namespace OHOS resetTestBtn->SetStyle(STYLE_TEXT_FONT, 30); resetTestBtn->SetStyle(STYLE_LINE_HEIGHT, 35); resetTestBtn->SetAlign(TEXT_ALIGNMENT_CENTER); - resetTestBtn->SetText("重新测量"); + resetTestBtn->SetTextId(STR_RE_MEAS); resetTestBtn->SetViewId(EMORESETTESTBTN); resetTestBtn->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36); resetTestBtn->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); diff --git a/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestResultView.cpp index dcdda0705..9f1c59674 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestResultView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestResultView.cpp @@ -1,6 +1,7 @@ #include "emotion/include/EmoTestResultView.h" #include "emotion/include/EmoPresenter.h" #include "wearable_log.h" +#include "ui_resource_string.h" namespace OHOS { @@ -65,7 +66,7 @@ namespace OHOS titleLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, 50, 300, 35); titleLabel->SetStyle(STYLE_TEXT_FONT, 30); titleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - titleLabel->SetText("情绪"); + titleLabel->SetTextId(STR_EMOTION); titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); titleLabel->SetRollSpeed(23); titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -84,7 +85,7 @@ namespace OHOS emotionLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, 100, 300, 35); emotionLabel->SetStyle(STYLE_TEXT_FONT, 30); emotionLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - emotionLabel->SetText("愉悦"); + emotionLabel->SetTextId(STR_PLEASURE); emotionLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); emotionLabel->SetTextColor(Color::GetColorFromRGBA(0xff, 0x4c, 0x6b, 0x00)); emotionLabel->SetRollSpeed(23); @@ -104,7 +105,7 @@ namespace OHOS remindLabel->SetPosition((HORIZONTAL_RESOLUTION - 400) / 2, emotionLabel->GetHeight() + emotionLabel->GetY() + 100, 400, 35); remindLabel->SetStyle(STYLE_TEXT_FONT, 30); remindLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - remindLabel->SetText("既心情顾虑、忧虑不安又感到精神压抑、感情低落、心情沉闷，是一种复杂的负面情绪状态"); + remindLabel->SetTextId(STR_COMPLEX_NEG_EMO); remindLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); remindLabel->SetRollSpeed(23); remindLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); diff --git a/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestView.cpp b/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestView.cpp index 3639daee0..16b07d116 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestView.cpp @@ -1,6 +1,7 @@ #include "emotion/include/EmoPresenter.h" #include "emotion/include/EmoTestView.h" #include "wearable_log.h" +#include "ui_resource_string.h" namespace OHOS { @@ -65,7 +66,7 @@ namespace OHOS titleLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, 50, 300, 35); titleLabel->SetStyle(STYLE_TEXT_FONT, 30); titleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - titleLabel->SetText("情绪"); + titleLabel->SetTextId(STR_EMOTION); titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); titleLabel->SetRollSpeed(23); titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -117,7 +118,7 @@ namespace OHOS startEmotionTestButton->SetStyle(STYLE_TEXT_FONT, 30); startEmotionTestButton->SetStyle(STYLE_LINE_HEIGHT, 35); startEmotionTestButton->SetAlign(TEXT_ALIGNMENT_CENTER); - startEmotionTestButton->SetText("测量"); + startEmotionTestButton->SetTextId(STR_MEASURE); startEmotionTestButton->SetViewId(STARTEMOTIONTESTBUTTON); startEmotionTestButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff4c6b00); startEmotionTestButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); diff --git a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueMeasureView.h b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueMeasureView.h index 7c85f96a1..fbe97dbb6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueMeasureView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueMeasureView.h @@ -30,7 +30,7 @@ namespace OHOS UIImageView *error = nullptr; UILabelExt *titleLable = nullptr; UILabelExt *resultremindLable = nullptr; - UILabelButton *checkButton{nullptr}; + UILabelButtonExt *checkButton{nullptr}; UIViewGroup *group{nullptr}; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueWearView.h b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueWearView.h index 28bbdd55c..b20783a4c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueWearView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueWearView.h @@ -29,7 +29,7 @@ namespace OHOS private: UIImageView *error = nullptr; UILabelExt *titleLable = nullptr; - UILabelButton *checkButton{nullptr}; + UILabelButtonExt *checkButton{nullptr}; UIViewGroup *group{nullptr}; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueAnalysisView.cpp b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueAnalysisView.cpp index e92f22d34..3486025cb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueAnalysisView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueAnalysisView.cpp @@ -3,6 +3,7 @@ #include "wearable_log.h" #include "UiConfig.h" #include "common/image_cache_manager.h" +#include "ui_resource_string.h" namespace OHOS { @@ -144,7 +145,7 @@ namespace OHOS titleLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, 50, 300, 35); titleLabel->SetStyle(STYLE_TEXT_FONT, 30); titleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - titleLabel->SetText("疲劳度"); + titleLabel->SetTextId(STR_FATIGUE_LEVEL); titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); titleLabel->SetRollSpeed(23); titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -163,7 +164,7 @@ namespace OHOS remindLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, 360, 300, 35); remindLabel->SetStyle(STYLE_TEXT_FONT, 30); remindLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - remindLabel->SetText("数据分析中，请耐心等待结果"); + remindLabel->SetTextId(STR_DATA_ANAL_WAIT); remindLabel->SetTextColor(Color::White()); remindLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); remindLabel->SetRollSpeed(23); diff --git a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueMeasureView.cpp b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueMeasureView.cpp index 4e4363f1a..f17df75f4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueMeasureView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueMeasureView.cpp @@ -67,7 +67,7 @@ namespace OHOS */ bool FatigueMeasureView::AddButton() { - InitLabelButton(checkButton, 124, 352, 217, 63, "errorcheckButton", "测量", 35); + InitButtonExt(checkButton, 124, 352, 217, 63, "errorcheckButton", STR_MEASURE, 35); checkButton->SetViewId(STARTBUTTON_FATIGUE); checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff00cbf0); // 设置按键颜色 checkButton->SetTextColor(Color::White()); @@ -85,7 +85,7 @@ namespace OHOS bool FatigueMeasureView::InitLable() { - InitLabel(titleLable, 188, 30, 95, 45, "titleLable", "疲劳度", DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabelExt(titleLable, 188, 30, 95, 45, "titleLable", STR_FATIGUE_LEVEL, DEFAULT_VECTOR_FONT_FILENAME, 35); InitLabel(resultremindLable, 68, 239, 337, 100, "resultremindLable", "---", DEFAULT_VECTOR_FONT_FILENAME, 100); resultremindLable->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); resultremindLable->SetTextColor(Color::White()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueResultView.cpp index 9ed8f3b2a..89b0c390a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueResultView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueResultView.cpp @@ -69,7 +69,7 @@ namespace OHOS bool FatigueResultView::InitLable() { - InitLabel(titleLable, 200, 30, 70, 45, "titleLable", "疲劳度", DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabelExt(titleLable, 200, 30, 70, 45, "titleLable", STR_FATIGUE_LEVEL, DEFAULT_VECTOR_FONT_FILENAME, 35); InitLabel(resultremindLable, 68, 239, 337, 100, "resultremindLable", "30", DEFAULT_VECTOR_FONT_FILENAME, 100); resultremindLable->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); resultremindLable->SetTextColor(Color::White()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueUnderMeasureView.cpp b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueUnderMeasureView.cpp index 1679b5312..432c45aca 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueUnderMeasureView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueUnderMeasureView.cpp @@ -85,7 +85,7 @@ namespace OHOS bool FatigueUnderMeasureView::InitLable() { - InitLabel(titleLable, 188, 30, 95, 45, "titleLable", "疲劳度", DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabelExt(titleLable, 188, 30, 95, 45, "titleLable", STR_FATIGUE_LEVEL, DEFAULT_VECTOR_FONT_FILENAME, 35); InitLabel(resultremindLable, 68, 239, 337, 100, "resultremindLable", "---", DEFAULT_VECTOR_FONT_FILENAME, 100); resultremindLable->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); resultremindLable->SetTextColor(Color::White()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueWearView.cpp b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueWearView.cpp index 6c6dd377a..25244f35b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueWearView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueWearView.cpp @@ -62,7 +62,7 @@ namespace OHOS */ bool FatigueWearView::AddButton() { - InitLabelButton(checkButton, 124, 352, 217, 63, "errorcheckButton", "重新测量", 35); + InitButtonExt(checkButton, 124, 352, 217, 63, "errorcheckButton", STR_RE_MEAS, 35); checkButton->SetViewId(WEARBUTTON_FITIGUE); checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); // 设置按键颜色 checkButton->SetTextColor(Color::White()); @@ -80,7 +80,7 @@ namespace OHOS bool FatigueWearView::InitLable() { - InitLabel(titleLable, 87, 85, 272, 45, "titleLable", "请正确佩戴手表检测", DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabelExt(titleLable, 87, 85, 272, 45, "titleLable", STR_WEAR_WATCH_DET, DEFAULT_VECTOR_FONT_FILENAME, 35); /*初始化检测时间*/ group->Add(titleLable); diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp index 0ff95f0ae..772c37660 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp @@ -35,7 +35,7 @@ namespace OHOS { int index = 0; settings[index++] = {VIEW_SETTING, nullptr, STR_SETTINGS, false};//标题：设置 - #if defined(BOARD_W9) + #if defined(BOARD_W9)||1 settings[index++] = {VIEW_BLOOD_PRESSURE_CALIBRATION, PNG_APPLIST_BP_IMAGE, STR_BP_CALIBRATE, true};//血压检测 #endif settings[index++] = {VIEW_DISPLAY_BRIGHTNESS, PNG_SETTINGS_DISPLAY_BRIGHTNESS, STR_SCREEN_AND_BRIGHTNESS, true}; diff --git a/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressFailView.h b/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressFailView.h index c28e8e0ba..98865f761 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressFailView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressFailView.h @@ -28,7 +28,7 @@ namespace OHOS private: UIImageView *error = nullptr; UILabelExt *titleLable = nullptr; - UILabelButton *checkButton{nullptr}; + UILabelButtonExt *checkButton{nullptr}; UIViewGroup *group{nullptr}; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressMeasureView.h b/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressMeasureView.h index ba4d1b20c..fdaccd351 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressMeasureView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressMeasureView.h @@ -30,7 +30,7 @@ namespace OHOS UIImageView *error = nullptr; UILabelExt *titleLable = nullptr; UILabelExt *resultremindLable = nullptr; - UILabelButton *checkButton{nullptr}; + UILabelButtonExt *checkButton{nullptr}; UIViewGroup *group{nullptr}; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressWearView.h b/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressWearView.h index 60ec5a07d..cbe94bb0c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressWearView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressWearView.h @@ -29,7 +29,7 @@ namespace OHOS private: UIImageView *error = nullptr; UILabelExt *titleLable = nullptr; - UILabelButton *checkButton{nullptr}; + UILabelButtonExt *checkButton{nullptr}; UIViewGroup *group{nullptr}; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressAnalysisView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressAnalysisView.cpp index 2280ed5c0..85a3e5432 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressAnalysisView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressAnalysisView.cpp @@ -3,6 +3,8 @@ #include "wearable_log.h" #include "UiConfig.h" #include "common/image_cache_manager.h" +#include "ui_resource_string.h" + namespace OHOS { @@ -144,7 +146,7 @@ namespace OHOS titleLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, 50, 300, 35); titleLabel->SetStyle(STYLE_TEXT_FONT, 30); titleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - titleLabel->SetText("压力"); + titleLabel->SetTextId(STR_PRESSURE); titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); titleLabel->SetRollSpeed(23); titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -163,7 +165,7 @@ namespace OHOS remindLabel->SetPosition((HORIZONTAL_RESOLUTION - 300) / 2, 360, 300, 35); remindLabel->SetStyle(STYLE_TEXT_FONT, 30); remindLabel->SetStyle(STYLE_LINE_HEIGHT, 35); - remindLabel->SetText("数据分析中，请耐心等待结果"); + remindLabel->SetTextId(STR_DATA_ANAL_WAIT); remindLabel->SetTextColor(Color::GetColorFromRGBA(0xff, 0x3a, 0x3a, 0xff)); remindLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); remindLabel->SetRollSpeed(23); diff --git a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressFailView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressFailView.cpp index 19e60f2f8..c4cc8dcfe 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressFailView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressFailView.cpp @@ -63,7 +63,7 @@ namespace OHOS */ bool StressFailView::AddButton() { - InitLabelButton(checkButton, 124, 352, 217, 63, "errorcheckButton", "重新测量", 35); + InitButtonExt(checkButton, 124, 352, 217, 63, "errorcheckButton", STR_RE_MEAS, 35); checkButton->SetViewId(WEARBUTTON); checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); // 设置按键颜色 checkButton->SetTextColor(Color::White()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressMeasureView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressMeasureView.cpp index c18099529..60b2550ec 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressMeasureView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressMeasureView.cpp @@ -67,7 +67,7 @@ namespace OHOS */ bool StressMeasureView::AddButton() { - InitLabelButton(checkButton, 124, 352, 217, 63, "errorcheckButton", "测量", 35); + InitButtonExt(checkButton, 124, 352, 217, 63, "errorcheckButton", STR_MEASURE, 35); checkButton->SetViewId(STARTBUTTON); checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff7a22); // 设置按键颜色 checkButton->SetTextColor(Color::White()); @@ -85,7 +85,7 @@ namespace OHOS bool StressMeasureView::InitLable() { - InitLabel(titleLable, 200, 30, 70, 45, "titleLable", "压力", DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabelExt(titleLable, 200, 30, 70, 45, "titleLable", STR_PRESSURE, DEFAULT_VECTOR_FONT_FILENAME, 35); InitLabel(resultremindLable, 68, 239, 337, 100, "resultremindLable", "---", DEFAULT_VECTOR_FONT_FILENAME, 100); resultremindLable->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); resultremindLable->SetTextColor(Color::White()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressResultView.cpp index 84deb040b..959da9695 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressResultView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressResultView.cpp @@ -69,7 +69,7 @@ namespace OHOS bool StressResultView::InitLable() { - InitLabel(titleLable, 200, 30, 70, 45, "titleLable", "压力", DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabelExt(titleLable, 200, 30, 70, 45, "titleLable", STR_PRESSURE, DEFAULT_VECTOR_FONT_FILENAME, 35); InitLabel(resultremindLable, 68, 239, 337, 100, "resultremindLable", "30", DEFAULT_VECTOR_FONT_FILENAME, 100); resultremindLable->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); resultremindLable->SetTextColor(Color::White()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressUnderMeasureView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressUnderMeasureView.cpp index b2c25c92c..91d6f6f03 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressUnderMeasureView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressUnderMeasureView.cpp @@ -85,7 +85,7 @@ namespace OHOS bool StressUnderMeasureView::InitLable() { - InitLabel(titleLable, 200, 30, 70, 45, "titleLable", "压力", DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabelExt(titleLable, 200, 30, 70, 45, "titleLable", STR_PRESSURE, DEFAULT_VECTOR_FONT_FILENAME, 35); InitLabel(resultremindLable, 68, 239, 337, 100, "resultremindLable", "---", DEFAULT_VECTOR_FONT_FILENAME, 100); resultremindLable->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); resultremindLable->SetTextColor(Color::White()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressWearView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressWearView.cpp index a034bce71..1264cf842 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressWearView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressWearView.cpp @@ -62,7 +62,7 @@ namespace OHOS */ bool StressWearView::AddButton() { - InitLabelButton(checkButton, 124, 352, 217, 63, "errorcheckButton", "重新测量", 35); + InitButtonExt(checkButton, 124, 352, 217, 63, "errorcheckButton", STR_RE_MEAS, 35); checkButton->SetViewId(WEARBUTTON); checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); // 设置按键颜色 checkButton->SetTextColor(Color::White()); @@ -80,7 +80,7 @@ namespace OHOS bool StressWearView::InitLable() { - InitLabel(titleLable, 87, 85, 272, 45, "titleLable", "请正确佩戴手表检测", DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabelExt(titleLable, 87, 85, 272, 45, "titleLable", STR_WEAR_WATCH_DET, DEFAULT_VECTOR_FONT_FILENAME, 35); /*初始化检测时间*/ group->Add(titleLable); 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 1bf0019ac..cc0fdf73f 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 6b6ba1fe7..02f4aa83e 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 @@ -654,7 +654,58 @@ enum UIResourceTextId : uint16_t { STR_DEEPSEEK = 641, STR_BP_CHECK = 642, STR_BP_CALIBRATE = 643, - STR_MAX_ID = 644, + STR_MEARURING = 644, + STR_MEASURING_KEEP_STILL = 645, + STR_RECALIBRATE = 646, + STR_CALIBRATION_DONE = 647, + STR_CALIBRATION_FAILED = 648, + STR_MEASUREMENT_DONE = 649, + STR_CALIBRATION_REMINDER = 650, + STR_USE_TRAD_SPHYGM = 651, + STR_CONFIRM = 652, + STR_CAL_RES_UPLOADED_30D = 653, + STR_RES_ANALYZING = 654, + STR_ANALYZING_DONT_EXIT = 655, + STR_FIRST_CAL_KEEP_STILL = 656, + STR_SECOND_CAL_KEEP_STILL = 657, + STR_ENTER_BP_READ = 658, + STR_SBP = 659, + STR_DBP = 660, + STR_NORMAL = 661, + STR_ELEVATED = 662, + STR_WARNING = 663, + STR_SBP_ELEVATED = 664, + STR_WARN_THRESH = 665, + STR_BP_WARN_CONSULT_DOC = 666, + STR_MEAS_FAILED = 667, + STR_CALIBRATING = 668, + STR_S = 669, + STR_PRESSURE = 670, + STR_WEAR_WATCH_DET = 671, + STR_RE_MEAS = 672, + STR_DATA_ANAL_WAIT = 673, + STR_EMOTION = 674, + STR_PLEASURE = 675, + STR_COMPLEX_NEG_EMO = 676, + STR_MEASURE = 677, + STR_FINGER_LEAD_PORT = 678, + STR_START_MEAS = 679, + STR_WEAR_TIGHT_FINGER_LEAD = 680, + STR_NO_FINGER_MOVE = 681, + STR_CONNECT_APP_4G = 682, + STR_FINGER_LEAD_TILL_VAL = 683, + STR_SINUS_HR = 684, + STR_APP_REPORT_NOT_CLIN = 685, + STR_FATIGUE_LVL = 686, + STR_BP_MODEL_2CAL = 687, + STR_RECAL_MONTHLY = 688, + STR_SAME_ARM_CALIB = 689, + STR_HYPERTENSIVE_PREPOST_CAL = 690, + STR_CALIB_POSTURE_GUIDE = 691, + STR_START_CAL = 692, + STR_CALIB_POSTURE_REQ = 693, + STR_FATIGUE_LEVEL = 694, + STR_MAX_ID = 695, }; // 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 7d4412586..88e97b113 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 42aac34ea..cc0fdf73f 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 b7caec622..02f4aa83e 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 @@ -678,7 +678,34 @@ enum UIResourceTextId : uint16_t { STR_WARN_THRESH = 665, STR_BP_WARN_CONSULT_DOC = 666, STR_MEAS_FAILED = 667, - STR_MAX_ID = 668, + STR_CALIBRATING = 668, + STR_S = 669, + STR_PRESSURE = 670, + STR_WEAR_WATCH_DET = 671, + STR_RE_MEAS = 672, + STR_DATA_ANAL_WAIT = 673, + STR_EMOTION = 674, + STR_PLEASURE = 675, + STR_COMPLEX_NEG_EMO = 676, + STR_MEASURE = 677, + STR_FINGER_LEAD_PORT = 678, + STR_START_MEAS = 679, + STR_WEAR_TIGHT_FINGER_LEAD = 680, + STR_NO_FINGER_MOVE = 681, + STR_CONNECT_APP_4G = 682, + STR_FINGER_LEAD_TILL_VAL = 683, + STR_SINUS_HR = 684, + STR_APP_REPORT_NOT_CLIN = 685, + STR_FATIGUE_LVL = 686, + STR_BP_MODEL_2CAL = 687, + STR_RECAL_MONTHLY = 688, + STR_SAME_ARM_CALIB = 689, + STR_HYPERTENSIVE_PREPOST_CAL = 690, + STR_CALIB_POSTURE_GUIDE = 691, + STR_START_CAL = 692, + STR_CALIB_POSTURE_REQ = 693, + STR_FATIGUE_LEVEL = 694, + STR_MAX_ID = 695, }; // 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 338212f90..88e97b113 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 70357300d..5e0f6dc33 100755 --- a/tools/language_tool/Language_xml/input_list_en.txt +++ b/tools/language_tool/Language_xml/input_list_en.txt @@ -667,4 +667,30 @@ STR_WARNING$Warning STR_SBP_ELEVATED$Elevated systolic blood pressure STR_WARN_THRESH$Warning threshold: XX STR_BP_WARN_CONSULT_DOC$Blood pressure has reached the warning threshold. Please monitor your condition closely. Consult a doctor if you feel unwell or as needed. -STR_MEAS_FAILED$Measurement failed \ No newline at end of file +STR_MEAS_FAILED$Measurement failed +STR_CALIBRATING$Calibrating... +STR_S$second +STR_PRESSURE$Pressure +STR_WEAR_WATCH_DET$lease wear the watch correctly for detection +STR_RE_MEAS$Re-measure +STR_DATA_ANAL_WAIT$Data analysis in progress, please wait for the result +STR_EMOTION$Emotion +STR_PLEASURE$Pleasure +STR_COMPLEX_NEG_EMO$A complex negative emotional state with worry, anxiety, depression, low mood and mental dullness +STR_MEASURE$Measure +STR_FINGER_LEAD_PORT$Please place your finger on the lead port during measurement. +STR_START_MEAS$Start measurement +STR_WEAR_TIGHT_FINGER_LEAD$Wear the watch tightly and place your finger on the lead port until the +STR_NO_FINGER_MOVE$Do not move your finger and keep still during measurement +STR_CONNECT_APP_4G$Please connect to APP or enable 4G network +STR_FINGER_LEAD_TILL_VAL$Place your finger on the lead port until the value appears during +STR_SINUS_HR$Sinus heart rate +STR_APP_REPORT_NOT_CLIN$Detailed reports are viewable on APP. Information is not for clinical +STR_FATIGUE_LVL$Fatigue level +STR_BP_MODEL_2CAL$1.Two calibration rounds are required to establish a blood pressure model. +STR_RECAL_MONTHLY$2.It is recommended to recalibrate monthly. +STR_SAME_ARM_CALIB$3.Please use the same arm for both calibration and actual blood pressure measurement. +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 diff --git a/tools/language_tool/Language_xml/input_list_zh.txt b/tools/language_tool/Language_xml/input_list_zh.txt index 55244e371..85c2e48de 100755 --- a/tools/language_tool/Language_xml/input_list_zh.txt +++ b/tools/language_tool/Language_xml/input_list_zh.txt @@ -666,5 +666,31 @@ STR_ELEVATED$偏高 STR_WARNING$预警 STR_SBP_ELEVATED$收缩压偏高 STR_WARN_THRESH$预警值:XX -STR_BP_WARN_CONSULT_DOC$血压达到预警值，请密切关注 自身情况，如有不适或必要时， 请询问医生。 -STR_MEAS_FAILED$测量失败 \ No newline at end of file +STR_BP_WARN_CONSULT_DOC$血压达到预警值，请密切关注 自身情况，如有不适或必要时， 请询问医生 +STR_MEAS_FAILED$测量失败 +STR_CALIBRATING$测量中... +STR_S$秒 +STR_PRESSURE$压力 +STR_WEAR_WATCH_DET$请正确佩戴手表检测 +STR_RE_MEAS$重新测量 +STR_DATA_ANAL_WAIT$数据分析中，请耐心等待结果 +STR_EMOTION$情绪 +STR_PLEASURE$愉悦 +STR_COMPLEX_NEG_EMO$既心情顾虑、忧虑不安又感到精神压抑、感情低落、心情沉闷，是一种复杂的负面情绪状态 +STR_MEASURE$测量 +STR_FINGER_LEAD_PORT$测量时，请把手指放在导联口 +STR_START_MEAS$开始测量 +STR_WEAR_TIGHT_FINGER_LEAD$请戴紧手表将手指放到导联口直到出值 +STR_NO_FINGER_MOVE$测量时手指不要移开，身体保持静止 +STR_CONNECT_APP_4G$请连接APP或开启4G网络 +STR_FINGER_LEAD_TILL_VAL$测量时，请把手指放在导联口直到出值 +STR_SINUS_HR$窦性心率 +STR_APP_REPORT_NOT_CLIN$可在APP上查看详细报告以上信息不作为临床诊断依据 +STR_FATIGUE_LEVEL$疲劳度 +STR_BP_MODEL_2CAL$1、建立血压模型需要进行两个轮次校准 +STR_RECAL_MONTHLY$2、建议每个月都重新校准 +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 diff --git a/tools/language_tool/Language_xml/language_custom.xlsx b/tools/language_tool/Language_xml/language_custom.xlsx index 729240cad..01baea4b4 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 b27e66f40..c7b600c8a 100755 --- a/tools/language_tool/Language_xml/language_en.xml +++ b/tools/language_tool/Language_xml/language_en.xml @@ -669,4 +669,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml index 02dec498b..82a2b23e8 100755 --- a/tools/language_tool/Language_xml/language_zh.xml +++ b/tools/language_tool/Language_xml/language_zh.xml @@ -667,6 +667,32 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang index 42aac34ea..cc0fdf73f 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 b7caec622..02f4aa83e 100755 --- a/tools/language_tool/font/ui_resource_string.h +++ b/tools/language_tool/font/ui_resource_string.h @@ -678,7 +678,34 @@ enum UIResourceTextId : uint16_t { STR_WARN_THRESH = 665, STR_BP_WARN_CONSULT_DOC = 666, STR_MEAS_FAILED = 667, - STR_MAX_ID = 668, + STR_CALIBRATING = 668, + STR_S = 669, + STR_PRESSURE = 670, + STR_WEAR_WATCH_DET = 671, + STR_RE_MEAS = 672, + STR_DATA_ANAL_WAIT = 673, + STR_EMOTION = 674, + STR_PLEASURE = 675, + STR_COMPLEX_NEG_EMO = 676, + STR_MEASURE = 677, + STR_FINGER_LEAD_PORT = 678, + STR_START_MEAS = 679, + STR_WEAR_TIGHT_FINGER_LEAD = 680, + STR_NO_FINGER_MOVE = 681, + STR_CONNECT_APP_4G = 682, + STR_FINGER_LEAD_TILL_VAL = 683, + STR_SINUS_HR = 684, + STR_APP_REPORT_NOT_CLIN = 685, + STR_FATIGUE_LVL = 686, + STR_BP_MODEL_2CAL = 687, + STR_RECAL_MONTHLY = 688, + STR_SAME_ARM_CALIB = 689, + STR_HYPERTENSIVE_PREPOST_CAL = 690, + STR_CALIB_POSTURE_GUIDE = 691, + STR_START_CAL = 692, + STR_CALIB_POSTURE_REQ = 693, + STR_FATIGUE_LEVEL = 694, + STR_MAX_ID = 695, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang index 338212f90..88e97b113 100755 Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ