From 67ab2d3237eba5d80df2075bd669bdcf4d25b072 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Tue, 15 Oct 2024 20:00:38 +0800
Subject: [PATCH] =?utf8?q?=E7=B3=BB=E7=BB=9F=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?utf8?q?=E6=95=B0=E5=AD=97=E8=8B=B1=E8=AF=AD=E7=9A=84=E5=AD=97=E7=AC=A6?=
 =?utf8?q?=E4=B8=B2=E4=BD=BF=E7=94=A8=E9=BB=98=E8=AE=A4=E8=AF=AD=E8=A8=80?=
 =?utf8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=85=B6=E4=BB=96=E8=AF=AD=E8=A8=80?=
 =?utf8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=EF=BC=9B=E4=BF=AE=E6=94=B9?=
 =?utf8?q?=E9=83=A8=E5=88=86=E6=9C=AA=E9=80=82=E9=85=8D=E5=AD=97=E7=AC=A6?=
 =?utf8?q?=E4=B8=B2=E6=98=BE=E7=A4=BA=E9=BB=98=E8=AE=A4=E4=B8=AD=E6=96=87?=
 =?utf8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=88=87=E6=8D=A2=E8=AF=AD=E8=A8=80?=
 =?utf8?q?=E6=B6=88=E5=A4=B1=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/assistant/src/AssistantView.cpp     |  2 +-
 .../nativeui/heartrate/src/HeartChartView.cpp    | 16 ++++++++--------
 .../nativeui/saveele/src/SaveBatView.cpp         | 16 ++++++++--------
 .../fd230app/nativeui/sleep/src/SleepNapView.cpp |  7 ++++---
 .../nativeui/sleep/src/SleepTimeView.cpp         |  7 ++++---
 .../fd230app/nativeui/sleep/src/SleepView.cpp    | 10 ++++++----
 .../traing/training_card/src/TraingCardView.cpp  | 11 ++++++++---
 .../training_card/src/TrainingControlView.cpp    |  2 +-
 .../training_card/src/TrainingDataView.cpp       |  9 +++++----
 .../training_card/src/TrainingDetailView.cpp     |  8 +++++---
 .../src/notify/charge_notification.cpp           |  2 +-
 .../msg_center/src/notify/sleep_notification.cpp |  2 +-
 12 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantView.cpp b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantView.cpp
index 7e1849ce1..f91c6f512 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantView.cpp
@@ -87,7 +87,7 @@ void AssistantView::InitView() {
     AssistantScrollView[ASSISTANT_MAIN_VIEW]->SetStyle(STYLE_BACKGROUND_COLOR,
                                                        Color::Black().full);
     //初始化label TODO::多国语言
-    InitLabel(noteLabel, 53, 339, 360, 35, "label", "点击唤醒语音助手", DEFAULT_VECTOR_FONT_FILENAME, 30);
+    InitLabel(noteLabel, 53, 339, 360, 35, "label", "点击唤醒语音助手", DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
     //初始化button
     InitButton(wakeButton, 128, 91, 210, 210, WAKE_ASSISTANT);
     wakeButton->SetImageSrc(WAKE_IMAGE, WAKE_IMAGE);
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
index 0f584115c..7c832ae05 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
@@ -425,37 +425,37 @@ void HeartChartView::InitChartLabel() {
   uheart_->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));
   //上一次检测信息
   InitLabel(lastheart_, 53, 130, 360, 35, "label", "--",
-            DEFAULT_VECTOR_FONT_FILENAME, 30);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
   //最小心率 不居中
   InitLabelAdapt(minheart_, 293, 380, 200, 35, "label", "--",
-                 DEFAULT_VECTOR_FONT_FILENAME, 35);
+                 DEFAULT_VECTOR_FONT_FILENAME_EN, 35);
   //最大心率 不居中
   InitLabelAdapt(maxheart_, 158, 380, 200, 35, "label", "--",
-                 DEFAULT_VECTOR_FONT_FILENAME, 35);
+                 DEFAULT_VECTOR_FONT_FILENAME_EN, 35);
 
   //动态心率最大
   InitLabel(maxheart_dynamic_, 30, 190, 50, 20, "label", "220",
-            DEFAULT_VECTOR_FONT_FILENAME, 20);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 20);
   maxheart_dynamic_->SetTextColor(
       Color::GetColorFromRGBA(0x33, 0x33, 0x33, 0xff));
   //动态心率3/4
   InitLabel(maxheart_dynamic_3_, 30, 218, 50, 20, "label", "160",
-            DEFAULT_VECTOR_FONT_FILENAME, 20);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 20);
   maxheart_dynamic_3_->SetTextColor(
       Color::GetColorFromRGBA(0x33, 0x33, 0x33, 0xff));
   //动态心率2/4
   InitLabel(maxheart_dynamic_2_, 30, 247, 50, 20, "label", "110",
-            DEFAULT_VECTOR_FONT_FILENAME, 20);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 20);
   maxheart_dynamic_2_->SetTextColor(
       Color::GetColorFromRGBA(0x33, 0x33, 0x33, 0xff));
   //动态心率1/4
   InitLabel(maxheart_dynamic_1_, 30, 277, 50, 20, "label", "50",
-            DEFAULT_VECTOR_FONT_FILENAME, 20);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 20);
   maxheart_dynamic_1_->SetTextColor(
       Color::GetColorFromRGBA(0x33, 0x33, 0x33, 0xff));
   //动态心率最小
   InitLabel(minheart_dynamic_, 30, 306, 50, 20, "label", "0",
-            DEFAULT_VECTOR_FONT_FILENAME, 20);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 20);
   minheart_dynamic_->SetTextColor(
       Color::GetColorFromRGBA(0x33, 0x33, 0x33, 0xff));
 
diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatView.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatView.cpp
index 7cad67055..447a24c86 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatView.cpp
@@ -121,7 +121,7 @@ namespace OHOS
             opa = OPA_TRANSPARENT; // 如果处于无状态，设置为完全透明
         }
 
-        label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, fontSize);
+        label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, fontSize);
         label_->SetStyle(STYLE_TEXT_OPA, opa); // 更新标签样式
     }
 
@@ -160,7 +160,7 @@ namespace OHOS
         }
 
         // 更新标签的字体和样式
-        label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, fontSize);
+        label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, fontSize);
         label_->SetStyle(STYLE_TEXT_OPA, opa);
     }
 
@@ -296,7 +296,7 @@ namespace OHOS
 
         // 初始化标签文本和样式
         label_->SetText(" ");
-        label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE / 2); // 设置字体为一半大小
+        label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, LABEL_FONT_SIZE / 2); // 设置字体为一半大小
         label_->SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE);                       // 设置标签为不透明
     }
 
@@ -492,7 +492,7 @@ namespace OHOS
         batteryprogress->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
 
         batterylabel->SetPosition(228, 54, 200, 60);
-        batterylabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 26);
+        batterylabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 26);
         batterylabel->SetTextColor(Color::White());
         batteryprogress->SetForegroundStyle(STYLE_BACKGROUND_COLOR, 0xffffc300);
 
@@ -518,7 +518,7 @@ namespace OHOS
         timelabel->SetTextColor(Color::GetColorFromRGBA(0x49, 0xef, 0x13, 0xff));
         timelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         timelabel->SetRollSpeed(0);
-        timelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 100);
+        timelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 100);
         container_->Add(timelabel);
 
         /*日期*/
@@ -538,7 +538,7 @@ namespace OHOS
         datelabel->SetTextColor(Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff));
         datelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         datelabel->SetRollSpeed(0);
-        datelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+        datelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
         container_->Add(datelabel);
     }
     void SaveBatView::InitButtonView()
@@ -590,7 +590,7 @@ namespace OHOS
         curren_label->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         curren_label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         curren_label->SetRollSpeed(0);
-        curren_label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40);
+        curren_label->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 40);
         container_->Add(curren_label);
         curren_label->SetVisible(false);
 #if ANIMATION_TEST
@@ -647,7 +647,7 @@ namespace OHOS
         countlabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         countlabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         countlabel->SetRollSpeed(0);
-        countlabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40);
+        countlabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 40);
         container_->Add(countlabel);
         countlabel->SetVisible(false);
 #else
diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepNapView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepNapView.cpp
index 96d99c252..b229224e1 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepNapView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepNapView.cpp
@@ -94,8 +94,9 @@ bool SleepNapView::InitPage(void) {
   CreateLine(verticalline, 232, 191, 2, 82, "verticalline");
   /* -------------------------------- title初始化
    * -------------------------------- */
+  //TODO:多国语言
   InitLabel(naptitle, 83, 90, 300, 35, "resttitle", "小睡数据",
-            DEFAULT_VECTOR_FONT_FILENAME, 30);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
   InitLabelExt(napsleeptitle, 21, 203, 200, 35, "sleeptitle", STR_SLEEPTIME,
                DEFAULT_VECTOR_FONT_FILENAME, 30);
   InitLabelExt(napwaketitle, 213, 203, 300, 35, "waketitle", STR_WALKTIME,
@@ -107,11 +108,11 @@ bool SleepNapView::InitPage(void) {
    * ------------------------------- */
   napsleepStr = "--";
   InitLabel(napsleep, 10, 238, 230, 47, "sleeplabel", napsleepStr.c_str(),
-            DEFAULT_VECTOR_FONT_FILENAME, 40);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 40);
   napsleep->SetTextColor(Color::GetColorFromRGBA(0x53, 0x20, 0xE2, 0xff));
   napwakeStr = "--";
   InitLabel(napwake, 245, 238, 230, 47, "wakelabel", napwakeStr.c_str(),
-            DEFAULT_VECTOR_FONT_FILENAME, 40);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 40);
   napwake->SetTextColor(Color::GetColorFromRGBA(0x53, 0x20, 0xE2, 0xff));
   /* --------------------------------------------------------------------------
    */
diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp
index d26290426..292c1d135 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp
@@ -146,18 +146,19 @@ bool SleepTimeView::InitPage(void) {
   goaltime->SetTextColor(Color::Gray());
   /* ------------------------------- 数据label初始化
    * ------------------------------- */
+  //DEFAULT_VECTOR_FONT_FILENAME_EN
   restStr = "--";
   InitLabel(goal, 83, 90, 300, 50, "restlabel", restStr.c_str(),
-            DEFAULT_VECTOR_FONT_FILENAME, 40);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 40);
   // goal->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
   goal->SetTextColor(Color::Gray());
   sleepStr = "--";
   InitLabel(sleep, 10, 238, 230, 47, "sleeplabel", sleepStr.c_str(),
-            DEFAULT_VECTOR_FONT_FILENAME, 40);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 40);
   sleep->SetTextColor(Color::GetColorFromRGBA(0x53, 0x20, 0xE2, 0xff));
   wakeStr = "--";
   InitLabel(wake, 245, 238, 230, 47, "wakelabel", wakeStr.c_str(),
-            DEFAULT_VECTOR_FONT_FILENAME, 40);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 40);
   wake->SetTextColor(Color::GetColorFromRGBA(0x53, 0x20, 0xE2, 0xff));
 
   /* -------------------------------- 将组件添加到根视图
diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
index 3407cdd68..b45690e10 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
@@ -75,9 +75,10 @@ namespace OHOS
         // 更新时间  
         if (sleep_update_time != nullptr)  
         {  
-            std::string update_time = sleepModel.GetUpdateSleepTime();  
-            if (!update_time.empty()) // 检查返回值是否有效  
-            {  
+            std::string update_time = sleepModel.GetUpdateSleepTime();
+            if (!update_time.empty()) // 检查返回值是否有效
+            {
+                //TODO：多国语言
                 std::string update_time_str = update_time + " 更新"; // 拼接字符串  
                 sleep_update_time->SetText(update_time_str.c_str());  
                 // UpdateLabel(sleep_update_time, sleep_goal, STR_SLEEPMGOAL); // TODO: 多国语言支持  
@@ -162,7 +163,8 @@ namespace OHOS
         InitImageView(upiconimage, 213, 420, 40, 40, "image", upimagePath);
         InitImageView(progress_image, 28, 80, 100, 100, "image", prossimagePath);
         /*初始化目标时间*/
-        InitLabelExt(sleep_update_time, 83, 330, 300, 35, "lablegoal", STR_SLEEPMGOAL, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        //DEFAULT_VECTOR_FONT_FILENAME_EN
+        InitLabelExt(sleep_update_time, 83, 330, 300, 35, "lablegoal", STR_SLEEPMGOAL, DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
         sleep_update_time->SetTextColor(Color::Gray());
         /*初始化睡眠时间*/
         time_hour = new UILabel();
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 e16e5b5e9..32fc92413 100644
--- 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
@@ -479,8 +479,9 @@ void TraingCardView::ShowGetTagView() {
   InitRollLabel(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL,
                 DEFAULT_VECTOR_FONT_FILENAME, 30);
   getView->Add(labelgettag);
+  //DEFAULT_VECTOR_FONT_FILENAME_EN
   InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%",
-            DEFAULT_VECTOR_FONT_FILENAME, 30);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
   getView->Add(labelpre);
 
   // 初始化按键
@@ -517,9 +518,10 @@ void TraingCardView::ShowHeartView() {
 
   int maxheart = ConfigModel::GetInstance()->get_configData_int(
       ConfigModel::CONFIGMODEL_ITEM_TRAINING_HEART_MAX);
+  //TODO 多国语言
   std::string heartStr = "当前心率高于" + std::to_string(maxheart) + "次/分钟";
   InitLabel(labelnote, 53, 269, 360, 35, "label3", heartStr.c_str(),
-            DEFAULT_VECTOR_FONT_FILENAME, 30);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
   heartView->Add(labelnote);
 
   InitImageView(heartiamge, 193, 149, 80, 80, "note", WARNING_IMAGE);
@@ -593,8 +595,11 @@ void TraingCardView::InitImageAnimator() {
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
                 "tag[%d]-tagType[%d]-tagString[%s]\r\n", tag, tagType,
                 tagString.c_str());
+
+  //DEFAULT_VECTOR_FONT_FILENAME_EN
   InitLabel(labeltag, 70, 215, 326, 97, "label2", tagString.c_str(),
-            DEFAULT_VECTOR_FONT_FILENAME, 80);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 80);
+  
   labeltag->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff));
   getView->Add(labeltag);
 
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 342cd287d..9660fb5a0 100644
--- 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
@@ -61,7 +61,7 @@ void TrainingControlView::InitView() {
   InitLabelExt(labeltitle, 83, 50, 300, 35, "label1", STR_TRAINING_IN_PROGRESS,
                DEFAULT_VECTOR_FONT_FILENAME, 30);
   InitLabel(labeltimer, 45, 110, 360, 80, "label2", "00:00:00",
-            DEFAULT_VECTOR_FONT_FILENAME, 65);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 65);
   InitLabelExt(labelend, 81, 330, 130, 35, "label3", STR_FINISH,
                DEFAULT_VECTOR_FONT_FILENAME, 30);
   InitLabelExt(labelstop, 251, 330, 130, 35, "label4", STR_PAUSE,
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp
index 212bc3a24..8734a04f2 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp
@@ -77,13 +77,14 @@ bool TrainingDataView ::InitPage() {
                DEFAULT_VECTOR_FONT_FILENAME, 30);
   sportlabel->SetTextColor(Color::Gray());
 
+  //数字统一使用DEFAULT_VECTOR_FONT_FILENAME_EN
   InitLabel(curtimelabel, 155, 60, 150, 50, "label1", "23:54",
-            DEFAULT_VECTOR_FONT_FILENAME, 40);
-
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 40);
   InitLabel(timerlabel, 0, 163, 466, 150, "label3", "00:00:00",
-            DEFAULT_VECTOR_FONT_FILENAME, 80);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 80);
   InitLabel(heartlabel, 85, 284, 230, 80, "label4", "--",
-            DEFAULT_VECTOR_FONT_FILENAME, 60);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 60);
+  
   InitLabel(ubpmlabel, 218, 284, 230, 80, "label5", "bpm",
             DEFAULT_VECTOR_FONT_FILENAME, 60);
   ubpmlabel->SetTextColor(Color::Gray());
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 f078f693d..528eca306 100644
--- 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
@@ -62,12 +62,14 @@ bool TrainingDetailView ::InitPage() {
   u_stepslabel->SetTextColor(Color::Gray());
   u_calorielabel->SetTextColor(Color::Gray());
 
+  //数字统一使用DEFAULT_VECTOR_FONT_FILENAME_EN
   InitLabel(milelabel, 17, 160, 200, 80, "label6", "13.21",
-            DEFAULT_VECTOR_FONT_FILENAME, 65);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 65);
   InitLabel(calorielabel, 230, 160, 200, 80, "label7", "28312",
-            DEFAULT_VECTOR_FONT_FILENAME, 65);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 65);
   InitLabel(steplabel, 133, 285, 200, 80, "label8", "210.03",
-            DEFAULT_VECTOR_FONT_FILENAME, 65);
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 65);
+  
   Add(u_milelabel);
   Add(u_stepslabel);
   Add(u_calorielabel);
diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/charge_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/charge_notification.cpp
index 5facc50f2..5931d70a4 100644
--- a/code/sdk/application/wearable/service/msg_center/src/notify/charge_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/charge_notification.cpp
@@ -278,7 +278,7 @@ namespace OHOS
         UILabel_Chargeing->SetTextColor(Color::GetColorFromRGBA(0x4F, 0xC3, 0x4C, 0xff));
         UILabel_Chargeing->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         UILabel_Chargeing->SetRollSpeed(0);
-        UILabel_Chargeing->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+        UILabel_Chargeing->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
         UILabel_Chargeing->SetVisible(true);
 
 
diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/sleep_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/sleep_notification.cpp
index 76603aa65..39f2cb214 100644
--- a/code/sdk/application/wearable/service/msg_center/src/notify/sleep_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/sleep_notification.cpp
@@ -131,7 +131,7 @@ namespace OHOS
         // sleepnotifylabel->SetTextId(textId);
         sleepnotifylabel->SetText(sleep_note.c_str());
         sleepnotifylabel->SetTextColor(Color::Gray());
-        sleepnotifylabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+        sleepnotifylabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
         sleepnotifylabel->SetLineBreakMode(UILabel::LINE_BREAK_CLIP);             // 换行裁剪
         sleepnotifylabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); // 居中显示
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "sleepnotifylabel is ok");
-- 
2.17.1