优化等待定位界面UI

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 9dc2384..4777b2a 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,11 +46,11 @@ namespace OHOS
         scrollView1_->SetVisible(true);
 
         // 初始化Image - 警告图标
-        InitImageView(image1_, 193, 131, 80, 80, "image1", WARNING_IMAGE);
+        InitImageView(image1_, 193, 101, 80, 80, "image1", WARNING_IMAGE);
         scrollView1_->Add(image1_);
 
         // 初始化button - 去训练按钮
-        InitButtonExt(button_back, 118, 434, 230, 80, BUTTONTRAIN, STR_SET_TARGET, 30);
+        InitButtonExt(button_back, 118, 374, 230, 80, BUTTONTRAIN, STR_SET_TARGET, 30);
         if(ConfigModel::GetInstance()->GetLanguage() == 0)
             button_back->SetText("跳过优化");
         else
@@ -60,7 +60,7 @@ namespace OHOS
         button_back->SetOnClickListener(presenter_);
 
         // 初始化button - 去下载按钮
-        InitButtonExt(button_download, 118, 334, 230, 80, BUTTONDOWNLOAD, STR_EPHEMERIS_DOWNLOAD, 30);
+        InitButtonExt(button_download, 118, 274, 230, 80, BUTTONDOWNLOAD, STR_EPHEMERIS_DOWNLOAD, 30);
         if(ConfigModel::GetInstance()->GetLanguage() == 0)
             button_download->SetText("连接手机");
         else
@@ -72,14 +72,14 @@ namespace OHOS
 
         // 初始化Lable - 标题
         if(ConfigModel::GetInstance()->GetLanguage() == 0)
-            InitLabel(label1_, 133, 52, 200, 60, "label1", "定位优化", DEFAULT_VECTOR_FONT_FILENAME, 30);
+            InitLabel(label1_, 133, 22, 200, 60, "label1", "定位优化", DEFAULT_VECTOR_FONT_FILENAME, 30);
         else
-            InitLabel(label1_, 133, 52, 200, 60, "label1", "Opt Positioning", DEFAULT_VECTOR_FONT_FILENAME, 30);
+            InitLabel(label1_, 133, 22, 200, 60, "label1", "Opt Positioning", DEFAULT_VECTOR_FONT_FILENAME, 30);
         // 初始化Lable - 说明文字
         if(ConfigModel::GetInstance()->GetLanguage() == 0)
-            InitLabel(label2_, 33, 215, 400, 90, "label2", "连接手机可获得更快定位", DEFAULT_VECTOR_FONT_FILENAME, 30);
+            InitLabel(label2_, 33, 185, 400, 90, "label2", "连接手机可获得更快定位", DEFAULT_VECTOR_FONT_FILENAME, 30);
         else
-            InitLabel(label2_, 33, 215, 400, 90, "label2", "Connect Phone for Faster Positioning", DEFAULT_VECTOR_FONT_FILENAME, 30);
+            InitLabel(label2_, 33, 185, 400, 90, "label2", "Connect Phone for Faster Positioning", DEFAULT_VECTOR_FONT_FILENAME, 30);
 
         scrollView1_->Add(label1_);
         scrollView1_->Add(label2_);
@@ -89,7 +89,7 @@ namespace OHOS
         {
             image2_ = new UIImageView();
         }
-        image2_->SetPosition(181, 500);
+        image2_->SetPosition(181, 440);
         image2_->Resize(100, 100);
         image2_->SetViewId("image7");
         scrollView1_->Add(image2_);

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp
index 4ebfc2a..d438324 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp
@@ -59,11 +59,11 @@ namespace OHOS
         scrollView1_->SetVisible(true);
 
         // 初始化Image
-        InitImageView(image1_, 193, 111, 80, 80, "image1", WARNING_IMAGE);
+        InitImageView(image1_, 193, 96, 80, 80, "image1", WARNING_IMAGE);
         scrollView1_->Add(image1_);
 
         // 初始化button
-        InitButtonExt(button_wait, 118, 334, 230, 80, GPSBUTTONBACK, STR_SET_TARGET, 30);
+        InitButtonExt(button_wait, 118, 274, 230, 80, GPSBUTTONBACK, STR_SET_TARGET, 30);
         if(ConfigModel::GetInstance()->GetLanguage() == 0)
             button_wait->SetText("继续等待");
         else
@@ -73,7 +73,7 @@ namespace OHOS
         scrollView1_->Add(button_wait);
         button_wait->SetOnClickListener(presenter_);
 
-        InitButtonExt(button_go, 118, 434, 230, 80, GPSBUTTONGO, STR_SET_TARGET, 30);
+        InitButtonExt(button_go, 118, 374, 230, 80, GPSBUTTONGO, STR_SET_TARGET, 30);
         if(ConfigModel::GetInstance()->GetLanguage() == 0)
             button_go->SetText("直接开始");
         else
@@ -83,13 +83,13 @@ namespace OHOS
 
         // 初始化Lable
        if(ConfigModel::GetInstance()->GetLanguage() == 0)
-            InitLabel(label1_, 133, 52, 200, 60, "label1", "GPS未准备", DEFAULT_VECTOR_FONT_FILENAME, 30);
+            InitLabel(label1_, 133, 22, 200, 60, "label1", "GPS未准备", DEFAULT_VECTOR_FONT_FILENAME, 30);
         else
-            InitLabel(label1_, 133, 52, 200, 60, "label1", "GPS Not Ready", DEFAULT_VECTOR_FONT_FILENAME, 30);
+            InitLabel(label1_, 133, 22, 200, 60, "label1", "GPS Not Ready", DEFAULT_VECTOR_FONT_FILENAME, 30);
        if(ConfigModel::GetInstance()->GetLanguage() == 0)
-            InitLabel(label2_, 33, 215, 400, 90, "label2", "GPS仍在定位,建议等待定位 完成后再开始训练", DEFAULT_VECTOR_FONT_FILENAME, 30);
+            InitLabel(label2_, 33, 185, 400, 90, "label2", "GPS仍在定位,建议等待定位 完成后再开始训练", DEFAULT_VECTOR_FONT_FILENAME, 30);
         else
-            InitLabel(label2_, 33, 215, 400, 90, "label2", "GPS Still Locating, Suggest Waiting for Positioning to Complete Before Starting Training", DEFAULT_VECTOR_FONT_FILENAME, 30);
+            InitLabel(label2_, 33, 185, 400, 90, "label2", "GPS Still Locating, Suggest Waiting for Positioning to Complete Before Starting Training", DEFAULT_VECTOR_FONT_FILENAME, 30);
 
 
         scrollView1_->Add(label1_);
@@ -101,7 +101,7 @@ namespace OHOS
         {
             image2_ = new UIImageView();
         }
-        image2_->SetPosition(181, 500); // widget's left position and top position
+        image2_->SetPosition(181, 440); // widget's left position and top position
         image2_->Resize(100, 100);       // widget's width and height
         image2_->SetViewId("image7");    // Set style
         // Add to rootView