From: snickersun <scy@incartech.cn>
Date: Wed, 2 Sep 2020 10:32:06 +0000 (+0800)
Subject: release V47
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=ad4a6e2c451c368d8eb7bd47abfcf8208c2e2a8c;p=factoryMode.git

release V47
GPS界面修改支持中英文多语言
---

diff --git a/app/release/FactoryMode_V46_202009021811_release.apk b/app/release/FactoryMode_V47_202009021830_release.apk
similarity index 80%
rename from app/release/FactoryMode_V46_202009021811_release.apk
rename to app/release/FactoryMode_V47_202009021830_release.apk
index 85b1021..c38957a 100644
Binary files a/app/release/FactoryMode_V46_202009021811_release.apk and b/app/release/FactoryMode_V47_202009021830_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 07cebe4..6cbb6bd 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":46,"versionName":"202009021811","enabled":true,"outputFile":"FactoryMode_V46_202009021811_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V46_202009021811_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":47,"versionName":"202009021830","enabled":true,"outputFile":"FactoryMode_V47_202009021830_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V47_202009021830_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/mobile/miki/GPSActivity.java b/app/src/main/java/mobile/miki/GPSActivity.java
index d653a53..4b412b3 100644
--- a/app/src/main/java/mobile/miki/GPSActivity.java
+++ b/app/src/main/java/mobile/miki/GPSActivity.java
@@ -216,8 +216,8 @@ public class GPSActivity extends BaseActivity  {
                     "Fixed ":"notFixed ").append(getLocalTime2()).toString();
             String satlites=new StringBuilder("used ").append(gps_status_show.used_gps_numbs).append(" in ")
                     .append(gps_status_show.numSatelliteList.size()).append("/ inMap ").append(gps_status_show.satlite_numbss).toString();
-            String locationTime=new StringBuilder().append(gps_status_show.search_time_cost).append("秒").toString();
-            String hdop=new StringBuilder().append(String.valueOf(gps_status_show.hdop)).append("ç±³").toString();
+            String locationTime=new StringBuilder().append(gps_status_show.search_time_cost).append(" ").append(getResources().getString(R.string.seconds)).toString();
+            String hdop=new StringBuilder().append(String.valueOf(gps_status_show.hdop)).append(" ").append(getResources().getString(R.string.meter)).toString();
             mFix.setText(fixed);
             if (mFix.getText().toString().contains("notFixed")){
                 mFix.setBackgroundColor(Color.RED);
diff --git a/app/src/main/res/layout/gps_full_test_activity.xml b/app/src/main/res/layout/gps_full_test_activity.xml
index c8307e0..20f6684 100644
--- a/app/src/main/res/layout/gps_full_test_activity.xml
+++ b/app/src/main/res/layout/gps_full_test_activity.xml
@@ -10,7 +10,7 @@
     <TextView
         android:id="@+id/ic_lc_fix_name"
         style="@style/IcTextStyle"
-        android:text="GPS状态:"
+        android:text="@string/gps_full_title"
         android:textSize="15sp" />
 
     <TextView
@@ -24,7 +24,7 @@
         android:id="@+id/ic_lc_star_name"
         style="@style/IcTextStyle"
         android:layout_below="@id/ic_lc_fix_name"
-        android:text="星数:"
+        android:text="@string/gps_star_count"
         android:textSize="15sp" />
 
     <TextView
@@ -39,7 +39,7 @@
         android:id="@+id/ic_lc_hoop_name"
         style="@style/IcTextStyle"
         android:layout_below="@id/ic_lc_star_name"
-        android:text="精度:"
+        android:text="@string/gps_dop"
         android:textSize="15sp" />
 
     <TextView
@@ -58,7 +58,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/ic_lc_hoop_name"
-        android:text="扫描时间:"
+        android:text="@string/gps_scan_time"
         android:textSize="15sp" />
 
     <TextView
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 48d39e2..634c1fb 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -881,4 +881,11 @@
 
     <string name="open_dialer">正在打开通话界面，请稍后。。。</string>
 
+    <string name="gps_full_title">GPS状态:</string>
+    <string name="gps_star_count">星数:</string>
+    <string name="gps_dop">精度:</string>
+    <string name="gps_scan_time">扫描时间:</string>
+
+    <string name="seconds">秒</string>
+    <string name="meter">ç±³</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8f87ad1..efbb6c1 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -902,6 +902,14 @@
 
     <string name="no_heartrate">无心率设备!</string>
 
+
+    <string name="gps_full_title">GPS状态:</string>
+    <string name="gps_star_count">星数:</string>
+    <string name="gps_dop">精度:</string>
+    <string name="gps_scan_time">扫描时间:</string>
+
+    <string name="seconds">秒</string>
+    <string name="meter">ç±³</string>
     <!-- add end -->
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dcddf87..ddf94b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -920,4 +920,13 @@
     <string name="no_heartrate">No HeartRate device found!</string>
 
     <string name="hall">hall</string>
+
+
+    <string name="gps_full_title">GPS Stat:</string>
+    <string name="gps_star_count">Stars:</string>
+    <string name="gps_dop">Dop:</string>
+    <string name="gps_scan_time">Cost:</string>
+    <string name="seconds">Seconds</string>
+    <string name="meter">Meters</string>
+
 </resources>
diff --git a/app/version_code.properties b/app/version_code.properties
index 6fea2fa..dbaba4f 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Sep 02 18:11:47 CST 2020
-VERSION_CODE=46
+#Wed Sep 02 18:30:55 CST 2020
+VERSION_CODE=47