更新训练Slice的多国语言配置

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
index a0e1a30..55a0a67 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
@@ -80,13 +80,13 @@ namespace OHOS
         InitLabel(labeltype, 188, 52, 90, 35, "label1", "健身类", DEFAULT_VECTOR_FONT_FILENAME, 30);
         InitLabel(labelsport, 147, 140, 240, 35, "label6", "健走", DEFAULT_VECTOR_FONT_FILENAME, 30);
         InitLabel(labelduration, 146, 179, 240, 40, "label7", "13:00:22-15:00:12", DEFAULT_VECTOR_FONT_FILENAME, 28);
-        InitLabel(labelutag, 146, 252, 240, 40, "label8", "目标完成度", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        InitLabel(labelutime, 146, 382, 240, 40, "label9", "训练时长", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        InitLabel(labelumile, 146, 512, 240, 40, "label10", "距离(米)", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        InitLabel(labeluheart, 146, 642, 240, 40, "label11", "平均心率(次/分)", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        InitLabel(labelusteps, 146, 772, 240, 40, "label12", "步数", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        InitLabel(labelustrong, 146, 902, 240, 40, "label2", "训练强度", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        InitLabel(labelnote, 80, 1024, 300, 40, "label8", "更多请前往APP查看", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labelutag, 146, 252, 240, 40, "label8",STR_GOAL_ACCOMPLISHMENT_DEGREE, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labelutime, 146, 382, 240, 40, "label9", STR_TRAINING_DURATION, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labelumile, 146, 512, 240, 40, "label10", STR_RANGE_MILE, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labeluheart, 146, 642, 240, 40, "label11",STR_MEAN_HEART_RATE_MIN, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labelusteps, 146, 772, 240, 40, "label12",STR_STEP_NUMBER, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labelustrong, 146, 902, 240, 40, "label2", STR_TRAINING_INTENSITY, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labelnote, 80, 1024, 300, 40, "label8", STR_MORE_APP, DEFAULT_VECTOR_FONT_FILENAME, 30);
 
         // 设置文本颜色
         labelduration->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f));
@@ -129,7 +129,7 @@ namespace OHOS
         scrollView_->Add(labelsteps);
 
         // 初始化button
-        InitButtonExt(buttonexit, 42, 1111, 380, 100, BUTTONBACK, STR_OFF, 30);
+        InitButtonExt(buttonexit, 42, 1111, 380, 100, BUTTONBACK, STR_CLOSE, 30);
         buttonexit->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingEnddataPresenter::GetInstance()));
         scrollView_->Add(buttonexit);
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
index 396ca94..42b483a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
@@ -61,10 +61,10 @@ namespace OHOS
         // 初始化Lable\r
         UIResourceTextId sportid = TraingModel::GetInstance()->GetSportEvent();\r
         InitLabelExt(labeltitle, 83, 50, 300, 35, "label1", sportid, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-        InitLabel(labelTime, 100, 150, 150, 35, "label2", "时长", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-        InitLabel(labelKcal, 100, 270, 150, 35, "label4", "卡路里", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-        InitLabel(labelDistance, 100, 390, 150, 35, "label3", "距离", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-        InitLabel(labelSteps, 100, 510, 150, 35, "label5", "步数", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabelExt(labelTime, 100, 150, 150, 35, "label2", STR_DURATION, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabelExt(labelKcal, 100, 270, 150, 35, "label4", STR_CALORIE, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabelExt(labelDistance, 100, 390, 150, 35, "label3", STR_DISTANCE, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabelExt(labelSteps, 100, 510, 150, 35, "label5", STR_STEP_NUMBER, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
 \r
         SetTagScrollView[SET_VIEW]->Add(labeltitle);\r
         SetTagScrollView[SET_VIEW]->Add(labelTime);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp
index 0797a65..b68c45d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp
@@ -175,7 +175,7 @@ namespace OHOS
         SetCaluliScrollView->SetVerticalScrollState(false); // 禁止垂直滑动
                                                             /* -------------------------------------------------------------------------- */
                                                             // 初始化Lable
-        InitLabel(labeltitle_, 83, 50, 300, 35, "label1", "卡路里(千卡)", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labeltitle_, 83, 50, 300, 35, "label1",STR_CALORIE_SETTING, DEFAULT_VECTOR_FONT_FILENAME, 30);
         SetCaluliScrollView->Add(labeltitle_);
 
         // 初始化UIPicker

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetMileView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetMileView.cpp
index 63d65fe..bc17316 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetMileView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetMileView.cpp
@@ -169,7 +169,7 @@ namespace OHOS
         SetMileScrollView->SetVerticalScrollState(false); // 禁止垂直滑动
         /* -------------------------------------------------------------------------- */
         // 初始化Lable
-        InitLabel(labeltitle_, 83, 50, 300, 35, "label1", "距离(公里)", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labeltitle_, 83, 50, 300, 35, "label1",STR_RANGE_SETTING, DEFAULT_VECTOR_FONT_FILENAME, 30);
         SetMileScrollView->Add(labeltitle_);
 
         // 初始化UIPicker

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetStepView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetStepView.cpp
index cdffebd..ad304e5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetStepView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetStepView.cpp
@@ -169,7 +169,7 @@ namespace OHOS
         SetStepScrollView->SetVerticalScrollState(false); // 禁止垂直滑动
         /* -------------------------------------------------------------------------- */
         // 初始化Lable
-        InitLabel(labeltitle_, 83, 50, 300, 35, "label1", "步数(步)", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labeltitle_, 83, 50, 300, 35, "label1", STR_STEP_SETTING, DEFAULT_VECTOR_FONT_FILENAME, 30);
         SetStepScrollView->Add(labeltitle_);
 
         // 初始化UIPicker

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetTimeView.cpp
index 188fe3b..e608c1d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetTimeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetTimeView.cpp
@@ -169,7 +169,7 @@ namespace OHOS
         SetTimeScrollView->SetVerticalScrollState(false); // 禁止垂直滑动
         /* -------------------------------------------------------------------------- */
         // 初始化Lable
-        InitLabel(labeltitle_, 83, 50, 300, 35, "label1", "时长(分钟)", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labeltitle_, 83, 50, 300, 35, "label1", STR_DURATION_SETTING, DEFAULT_VECTOR_FONT_FILENAME, 30);
         SetTimeScrollView->Add(labeltitle_);
 
         // 初始化UIPicker

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
index 89a8fa0..b320479 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
@@ -349,8 +349,8 @@ namespace OHOS
         endView->SetReboundSize(50);\r
         endView->SetDirection(1);\r
 \r
-        InitLabel(endtitle, 83, 50, 300, 35, "label1", "注意", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-        InitLabel(notelabel, 56, 167, 360, 80, "label2", "当前运动量过少，无法记录 是否结束运动", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabelExt(endtitle, 83, 50, 300, 35, "label1", STR_LOOK_OUT, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabelExt(notelabel, 56, 167, 360, 80, "label2", STR_INSUFFICIENT_EXERCISE_AMOUNT, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
 \r
         endView->Add(endtitle);\r
         endView->Add(notelabel);\r
@@ -385,9 +385,9 @@ namespace OHOS
         getView->SetDirection(1);\r
 \r
         // 初始化Lable\r
-        InitLabel(labeltitle, 83, 50, 300, 35, "label1", "目标已达成", DEFAULT_VECTOR_FONT_FILENAME, 35);\r
+        InitLabelExt(labeltitle, 83, 50, 300, 35, "label1",STR_GOAL_ACHIEVED, DEFAULT_VECTOR_FONT_FILENAME, 35);\r
         getView->Add(labeltitle);\r
-        InitLabel(labelgettag, 103, 307, 200, 35, "label3", "完成目标", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabelExt(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         getView->Add(labelgettag);\r
         InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         getView->Add(labelpre);\r
@@ -421,7 +421,7 @@ namespace OHOS
         heartView->SetDirection(1);\r
 \r
         // 初始化Lable\r
-        InitLabel(hearttitle, 83, 50, 300, 35, "label1", "心率提醒", DEFAULT_VECTOR_FONT_FILENAME, 35);\r
+        InitLabelExt(hearttitle, 83, 50, 300, 35, "label1", STR_HEARTTITLE, DEFAULT_VECTOR_FONT_FILENAME, 35);\r
         heartView->Add(hearttitle);\r
 \r
         int maxheart = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_TRAINING_HEART_MAX);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp
index 96dd998..916d78e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp
@@ -55,10 +55,10 @@ namespace OHOS
         Add(buttonStop);
 
         // 初始化Lable
-        InitLabel(labeltitle, 83, 50, 300, 35, "label1", "训练中", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labeltitle, 83, 50, 300, 35, "label1", STR_TRAINING_IN_PROGRESS, DEFAULT_VECTOR_FONT_FILENAME, 30);
         InitLabel(labeltimer, 78, 110, 290, 80, "label2", "00:00:00", DEFAULT_VECTOR_FONT_FILENAME, 65);
-        InitLabel(labelend, 81, 330, 130, 35, "label3", "结束", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        InitLabel(labelstop, 251, 330, 130, 35, "label4", "暂停", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labelend, 81, 330, 130, 35, "label3", STR_FINISH, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(labelstop, 251, 330, 130, 35, "label4", STR_PAUSE, DEFAULT_VECTOR_FONT_FILENAME, 30);
         Add(labeltitle);
         Add(labeltimer);
         Add(labelend);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp
index a687807..dd4b846 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp
@@ -46,9 +46,9 @@ namespace OHOS
         Add(lineimage2_);
 
         // 初始化Lable
-        InitLabel(u_milelabel, 16, 234, 220, 35, "label2", "距离(公里)", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        InitLabel(u_stepslabel, 73, 362, 320, 35, "label3", "步数", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        InitLabel(u_calorielabel, 225, 235, 230, 35, "label4", "卡路里（千卡）", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(u_milelabel, 16, 234, 220, 35, "label2",STR_RANGE_SETTING, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(u_stepslabel, 73, 362, 320, 35, "label3", STR_STEP_NUMBER, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(u_calorielabel, 225, 235, 230, 35, "label4",STR_CALORIE_SETTING, DEFAULT_VECTOR_FONT_FILENAME, 30);
         u_milelabel->SetTextColor(Color::Gray());
         u_stepslabel->SetTextColor(Color::Gray());
         u_calorielabel->SetTextColor(Color::Gray());