修复英文，定位优化的UI重叠

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadModel.cpp
index f591ab8..81124e3 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadModel.cpp
@@ -115,15 +115,15 @@ std::string EphemerisDownloadModel::GetEphemerisValidityPeriod() {
                                   std::to_string(hours) + "小时" +
                                   std::to_string(minutes) + "分钟";
     else
-        ephemerisValidityPeriod = std::to_string(days) + " days " +
-                                  std::to_string(hours) + " hours " +
-                                  std::to_string(minutes) + " minutes";
+        ephemerisValidityPeriod = std::to_string(days) + " d " +
+                                  std::to_string(hours) + " h " +
+                                  std::to_string(minutes) + " m";
   } else {
     //根据语言选择显示格式
     if(ConfigModel::GetInstance()->GetLanguage() == 0)
         ephemerisValidityPeriod = "无优化数据";
     else
-        ephemerisValidityPeriod = "No optimization data";
+        ephemerisValidityPeriod = "No Opt Data";
   }
 #endif
   return ephemerisValidityPeriod;

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadPresenter.cpp
index 7397d4c..7fa2a9a 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadPresenter.cpp
@@ -158,7 +158,7 @@ void EphemerisDownloadPresenter::UpdateDownloadStatus() {
         if(ConfigModel::GetInstance()->GetLanguage() == 0)
             EphemerisDownloadView::GetInstance()->GetDownloadLabel()->SetText("优化成功");  
         else
-            EphemerisDownloadView::GetInstance()->GetDownloadLabel()->SetText("Optimization Successful");  
+            EphemerisDownloadView::GetInstance()->GetDownloadLabel()->SetText("Opt Success");  
         //设置下载按键
         EphemerisDownloadView::GetInstance()->UpdateDownloadButton();
       }
@@ -175,7 +175,7 @@ void EphemerisDownloadPresenter::UpdateDownloadStatus() {
         if(ConfigModel::GetInstance()->GetLanguage() == 0)
             EphemerisDownloadView::GetInstance()->GetDownloadLabel()->SetText("优化失败");  
         else
-            EphemerisDownloadView::GetInstance()->GetDownloadLabel()->SetText("Optimization Failed");  
+            EphemerisDownloadView::GetInstance()->GetDownloadLabel()->SetText("Opt Failed");  
       }
       //设置下载按键
       EphemerisDownloadView::GetInstance()->UpdateDownloadButton();

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadView.cpp
index db03eac..b0fae53 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadView.cpp
@@ -129,7 +129,7 @@ bool EphemerisDownloadView::EphemerisDownloadInit() {
     if(ConfigModel::GetInstance()->GetLanguage() == 0)
         labelStatus_->SetText("● 优化状态:");
     else
-        labelStatus_->SetText("● Optimization Status:");
+        labelStatus_->SetText("● Opt Status:");
     labelStatus_->SetTextColor(Color::Yellow());//黄色
     group->Add(labelStatus_);
 
@@ -139,7 +139,10 @@ bool EphemerisDownloadView::EphemerisDownloadInit() {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "labelStatusValue_ new failed");
         return false;
     }
-    labelStatusValue_->SetPosition(220, 120, 360, 70);
+    if(ConfigModel::GetInstance()->GetLanguage() == 0)
+        labelStatusValue_->SetPosition(220, 120, 360, 70);
+    else
+        labelStatusValue_->SetPosition(240, 120, 360, 70);
     labelStatusValue_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 28);
     labelStatusValue_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER);
     group->Add(labelStatusValue_);
@@ -156,7 +159,7 @@ bool EphemerisDownloadView::EphemerisDownloadInit() {
     if(ConfigModel::GetInstance()->GetLanguage() == 0)
         labelValidity_->SetText("● 有效期:");
     else
-        labelValidity_->SetText("● Expiration Date:");
+        labelValidity_->SetText("● Expiry Date:");
     labelValidity_->SetTextColor(Color::Green());//绿色
     group->Add(labelValidity_);
 
@@ -166,7 +169,10 @@ bool EphemerisDownloadView::EphemerisDownloadInit() {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "labelValidityValue_ new failed");
         return false;
     }
-    labelValidityValue_->SetPosition(220, 170, 360, 70);
+    if(ConfigModel::GetInstance()->GetLanguage() == 0)
+     labelValidityValue_->SetPosition(220, 170, 360, 70);
+    else
+     labelValidityValue_->SetPosition(250, 170, 360, 70);
     labelValidityValue_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 28);
     labelValidityValue_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER);
     group->Add(labelValidityValue_);
@@ -279,7 +285,7 @@ void EphemerisDownloadView::UpdateDownloadButton() {
             if(ConfigModel::GetInstance()->GetLanguage() == 0)
                 btnDownload_->SetText("点击优化");
             else
-                btnDownload_->SetText("Click to Optimize");
+                btnDownload_->SetText("Optimize");
             btnDownload_->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full); // 蓝色
             btnDownload_->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGBA(0xcc, 0x70, 0x00, 0xff).full, UIButton::PRESSED);
             break;

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp
index 1ea9123..05edf00 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp
@@ -1103,7 +1103,10 @@ namespace OHOS
         Title->SetStyle(STYLE_TEXT_FONT, 30);
 
         // Set additional property
-        Title->SetText("安装失败");
+        if(ConfigModel::GetInstance()->GetLanguage() == 0)
+            Title->SetText("安装失败");
+        else
+            Title->SetText("Install Failed");
           Title->SetTextId (STR_DIAL_FAIL_TITLE);
         Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
@@ -1165,7 +1168,10 @@ namespace OHOS
         Title->SetStyle(STYLE_TEXT_FONT, 30);
 
         // Set additional property
-        Title->SetText("传输失败");
+        if(ConfigModel::GetInstance()->GetLanguage() == 0)
+            Title->SetText("传输失败");
+        else
+            Title->SetText("Transfer Failed");
         Title->SetTextId (STR_MP3_FAIL_TITL);
         Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
@@ -1224,7 +1230,10 @@ namespace OHOS
         Title->SetStyle(STYLE_TEXT_FONT, 30);
 
         // Set additional property
-        Title->SetText("传输失败");
+        if(ConfigModel::GetInstance()->GetLanguage() == 0)
+            Title->SetText("传输失败");
+        else
+            Title->SetText("Transfer Failed");
         // Title->SetTextId (STR_MP3_FAIL_TITL);
         Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
@@ -1245,7 +1254,10 @@ namespace OHOS
         label_->SetStyle(STYLE_TEXT_FONT, 30);
 
         // Set additional property
-        label_->SetText("app安装失败，请退出或重新安装");
+        if(ConfigModel::GetInstance()->GetLanguage() == 0)
+            label_->SetText("app安装失败，请退出或重新安装");
+        else
+            label_->SetText("App install failed, please exit or reinstall");
         // label_->SetTextId(STR_MP3_FAIL_LABEL);
         label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
         label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff));
@@ -1284,7 +1296,10 @@ namespace OHOS
         Title->SetViewId("label1");
         Title->SetStyle(STYLE_TEXT_FONT, 30);
 
-        Title->SetText("正在优化定位速度");
+        if(ConfigModel::GetInstance()->GetLanguage() == 0)
+            Title->SetText("正在优化定位速度");
+        else
+            Title->SetText("Optimizing");
         Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         Title->SetRollSpeed(0);
@@ -1303,7 +1318,10 @@ namespace OHOS
         label_->Resize(345, 101);          
         label_->SetStyle(STYLE_TEXT_FONT, 30);
         // Set additional property
-        label_->SetText("请稍等...");
+        if(ConfigModel::GetInstance()->GetLanguage() == 0)
+            label_->SetText("请稍等...");
+        else
+            label_->SetText("Please wait...");
         label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
         label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff));
         label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
@@ -1329,7 +1347,10 @@ namespace OHOS
         Title->Resize(800, 88);          
         Title->SetStyle(STYLE_TEXT_FONT, 30);
 
-        Title->SetText("优化成功");
+        if(ConfigModel::GetInstance()->GetLanguage() == 0)
+            Title->SetText("优化成功");
+        else
+            Title->SetText("Opt Success");
         Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         Title->SetRollSpeed(0);
@@ -1351,7 +1372,10 @@ namespace OHOS
         label_->SetStyle(STYLE_TEXT_FONT, 30);
 
         // Set additional property
-        label_->SetText("优化成功，请稍等...");
+        if(ConfigModel::GetInstance()->GetLanguage() == 0)
+            label_->SetText("优化成功，请稍等...");
+        else
+            label_->SetText("Opt Success, Please wait...");
         label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
         label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff));
         label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
@@ -1404,7 +1428,10 @@ namespace OHOS
         Title->SetStyle(STYLE_TEXT_FONT, 30);
 
         // Set additional property
-        Title->SetText("优化失败");
+        if(ConfigModel::GetInstance()->GetLanguage() == 0)
+            Title->SetText("优化失败");
+        else
+            Title->SetText("Opt Failed");
         Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         Title->SetRollSpeed(0);
@@ -1423,7 +1450,10 @@ namespace OHOS
         label_->SetPosition(60, 281);         
         label_->Resize(345, 101);          
         label_->SetStyle(STYLE_TEXT_FONT, 30);
-        label_->SetText("优化失败,请重试");
+        if(ConfigModel::GetInstance()->GetLanguage() == 0)
+            label_->SetText("优化失败,请重试");
+        else
+            label_->SetText("Opt Failed, Please try again");
         label_->SetX((466 - label_->GetWidth()) / 2);