GPS UI修改

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testGPS.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testGPS.cpp
index 2a72143..d675dda 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testGPS.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testGPS.cpp
@@ -151,9 +151,9 @@ namespace OHOS
 
             if (getGnssServerStat()==1)
             {
-                label_1_GPS_on_or_off->SetText("GPSå·²å¼\80å\90¯");
+                label_1_GPS_on_or_off->SetText("GPSå¼\80");
             }else{
-                label_1_GPS_on_or_off->SetText("GPSå·²å\85³é\97­");
+                label_1_GPS_on_or_off->SetText("GPSå\85³");
             }
         }
     }
@@ -181,13 +181,13 @@ namespace OHOS
 
         LabelConfig Config = {
             .left = 50,
-            .top = 70,
-            .width = 60,
+            .top = 85,
+            .width = Screen::GetInstance().GetWidth()-80,
             .height = 35,
-            .fontSize = 30,
-            .lineHeigh = 35,
+            .fontSize = 20,
+            .lineHeigh = 25,
             .text = "",
-            .lineBreakMode = UILabel::LINE_BREAK_ADAPT,
+            .lineBreakMode = UILabel::LINE_BREAK_WRAP,
         };
         label_1_GPS_MSG= InitLabel(Config);
         if (label_1_GPS_MSG == nullptr)
@@ -199,10 +199,10 @@ namespace OHOS
 
         Config = {
             .left = 50,
-            .top = 320,
+            .top = 50,
             .width = 350,
-            .height = 35,
-            .fontSize = 30,
+            .height = 30,
+            .fontSize = 25,
             .lineHeigh = 35,
             .text = "",
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,
@@ -218,7 +218,7 @@ namespace OHOS
 
         ButtonConfig_ext_t buttonconfig;
         buttonconfig.x = 20;
-        buttonconfig.y = 380;
+        buttonconfig.y = 400;
         buttonconfig.w = 180;
         buttonconfig.h = 96;
         buttonconfig.label_x=40;
@@ -232,7 +232,7 @@ namespace OHOS
         //testcat1ScrollView->Add(button);
 
         buttonconfig.x = 220;
-        buttonconfig.y = 380;
+        buttonconfig.y = 400;
         buttonconfig.w = 180;
         buttonconfig.h = 96;
         buttonconfig.label_x=40;