修改星历相关文案

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 8b7cd60..f9bceac 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
@@ -112,7 +112,7 @@ std::string EphemerisDownloadModel::GetEphemerisValidityPeriod() {
                               std::to_string(hours) + "小时" +
                               std::to_string(minutes) + "分钟";
   } else {
-    ephemerisValidityPeriod = "无星历数据";
+    ephemerisValidityPeriod = "无优化数据";
   }
 #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 1291c18..c7b5d75 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
@@ -114,7 +114,7 @@ void EphemerisDownloadPresenter::UpdateDownloadStatus() {
         if(EphemerisDownloadModel::GetInstance().GetEphemerisDownloadProgress() == -1)
         {
             EphemerisDownloadView::GetInstance()->GetDownloadLabel()->SetText(
-                "ä¸\8bè½½失败");
+                "ä¼\98å\8c\96失败");
         }
         else if(EphemerisDownloadModel::GetInstance().GetEphemerisDownloadProgress() == 0)
         {
@@ -130,7 +130,7 @@ void EphemerisDownloadPresenter::UpdateDownloadStatus() {
             {
                 progress = 100;
             }
-            std::string progress_str = "æ­£å\9c¨ä¸\8bè½½"+std::to_string(progress)+"%";
+            std::string progress_str = "æ­£å\9c¨ä¼\98å\8c\96"+std::to_string(progress)+"%";
             EphemerisDownloadView::GetInstance()->GetDownloadLabel()->SetText(progress_str.c_str());
             //设置下载按键
             EphemerisDownloadView::GetInstance()->UpdateDownloadButton();
@@ -150,7 +150,7 @@ void EphemerisDownloadPresenter::UpdateDownloadStatus() {
     if (EphemerisDownloadView::GetInstance()) {
       if (EphemerisDownloadView::GetInstance()->GetDownloadLabel()) {
         EphemerisDownloadView::GetInstance()->GetDownloadLabel()->SetText(
-            "ä¸\8bè½½成功");
+            "ä¼\98å\8c\96成功");
         //设置下载按键
         EphemerisDownloadView::GetInstance()->UpdateDownloadButton();
       }
@@ -164,7 +164,7 @@ void EphemerisDownloadPresenter::UpdateDownloadStatus() {
   case EphemerisDownloadStatus::FAILED:
     if (EphemerisDownloadView::GetInstance()) {
       if (EphemerisDownloadView::GetInstance()->GetDownloadLabel()) {
-        EphemerisDownloadView::GetInstance()->GetDownloadLabel()->SetText("ä¸\8bè½½失败");
+        EphemerisDownloadView::GetInstance()->GetDownloadLabel()->SetText("ä¼\98å\8c\96失败");
       }
       //设置下载按键
       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 f48e202..9fcadbd 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
@@ -177,7 +177,7 @@ bool EphemerisDownloadView::EphemerisDownloadInit() {
 
     InitButtonExt(btnDownload_, 58, 320, 170, 90, DOWNLOAD_ID, STR_EPHEMERIS_DOWNLOAD, 30);
     btnDownload_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); // 设置按键颜色
-    btnDownload_->SetText("ä¸\8bè½½");
+    btnDownload_->SetText("ä¼\98å\8c\96");
     btnDownload_->SetOnClickListener(presenter_);
     InitButtonExt(btnBack_, 238, 320, 170, 90, BACK_ID, STR_CANCEL, 30);
     btnBack_->SetStyle(STYLE_BACKGROUND_COLOR, 0xffFF8A36); // 设置按键颜色
@@ -215,7 +215,7 @@ void EphemerisDownloadView::UpdateDownloadStatus() {
             EphemerisDownloadModel::GetInstance().SetEphemerisDownloadStatus(EphemerisDownloadStatus::DOWNLOADED);
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdateDownloadStatus: 同步状态为已下载");
         }
-        labelStatusValue_->SetText("数据有效");
+        labelStatusValue_->SetText("已优化");
     }
     else
     {
@@ -235,7 +235,7 @@ void EphemerisDownloadView::UpdateValidityPeriod() {
     
     std::string period = EphemerisDownloadModel::GetInstance().GetEphemerisValidityPeriod();
     if (period.empty()) {
-        labelValidityValue_->SetText("æ\97 æ\95°æ\8d®");
+        labelValidityValue_->SetText("æ\9cªä¼\98å\8c\96");
     } else {
         labelValidityValue_->SetText(period.c_str());
     }

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/saveele/src/SaveEleView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/saveele/src/SaveEleView.cpp
index 8aa33cf..52e1491 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/saveele/src/SaveEleView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/saveele/src/SaveEleView.cpp
@@ -74,6 +74,7 @@ void SaveEleView::InitView() {
   // TODO:多国语言\r
   InitLabelExt(labelnote, 53, 217, 360, 200, "labletitle", STR_SAVENOTE,\r
                DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+  labelnote->SetText("开启省电模式会关闭非必要的蓝牙连接，以及传感器监测等功能");\r
   labelnote->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
 \r
   InitLabelExt(labelkown, 53, labelnote->GetY() + labelnote->GetHeight() + 20,\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingItemView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingItemView.cpp
index 17580ce..e567953 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingItemView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingItemView.cpp
@@ -60,7 +60,12 @@ namespace OHOS
             Icon.SetSrc(itemInfo.icon);
             settingLabelExt.SetVisible(true);
             settingLabelExt.SetPosition(SETTINGLABELEXT_X, SETTINGLABELEXT_Y, SETTINGLABELEXT_W, SETTINGLABELEXT_H);
-            settingLabelExt.SetTextId(itemInfo.textId);
+            if(itemInfo.textId == STR_EPHEMERIS_DOWNLOAD){
+                settingLabelExt.SetText("定位优化");
+            }
+            else{
+                settingLabelExt.SetTextId(itemInfo.textId);
+            }
             settingLabelExt.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER);
             settingLabelButtonExt.SetVisible(true);
             SetHeight(120);
@@ -81,7 +86,12 @@ namespace OHOS
                 SetHeight(120);
             }
             settingLabelExt.SetPosition(SETTINGLABELEXT_X2, SETTINGLABELEXT_Y2, SETTINGLABELEXT_W2, SETTINGLABELEXT_H2);
-            settingLabelExt.SetTextId(itemInfo.textId);
+           if(itemInfo.textId == STR_EPHEMERIS_DOWNLOAD){
+                settingLabelExt.SetText("定位优化");
+            }
+            else{
+                settingLabelExt.SetTextId(itemInfo.textId);
+            }
             settingLabelExt.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             settingLabelButtonExt.SetVisible(false);
             SetTouchable(false);