更新星历流程文案

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 933f3c0..f48e202 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
@@ -106,7 +106,7 @@ bool EphemerisDownloadView::EphemerisDownloadInit() {
     }
     labelTitle_->SetPosition(83, 50, 300, 50);
     labelTitle_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
-    labelTitle_->SetText("星历下载");
+    labelTitle_->SetText("定位优化");
     labelTitle_->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
     labelTitle_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
     labelTitle_->SetTextColor(Color::White());
@@ -121,7 +121,7 @@ bool EphemerisDownloadView::EphemerisDownloadInit() {
     labelStatus_->SetPosition(50, 120, 360, 70);
     labelStatus_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
     labelStatus_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER);
-    labelStatus_->SetText("â\97\8f ä¸\8bè½½状态:");
+    labelStatus_->SetText("â\97\8f ä¼\98å\8c\96状态:");
     labelStatus_->SetTextColor(Color::Yellow());//黄色
     group->Add(labelStatus_);
 
@@ -225,7 +225,7 @@ void EphemerisDownloadView::UpdateDownloadStatus() {
             EphemerisDownloadModel::GetInstance().SetEphemerisDownloadStatus(EphemerisDownloadStatus::NOT_DOWNLOADED);
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdateDownloadStatus: 同步状态为未下载");
         }
-        labelStatusValue_->SetText("æ\9cªä¸\8bè½½");
+        labelStatusValue_->SetText("æ\9cªä¼\98å\8c\96");
     }
 }
 
@@ -250,18 +250,19 @@ void EphemerisDownloadView::UpdateDownloadButton() {
     switch (status) {
         case EphemerisDownloadStatus::NOT_DOWNLOADED:
         case EphemerisDownloadStatus::FAILED:
-            btnDownload_->SetText("ç\82¹å\87»ä¸\8bè½½");
+            btnDownload_->SetText("ç\82¹å\87»ä¼\98å\8c\96");
             btnDownload_->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full); // 蓝色
             btnDownload_->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGBA(0xcc, 0x70, 0x00, 0xff).full, UIButton::PRESSED);
             break;
         case EphemerisDownloadStatus::DOWNLOADING:
-            btnDownload_->SetText("ä¸\8bè½½中");
+            btnDownload_->SetText("ä¼\98å\8c\96中");
             btnDownload_->SetStyle(STYLE_BACKGROUND_COLOR, Color::Gray().full); // 灰色
             btnDownload_->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGBA(0x44, 0x44, 0x44, 0xff).full, UIButton::PRESSED);
             break;
         case EphemerisDownloadStatus::DOWNLOADED:
-            btnDownload_->SetText("已下载");
-            btnDownload_->SetStyle(STYLE_BACKGROUND_COLOR, Color::Green().full); // 绿色
+            btnDownload_->SetText("已优化");
+            // btnDownload_->SetStyle(STYLE_BACKGROUND_COLOR, Color::Green().full); // 绿色
+            btnDownload_->SetStyle(STYLE_BACKGROUND_COLOR, Color::Gray().full); // 灰色
             btnDownload_->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGBA(0x44, 0x44, 0x44, 0xff).full, UIButton::PRESSED);
             break;
     }

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNoteView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNoteView.cpp
index ab5aa54..27ba0af 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNoteView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNoteView.cpp
@@ -46,26 +46,26 @@ namespace OHOS
         scrollView1_->SetVisible(true);
 
         // 初始化Image - 警告图标
-        InitImageView(image1_, 193, 111, 80, 80, "image1", WARNING_IMAGE);
+        InitImageView(image1_, 193, 131, 80, 80, "image1", WARNING_IMAGE);
         scrollView1_->Add(image1_);
 
         // 初始化button - 去训练按钮
         InitButtonExt(button_back, 118, 434, 230, 80, BUTTONTRAIN, STR_SET_TARGET, 30);
-        button_back->SetText("去训练");
+        button_back->SetText("跳过优化");
         scrollView1_->Add(button_back);
         button_back->SetOnClickListener(presenter_);
 
         // 初始化button - 去下载按钮
         InitButtonExt(button_download, 118, 334, 230, 80, BUTTONDOWNLOAD, STR_EPHEMERIS_DOWNLOAD, 30);
-        button_download->SetText("去下载");
+        button_download->SetText("连接手机");
         button_download->SetStyle(STYLE_BACKGROUND_COLOR, 0xff4fc34c);
         scrollView1_->Add(button_download);
         button_download->SetOnClickListener(presenter_);
 
         // 初始化Lable - 标题
-        InitLabel(label1_, 133, 52, 200, 60, "label1", "星历未下载", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(label1_, 133, 52, 200, 60, "label1", "定位优化", DEFAULT_VECTOR_FONT_FILENAME, 30);
         // 初始化Lable - 说明文字
-        InitLabel(label2_, 33, 215, 400, 90, "label2", "星历数据未下载或已过期,建议先下载星历数据后再开始训练", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(label2_, 33, 215, 400, 90, "label2", "连接手机可获得更快定位", DEFAULT_VECTOR_FONT_FILENAME, 30);
 
         scrollView1_->Add(label1_);
         scrollView1_->Add(label2_);

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 b95edbc..1ea9123 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
@@ -1279,16 +1279,17 @@ namespace OHOS
         if (Title == nullptr) {
         Title = new UILabelExt();
         }
-        Title->SetPosition(158, 51);        
-        Title->Resize(800, 88);          
+        Title->SetPosition(108, 51);        
+        Title->Resize(300, 88);          
         Title->SetViewId("label1");
         Title->SetStyle(STYLE_TEXT_FONT, 30);
 
-        Title->SetText("æ\98\9få\8e\86ä¸\8b载中");
+        Title->SetText("æ­£å\9c¨ä¼\98å\8c\96å®\9aä½\8dé\80\9f度");
         Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         Title->SetRollSpeed(0);
         Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+        Title->SetX((466 - Title->GetWidth()) / 2);
 
         // Add to rootView
         UIViewGroup_transmitting->Add(Title);
@@ -1302,7 +1303,7 @@ namespace OHOS
         label_->Resize(345, 101);          
         label_->SetStyle(STYLE_TEXT_FONT, 30);
         // Set additional property
-        label_->SetText("正在下载星历，请不要做其他操作或关闭手表");
+        label_->SetText("请稍等...");
         label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
         label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff));
         label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
@@ -1328,7 +1329,7 @@ namespace OHOS
         Title->Resize(800, 88);          
         Title->SetStyle(STYLE_TEXT_FONT, 30);
 
-        Title->SetText("星历下载成功");
+        Title->SetText("优化成功");
         Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         Title->SetRollSpeed(0);
@@ -1350,7 +1351,7 @@ namespace OHOS
         label_->SetStyle(STYLE_TEXT_FONT, 30);
 
         // Set additional property
-        label_->SetText("星历下载成功，请稍等...");
+        label_->SetText("优化成功，请稍等...");
         label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
         label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff));
         label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
@@ -1403,7 +1404,7 @@ namespace OHOS
         Title->SetStyle(STYLE_TEXT_FONT, 30);
 
         // Set additional property
-        Title->SetText("星历下载失败");
+        Title->SetText("优化失败");
         Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         Title->SetRollSpeed(0);
@@ -1422,7 +1423,7 @@ namespace OHOS
         label_->SetPosition(60, 281);         
         label_->Resize(345, 101);          
         label_->SetStyle(STYLE_TEXT_FONT, 30);
-        label_->SetText("星历下载失败,请重新下载");
+        label_->SetText("优化失败,请重试");
         label_->SetX((466 - label_->GetWidth()) / 2);