增加多国语言 1879/2 1879/head 1881/target/1
authorxue <2144439972@qq.com>
Mon, 23 Jun 2025 02:26:19 +0000 (10:26 +0800)
committerxue <2144439972@qq.com>
Mon, 23 Jun 2025 02:26:19 +0000 (10:26 +0800)
62 files changed:
code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationErrorView.h
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationMindView.h
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationPassView.h
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalPosReqView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationPassView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPResultAnalysisView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPSecUnderCalibrationView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPUnderCalibrationView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPValueView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectBeginView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectErrorView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFailView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFirstView.cpp
code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgResetTestOfSuccView.cpp
code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgStartTestView.cpp
code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestAnalysisView.cpp
code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestFailedNoValueView.cpp
code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestFailedNoWearingView.cpp
code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestNeedAppOrNetworkView.cpp
code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestReminderView.cpp
code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestResultView.cpp
code/sdk/application/wearable/fd230app/nativeui/ecg/src/EcgTestingView.cpp
code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestAnalysisView.cpp
code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestFailedNoValueView.cpp
code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestFailedNoWearingView.cpp
code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestResultView.cpp
code/sdk/application/wearable/fd230app/nativeui/emotion/src/EmoTestView.cpp
code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueMeasureView.h
code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueWearView.h
code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueAnalysisView.cpp
code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueMeasureView.cpp
code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueResultView.cpp
code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueUnderMeasureView.cpp
code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueWearView.cpp
code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
code/sdk/application/wearable/fd230app/nativeui/stress/include/StressFailView.h
code/sdk/application/wearable/fd230app/nativeui/stress/include/StressMeasureView.h
code/sdk/application/wearable/fd230app/nativeui/stress/include/StressWearView.h
code/sdk/application/wearable/fd230app/nativeui/stress/src/StressAnalysisView.cpp
code/sdk/application/wearable/fd230app/nativeui/stress/src/StressFailView.cpp
code/sdk/application/wearable/fd230app/nativeui/stress/src/StressMeasureView.cpp
code/sdk/application/wearable/fd230app/nativeui/stress/src/StressResultView.cpp
code/sdk/application/wearable/fd230app/nativeui/stress/src/StressUnderMeasureView.cpp
code/sdk/application/wearable/fd230app/nativeui/stress/src/StressWearView.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/en.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/ui_resource_string.h
code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/font/zh.lang
tools/language_tool/Language_xml/input_list_en.txt
tools/language_tool/Language_xml/input_list_zh.txt
tools/language_tool/Language_xml/language_custom.xlsx
tools/language_tool/Language_xml/language_en.xml
tools/language_tool/Language_xml/language_zh.xml
tools/language_tool/font/en.lang
tools/language_tool/font/ui_resource_string.h
tools/language_tool/font/zh.lang

index b7caec6..02f4aa8 100644 (file)
@@ -678,7 +678,34 @@ enum UIResourceTextId : uint16_t {
     STR_WARN_THRESH = 665,\r
     STR_BP_WARN_CONSULT_DOC = 666,\r
     STR_MEAS_FAILED = 667,\r
-    STR_MAX_ID = 668,\r
+    STR_CALIBRATING = 668,\r
+    STR_S = 669,\r
+    STR_PRESSURE = 670,\r
+    STR_WEAR_WATCH_DET = 671,\r
+    STR_RE_MEAS = 672,\r
+    STR_DATA_ANAL_WAIT = 673,\r
+    STR_EMOTION = 674,\r
+    STR_PLEASURE = 675,\r
+    STR_COMPLEX_NEG_EMO = 676,\r
+    STR_MEASURE = 677,\r
+    STR_FINGER_LEAD_PORT = 678,\r
+    STR_START_MEAS = 679,\r
+    STR_WEAR_TIGHT_FINGER_LEAD = 680,\r
+    STR_NO_FINGER_MOVE = 681,\r
+    STR_CONNECT_APP_4G = 682,\r
+    STR_FINGER_LEAD_TILL_VAL = 683,\r
+    STR_SINUS_HR = 684,\r
+    STR_APP_REPORT_NOT_CLIN = 685,\r
+    STR_FATIGUE_LVL = 686,\r
+    STR_BP_MODEL_2CAL = 687,\r
+    STR_RECAL_MONTHLY = 688,\r
+    STR_SAME_ARM_CALIB = 689,\r
+    STR_HYPERTENSIVE_PREPOST_CAL = 690,\r
+    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
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
index e0156af..6f22c71 100644 (file)
@@ -30,7 +30,7 @@ namespace OHOS
         UIImageView *error = nullptr;  
         UILabelExt *titleLable = nullptr;
         UILabelExt *resultremindLable = nullptr;
-        UILabelButton *checkButton{nullptr};
+        UILabelButtonExt *checkButton{nullptr};
         UIViewGroup *group{nullptr};
     };
 }
index 5896335..974883c 100644 (file)
@@ -29,7 +29,7 @@ namespace OHOS
         UIImageView *mind = nullptr;
         UILabelExt *titleLabel = nullptr;
         UILabelExt *mindLabel = nullptr;
-        UILabelButton *checkButton{nullptr};
+        UILabelButtonExt *checkButton{nullptr};
         UIViewGroup *group{nullptr};
     };
 }
index 917f475..6032438 100644 (file)
@@ -28,7 +28,7 @@ namespace OHOS
         UIImageView *pass = nullptr;  
         UILabelExt *titleLable = nullptr;
         UILabelExt *resultremindLable = nullptr;
-        UILabelButton *checkButton{nullptr};
+        UILabelButtonExt *checkButton{nullptr};
         UIViewGroup *group{nullptr};
     };
 }
index 99d8bad..61ea3a1 100644 (file)
@@ -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);
index 3c05a61..56f5ded 100644 (file)
@@ -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());
index 700f9ab..044746d 100644 (file)
@@ -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());
         /*初始化检测时间*/
index d7e6a19..6e2b763 100644 (file)
@@ -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());
         /*初始化检测时间*/
index 50ba9e3..4afc3a0 100644 (file)
@@ -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());
         /*初始化检测时间*/
index be0f390..e894758 100644 (file)
@@ -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);
index a4ff442..c24f9ba 100644 (file)
@@ -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);
 
index 4cb5ea0..1832d84 100644 (file)
@@ -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);
index 4b8d4a0..c895f63 100644 (file)
@@ -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);
         
index 83b6122..0398259 100644 (file)
@@ -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);
index 2cfcb54..2ffc5c2 100644 (file)
@@ -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);
 
index 10fe6ce..75b346d 100644 (file)
@@ -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); // 设置按键颜色
index ed95293..22ec4ed 100644 (file)
@@ -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);
index f4c7bbf..68c8ab4 100644 (file)
@@ -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);
index 9ae1ad1..111f48d 100644 (file)
@@ -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);
index 2644c4f..2f728c8 100644 (file)
@@ -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);
index 698ced6..12011a2 100644 (file)
@@ -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);
index 379a265..066592d 100644 (file)
@@ -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);
index eb926fa..42f9dff 100644 (file)
@@ -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);
index b57f8ff..0eadb2e 100644 (file)
@@ -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);
index 1230320..498734b 100644 (file)
@@ -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);
index f370542..a848232 100644 (file)
@@ -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);
index a5b8535..b993873 100644 (file)
@@ -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);
index 9d80d8b..8f3a8e0 100644 (file)
@@ -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);
index 944c821..f9df770 100644 (file)
@@ -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);
index dcdda07..9f1c596 100644 (file)
@@ -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);
index 3639dae..16b07d1 100644 (file)
@@ -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);
index 7c85f96..fbe97db 100644 (file)
@@ -30,7 +30,7 @@ namespace OHOS
         UIImageView *error = nullptr;  
         UILabelExt *titleLable = nullptr;
         UILabelExt *resultremindLable = nullptr;
-        UILabelButton *checkButton{nullptr};
+        UILabelButtonExt *checkButton{nullptr};
         UIViewGroup *group{nullptr};
     };
 }
index 28bbdd5..b20783a 100644 (file)
@@ -29,7 +29,7 @@ namespace OHOS
     private:
         UIImageView *error = nullptr;  
         UILabelExt *titleLable = nullptr;
-        UILabelButton *checkButton{nullptr};
+        UILabelButtonExt *checkButton{nullptr};
         UIViewGroup *group{nullptr};
     };
 }
index e92f22d..3486025 100644 (file)
@@ -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);
index 4e4363f..f17df75 100644 (file)
@@ -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());
index 9ed8f3b..89b0c39 100644 (file)
@@ -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());
index 1679b53..432c45a 100644 (file)
@@ -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());
index 6c6dd37..25244f3 100644 (file)
@@ -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);
 
index 0ff95f0..772c376 100644 (file)
@@ -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};
index c28e8e0..98865f7 100644 (file)
@@ -28,7 +28,7 @@ namespace OHOS
     private:
         UIImageView *error = nullptr;  
         UILabelExt *titleLable = nullptr;
-        UILabelButton *checkButton{nullptr};
+        UILabelButtonExt *checkButton{nullptr};
         UIViewGroup *group{nullptr};
     };
 }
index ba4d1b2..fdaccd3 100644 (file)
@@ -30,7 +30,7 @@ namespace OHOS
         UIImageView *error = nullptr;  
         UILabelExt *titleLable = nullptr;
         UILabelExt *resultremindLable = nullptr;
-        UILabelButton *checkButton{nullptr};
+        UILabelButtonExt *checkButton{nullptr};
         UIViewGroup *group{nullptr};
     };
 }
index 60ec5a0..cbe94bb 100644 (file)
@@ -29,7 +29,7 @@ namespace OHOS
     private:
         UIImageView *error = nullptr;  
         UILabelExt *titleLable = nullptr;
-        UILabelButton *checkButton{nullptr};
+        UILabelButtonExt *checkButton{nullptr};
         UIViewGroup *group{nullptr};
     };
 }
index 2280ed5..85a3e54 100644 (file)
@@ -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);
index 19e60f2..c4cc8dc 100644 (file)
@@ -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());
index c180995..60b2550 100644 (file)
@@ -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());
index 84deb04..959da96 100644 (file)
@@ -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());
index b2c25c9..91d6f6f 100644 (file)
@@ -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());
index a034bce..1264cf8 100644 (file)
@@ -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);
 
index 1bf0019..cc0fdf7 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
index 6b6ba1f..02f4aa8 100755 (executable)
@@ -654,7 +654,58 @@ enum UIResourceTextId : uint16_t {
     STR_DEEPSEEK = 641,\r
     STR_BP_CHECK = 642,\r
     STR_BP_CALIBRATE = 643,\r
-    STR_MAX_ID = 644,\r
+    STR_MEARURING = 644,\r
+    STR_MEASURING_KEEP_STILL = 645,\r
+    STR_RECALIBRATE = 646,\r
+    STR_CALIBRATION_DONE = 647,\r
+    STR_CALIBRATION_FAILED = 648,\r
+    STR_MEASUREMENT_DONE = 649,\r
+    STR_CALIBRATION_REMINDER = 650,\r
+    STR_USE_TRAD_SPHYGM = 651,\r
+    STR_CONFIRM = 652,\r
+    STR_CAL_RES_UPLOADED_30D = 653,\r
+    STR_RES_ANALYZING = 654,\r
+    STR_ANALYZING_DONT_EXIT = 655,\r
+    STR_FIRST_CAL_KEEP_STILL = 656,\r
+    STR_SECOND_CAL_KEEP_STILL = 657,\r
+    STR_ENTER_BP_READ = 658,\r
+    STR_SBP = 659,\r
+    STR_DBP = 660,\r
+    STR_NORMAL = 661,\r
+    STR_ELEVATED = 662,\r
+    STR_WARNING = 663,\r
+    STR_SBP_ELEVATED = 664,\r
+    STR_WARN_THRESH = 665,\r
+    STR_BP_WARN_CONSULT_DOC = 666,\r
+    STR_MEAS_FAILED = 667,\r
+    STR_CALIBRATING = 668,\r
+    STR_S = 669,\r
+    STR_PRESSURE = 670,\r
+    STR_WEAR_WATCH_DET = 671,\r
+    STR_RE_MEAS = 672,\r
+    STR_DATA_ANAL_WAIT = 673,\r
+    STR_EMOTION = 674,\r
+    STR_PLEASURE = 675,\r
+    STR_COMPLEX_NEG_EMO = 676,\r
+    STR_MEASURE = 677,\r
+    STR_FINGER_LEAD_PORT = 678,\r
+    STR_START_MEAS = 679,\r
+    STR_WEAR_TIGHT_FINGER_LEAD = 680,\r
+    STR_NO_FINGER_MOVE = 681,\r
+    STR_CONNECT_APP_4G = 682,\r
+    STR_FINGER_LEAD_TILL_VAL = 683,\r
+    STR_SINUS_HR = 684,\r
+    STR_APP_REPORT_NOT_CLIN = 685,\r
+    STR_FATIGUE_LVL = 686,\r
+    STR_BP_MODEL_2CAL = 687,\r
+    STR_RECAL_MONTHLY = 688,\r
+    STR_SAME_ARM_CALIB = 689,\r
+    STR_HYPERTENSIVE_PREPOST_CAL = 690,\r
+    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
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
index 7d44125..88e97b1 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
index 42aac34..cc0fdf7 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
index b7caec6..02f4aa8 100644 (file)
@@ -678,7 +678,34 @@ enum UIResourceTextId : uint16_t {
     STR_WARN_THRESH = 665,\r
     STR_BP_WARN_CONSULT_DOC = 666,\r
     STR_MEAS_FAILED = 667,\r
-    STR_MAX_ID = 668,\r
+    STR_CALIBRATING = 668,\r
+    STR_S = 669,\r
+    STR_PRESSURE = 670,\r
+    STR_WEAR_WATCH_DET = 671,\r
+    STR_RE_MEAS = 672,\r
+    STR_DATA_ANAL_WAIT = 673,\r
+    STR_EMOTION = 674,\r
+    STR_PLEASURE = 675,\r
+    STR_COMPLEX_NEG_EMO = 676,\r
+    STR_MEASURE = 677,\r
+    STR_FINGER_LEAD_PORT = 678,\r
+    STR_START_MEAS = 679,\r
+    STR_WEAR_TIGHT_FINGER_LEAD = 680,\r
+    STR_NO_FINGER_MOVE = 681,\r
+    STR_CONNECT_APP_4G = 682,\r
+    STR_FINGER_LEAD_TILL_VAL = 683,\r
+    STR_SINUS_HR = 684,\r
+    STR_APP_REPORT_NOT_CLIN = 685,\r
+    STR_FATIGUE_LVL = 686,\r
+    STR_BP_MODEL_2CAL = 687,\r
+    STR_RECAL_MONTHLY = 688,\r
+    STR_SAME_ARM_CALIB = 689,\r
+    STR_HYPERTENSIVE_PREPOST_CAL = 690,\r
+    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
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
index 338212f..88e97b1 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
index 7035730..5e0f6dc 100755 (executable)
@@ -667,4 +667,30 @@ STR_WARNING$Warning
 STR_SBP_ELEVATED$Elevated systolic blood pressure\r
 STR_WARN_THRESH$Warning threshold: XX\r
 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.\r
-STR_MEAS_FAILED$Measurement failed
\ No newline at end of file
+STR_MEAS_FAILED$Measurement failed\r
+STR_CALIBRATING$Calibrating...\r
+STR_S$second\r
+STR_PRESSURE$Pressure\r
+STR_WEAR_WATCH_DET$lease wear the watch correctly for detection\r
+STR_RE_MEAS$Re-measure\r
+STR_DATA_ANAL_WAIT$Data analysis in progress, please wait for the result\r
+STR_EMOTION$Emotion\r
+STR_PLEASURE$Pleasure\r
+STR_COMPLEX_NEG_EMO$A complex negative emotional state with worry, anxiety, depression, low mood and mental dullness\r
+STR_MEASURE$Measure\r
+STR_FINGER_LEAD_PORT$Please place your finger on the lead port during measurement.\r
+STR_START_MEAS$Start measurement\r
+STR_WEAR_TIGHT_FINGER_LEAD$Wear the watch tightly and place your finger on the lead port until the\r
+STR_NO_FINGER_MOVE$Do not move your finger and keep still during measurement\r
+STR_CONNECT_APP_4G$Please connect to APP or enable 4G network\r
+STR_FINGER_LEAD_TILL_VAL$Place your finger on the lead port until the value appears during\r
+STR_SINUS_HR$Sinus heart rate\r
+STR_APP_REPORT_NOT_CLIN$Detailed reports are viewable on APP. Information is not for clinical\r
+STR_FATIGUE_LVL$Fatigue level\r
+STR_BP_MODEL_2CAL$1.Two calibration rounds are required to establish a blood pressure model.\r
+STR_RECAL_MONTHLY$2.It is recommended to recalibrate monthly.\r
+STR_SAME_ARM_CALIB$3.Please use the same arm for both calibration and actual blood pressure measurement.\r
+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
index 55244e3..85c2e48 100755 (executable)
@@ -666,5 +666,31 @@ STR_ELEVATED$偏高
 STR_WARNING$预警\r
 STR_SBP_ELEVATED$收缩压偏高\r
 STR_WARN_THRESH$预警值:XX\r
-STR_BP_WARN_CONSULT_DOC$血压达到预警值,请密切关注 自身情况,如有不适或必要时, 请询问医生。\r
-STR_MEAS_FAILED$测量失败
\ No newline at end of file
+STR_BP_WARN_CONSULT_DOC$血压达到预警值,请密切关注 自身情况,如有不适或必要时, 请询问医生\r
+STR_MEAS_FAILED$测量失败\r
+STR_CALIBRATING$测量中...\r
+STR_S$秒\r
+STR_PRESSURE$压力\r
+STR_WEAR_WATCH_DET$请正确佩戴手表检测\r
+STR_RE_MEAS$重新测量\r
+STR_DATA_ANAL_WAIT$数据分析中,请耐心等待结果\r
+STR_EMOTION$情绪\r
+STR_PLEASURE$愉悦\r
+STR_COMPLEX_NEG_EMO$既心情顾虑、忧虑不安又感到精神压抑、感情低落、心情沉闷,是一种复杂的负面情绪状态\r
+STR_MEASURE$测量\r
+STR_FINGER_LEAD_PORT$测量时,请把手指放在导联口\r
+STR_START_MEAS$开始测量\r
+STR_WEAR_TIGHT_FINGER_LEAD$请戴紧手表将手指放到导联口直到出值\r
+STR_NO_FINGER_MOVE$测量时手指不要移开,身体保持静止\r
+STR_CONNECT_APP_4G$请连接APP或开启4G网络\r
+STR_FINGER_LEAD_TILL_VAL$测量时,请把手指放在导联口直到出值\r
+STR_SINUS_HR$窦性心率\r
+STR_APP_REPORT_NOT_CLIN$可在APP上查看详细报告以上信息不作为临床诊断依据\r
+STR_FATIGUE_LEVEL$疲劳度\r
+STR_BP_MODEL_2CAL$1、建立血压模型需要进行两个轮次校准\r
+STR_RECAL_MONTHLY$2、建议每个月都重新校准\r
+STR_SAME_ARM_CALIB$3、校准过程和实际血压测量请使用同一只手\r
+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
index 729240c..01baea4 100755 (executable)
Binary files a/tools/language_tool/Language_xml/language_custom.xlsx and b/tools/language_tool/Language_xml/language_custom.xlsx differ
index b27e66f..c7b600c 100755 (executable)
        <lanstr id="STR_WARN_THRESH" value="Warning threshold: XX"/>
        <lanstr id="STR_BP_WARN_CONSULT_DOC" value="Blood pressure has reached the warning threshold. Please monitor your condition closely. Consult a doctor if you feel unwell or as needed."/>
        <lanstr id="STR_MEAS_FAILED" value="Measurement failed"/>
+       <lanstr id="STR_CALIBRATING" value="Calibrating..."/>
+       <lanstr id="STR_S" value="second"/>
+       <lanstr id="STR_PRESSURE" value="Pressure"/>
+       <lanstr id="STR_WEAR_WATCH_DET" value="lease wear the watch correctly for detection"/>
+       <lanstr id="STR_RE_MEAS" value="Re-measure"/>
+       <lanstr id="STR_DATA_ANAL_WAIT" value="Data analysis in progress, please wait for the result"/>
+       <lanstr id="STR_EMOTION" value="Emotion"/>
+       <lanstr id="STR_PLEASURE" value="Pleasure"/>
+       <lanstr id="STR_COMPLEX_NEG_EMO" value="A complex negative emotional state with worry, anxiety, depression, low mood and mental dullness"/>
+       <lanstr id="STR_MEASURE" value="Measure"/>
+       <lanstr id="STR_FINGER_LEAD_PORT" value="Please place your finger on the lead port during measurement."/>
+       <lanstr id="STR_START_MEAS" value="Start measurement"/>
+       <lanstr id="STR_WEAR_TIGHT_FINGER_LEAD" value="Wear the watch tightly and place your finger on the lead port until the"/>
+       <lanstr id="STR_NO_FINGER_MOVE" value="Do not move your finger and keep still during measurement"/>
+       <lanstr id="STR_CONNECT_APP_4G" value="Please connect to APP or enable 4G network"/>
+       <lanstr id="STR_FINGER_LEAD_TILL_VAL" value="Place your finger on the lead port until the value appears during"/>
+       <lanstr id="STR_SINUS_HR" value="Sinus heart rate"/>
+       <lanstr id="STR_APP_REPORT_NOT_CLIN" value="Detailed reports are viewable on APP. Information is not for clinical"/>
+       <lanstr id="STR_FATIGUE_LVL" value="Fatigue level"/>
+       <lanstr id="STR_BP_MODEL_2CAL" value="1.Two calibration rounds are required to establish a blood pressure model."/>
+       <lanstr id="STR_RECAL_MONTHLY" value="2.It is recommended to recalibrate monthly."/>
+       <lanstr id="STR_SAME_ARM_CALIB" value="3.Please use the same arm for both calibration and actual blood pressure measurement."/>
+       <lanstr id="STR_HYPERTENSIVE_PREPOST_CAL" value="4.For hypertensive users under medication, please calibrate once before taking medication and once 3-4 hours after."/>
+       <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."/>
 </language>
index 02dec49..82a2b23 100755 (executable)
        <lanstr id="STR_WARNING" value="预警"/>
        <lanstr id="STR_SBP_ELEVATED" value="收缩压偏高"/>
        <lanstr id="STR_WARN_THRESH" value="预警值:XX"/>
-       <lanstr id="STR_BP_WARN_CONSULT_DOC" value="血压达到预警值,请密切关注 自身情况,如有不适或必要时, 请询问医生。"/>
+       <lanstr id="STR_BP_WARN_CONSULT_DOC" value="血压达到预警值,请密切关注 自身情况,如有不适或必要时, 请询问医生"/>
        <lanstr id="STR_MEAS_FAILED" value="测量失败"/>
+       <lanstr id="STR_CALIBRATING" value="测量中..."/>
+       <lanstr id="STR_S" value="秒"/>
+       <lanstr id="STR_PRESSURE" value="压力"/>
+       <lanstr id="STR_WEAR_WATCH_DET" value="请正确佩戴手表检测"/>
+       <lanstr id="STR_RE_MEAS" value="重新测量"/>
+       <lanstr id="STR_DATA_ANAL_WAIT" value="数据分析中,请耐心等待结果"/>
+       <lanstr id="STR_EMOTION" value="情绪"/>
+       <lanstr id="STR_PLEASURE" value="愉悦"/>
+       <lanstr id="STR_COMPLEX_NEG_EMO" value="既心情顾虑、忧虑不安又感到精神压抑、感情低落、心情沉闷,是一种复杂的负面情绪状态"/>
+       <lanstr id="STR_MEASURE" value="测量"/>
+       <lanstr id="STR_FINGER_LEAD_PORT" value="测量时,请把手指放在导联口"/>
+       <lanstr id="STR_START_MEAS" value="开始测量"/>
+       <lanstr id="STR_WEAR_TIGHT_FINGER_LEAD" value="请戴紧手表将手指放到导联口直到出值"/>
+       <lanstr id="STR_NO_FINGER_MOVE" value="测量时手指不要移开,身体保持静止"/>
+       <lanstr id="STR_CONNECT_APP_4G" value="请连接APP或开启4G网络"/>
+       <lanstr id="STR_FINGER_LEAD_TILL_VAL" value="测量时,请把手指放在导联口直到出值"/>
+       <lanstr id="STR_SINUS_HR" value="窦性心率"/>
+       <lanstr id="STR_APP_REPORT_NOT_CLIN" value="可在APP上查看详细报告以上信息不作为临床诊断依据"/>
+       <lanstr id="STR_FATIGUE_LEVEL" value="疲劳度"/>
+       <lanstr id="STR_BP_MODEL_2CAL" value="1、建立血压模型需要进行两个轮次校准"/>
+       <lanstr id="STR_RECAL_MONTHLY" value="2、建议每个月都重新校准"/>
+       <lanstr id="STR_SAME_ARM_CALIB" value="3、校准过程和实际血压测量请使用同一只手"/>
+       <lanstr id="STR_HYPERTENSIVE_PREPOST_CAL" value="4、若是高血压正在接受药物治疗的用户,请在服药前和服药后 3-4 小时,各进行校准一次"/>
+       <lanstr id="STR_CALIB_POSTURE_GUIDE" value="请将手表佩戴在左手手腕,手表和手腕之间仅限一指距离贴紧佩戴手表,测量前建议至少休息五分钟以上,双脚平放无交叉,双手手背朝上,手臂平放在桌子上,测量过程中尽量保持静止,呼吸均匀平衡。"/>
+       <lanstr id="STR_START_CAL" value="开始校准"/>
+       <lanstr id="STR_CALIB_POSTURE_REQ" value="校准姿势要求"/>
 </language>
index 42aac34..cc0fdf7 100755 (executable)
Binary files a/tools/language_tool/font/en.lang and b/tools/language_tool/font/en.lang differ
index b7caec6..02f4aa8 100755 (executable)
@@ -678,7 +678,34 @@ enum UIResourceTextId : uint16_t {
     STR_WARN_THRESH = 665,\r
     STR_BP_WARN_CONSULT_DOC = 666,\r
     STR_MEAS_FAILED = 667,\r
-    STR_MAX_ID = 668,\r
+    STR_CALIBRATING = 668,\r
+    STR_S = 669,\r
+    STR_PRESSURE = 670,\r
+    STR_WEAR_WATCH_DET = 671,\r
+    STR_RE_MEAS = 672,\r
+    STR_DATA_ANAL_WAIT = 673,\r
+    STR_EMOTION = 674,\r
+    STR_PLEASURE = 675,\r
+    STR_COMPLEX_NEG_EMO = 676,\r
+    STR_MEASURE = 677,\r
+    STR_FINGER_LEAD_PORT = 678,\r
+    STR_START_MEAS = 679,\r
+    STR_WEAR_TIGHT_FINGER_LEAD = 680,\r
+    STR_NO_FINGER_MOVE = 681,\r
+    STR_CONNECT_APP_4G = 682,\r
+    STR_FINGER_LEAD_TILL_VAL = 683,\r
+    STR_SINUS_HR = 684,\r
+    STR_APP_REPORT_NOT_CLIN = 685,\r
+    STR_FATIGUE_LVL = 686,\r
+    STR_BP_MODEL_2CAL = 687,\r
+    STR_RECAL_MONTHLY = 688,\r
+    STR_SAME_ARM_CALIB = 689,\r
+    STR_HYPERTENSIVE_PREPOST_CAL = 690,\r
+    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
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
index 338212f..88e97b1 100755 (executable)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ