From: TrillGates <williamtrillgates@gmail.com>
Date: Sat, 22 May 2021 01:30:45 +0000 (+0800)
Subject: fixed ui text and publish version FactoryMode_V96_202105212033_release
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=08e85e3d9d5f880ddd62644db26f66f869f2bcb9;p=factoryMode.git

fixed ui text and publish version FactoryMode_V96_202105212033_release
---

diff --git a/app/release/FactoryMode_V96_202105212033_release.apk b/app/release/FactoryMode_V96_202105212033_release.apk
new file mode 100644
index 0000000..71040da
Binary files /dev/null and b/app/release/FactoryMode_V96_202105212033_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 19a5567..757f86d 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":93,"versionName":"202103201204","enabled":true,"outputFile":"FactoryMode_V93_202103201204_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V93_202103201204_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":96,"versionName":"202105212033","enabled":true,"outputFile":"FactoryMode_V96_202105212033_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V96_202105212033_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/mobile/miki/mainui/TestMainList.java b/app/src/main/java/mobile/miki/mainui/TestMainList.java
index 2babe78..b623f12 100644
--- a/app/src/main/java/mobile/miki/mainui/TestMainList.java
+++ b/app/src/main/java/mobile/miki/mainui/TestMainList.java
@@ -57,10 +57,11 @@ public class TestMainList extends BaseActivity implements OnClickListener {
 		// TODO Auto-generated method stub
 		super.onCreate(savedInstanceState);
 		MyApplication.getInstance().addActivity(this);
-		if(FTUtils.isGT09()){
+		if (FTUtils.isGT09()) {
 			setContentView(R.layout.dig_layout_testlist_280);
-		}else
-		setContentView(R.layout.dig_layout_testlist);
+		} else {
+			setContentView(R.layout.dig_layout_testlist);
+		}
 
 		pcbatest = (LinearLayout) findViewById(R.id.pcba_test);
 		moblietest = (LinearLayout) findViewById(R.id.moblie_test);
diff --git a/app/src/main/java/mobile/miki/shutdown_activity.java b/app/src/main/java/mobile/miki/shutdown_activity.java
index 61e10ff..70acc20 100644
--- a/app/src/main/java/mobile/miki/shutdown_activity.java
+++ b/app/src/main/java/mobile/miki/shutdown_activity.java
@@ -35,7 +35,7 @@ public class shutdown_activity extends BaseActivity {
     private void setclicklistener(boolean b) {
         btn_yes = (ImageButton) findViewById(R.id.btn_yes);
         btn_no = (ImageButton) findViewById(R.id.btn_no);
-        if (b == true) {
+        if (b) {
             btn_yes.setClickable(true);
             btn_yes.setEnabled(true);
             btn_yes.setOnClickListener(new View.OnClickListener() {
@@ -103,7 +103,10 @@ public class shutdown_activity extends BaseActivity {
                 float x = ev.getX();
                 float y = ev.getY();
                 if (FTUtils.isA9()) {
-                    if ((x > mapx[touchindex][0] && x < mapx[touchindex][1]) && (y > mapy[touchindex][0] && y < mapy[touchindex][1])) {
+                    if ((x > mapx[touchindex][0]
+                            && x < mapx[touchindex][1])
+                            && (y > mapy[touchindex][0]
+                            && y < mapy[touchindex][1])) {
                         touchindex++;
                         if (touchindex == 4) {
                             touchindex = 0;
diff --git a/app/src/main/res/layout/activity_shutdown_activity.xml b/app/src/main/res/layout/activity_shutdown_activity.xml
index 51b5b8f..8e501f8 100644
--- a/app/src/main/res/layout/activity_shutdown_activity.xml
+++ b/app/src/main/res/layout/activity_shutdown_activity.xml
@@ -21,7 +21,7 @@
             android:text="@string/ensure_power_off"
             android:textAlignment="center"
             android:textColor="@color/white"
-            android:textSize="32sp"
+            android:textSize="24sp"
             android:textStyle="bold" />
     </LinearLayout>
 
@@ -58,7 +58,7 @@
 
     <RelativeLayout
         android:id="@+id/bottom_tbn_container"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginLeft="2.0dip"
@@ -67,15 +67,15 @@
 
         <ImageButton
             android:id="@+id/btn_no"
-            android:layout_width="150.0dip"
-            android:layout_height="80.0dip"
+            android:layout_width="90dp"
+            android:layout_height="48dp"
             android:layout_alignParentLeft="true"
             android:background="@drawable/button_no_s09" />
 
         <ImageButton
             android:id="@+id/btn_yes"
-            android:layout_width="150.0dip"
-            android:layout_height="80.0dip"
+            android:layout_width="90dp"
+            android:layout_height="48dp"
             android:layout_alignParentRight="true"
             android:background="@drawable/button_yes_s09" />
     </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c7120e2..d7837da 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -193,7 +193,7 @@
     <string name="modify_imei_sim1">Modify SIM1</string>
     <string name="modify_imei_sim2">Modify SIM2</string>
     <string name="input_imei_title">Please enter a new IMEI number</string>
-    <string name="autoTest">Automatic testing自动测试</string>
+    <string name="autoTest">Automatic testing</string>
     <string name="pcbaTest">PCBA testing</string>
     <string name="sysVersion">edition</string>
     <string name="reStore">Restore factory settings</string>
@@ -201,7 +201,7 @@
     <string name="readAPN">APN query</string>
     <string name="sim_lock_settings">SIM card lock function setting</string>
     <string name="modify_imei">Modify IMEI number</string>
-    <string name="testReport">Test report测试报告</string>
+    <string name="testReport">Test report</string>
     <string name="beginTestGPS">Click start GPS test</string>
     <string name="beginTestTM">Click start FM test</string>
     <string name="beginTestCamera">Click to start the camera test</string>
@@ -332,7 +332,7 @@
     <string name="battery_info_power_usb">USB</string>
     <string name="battery_info_power_wireless">wireless</string>
     <string name="battery_info_power_ac_usb">alternating current + USB</string>
-    <string name="battery_info_power_unknown">未知</string>
+    <string name="battery_info_power_unknown">unknown</string>
     <string name="battery_info_health_unknown">unknown</string>
     <string name="battery_info_health_good">Good</string>
     <string name="battery_info_health_overheat">overheated</string>
@@ -379,7 +379,7 @@
     <string name="vl_up">VLUp</string>
     <string name="vl_down">VLDown</string>
     <string name="sos">miaoSoS</string>
-    <string name="ageing_mode">Ageing mode老化模式</string>
+    <string name="ageing_mode">Ageing mode</string>
     <string name="ageing_speaker_test">Speaker test</string>
     <string name="ageing_lcd_test">LCD test</string>
     <string name="ageing_camera_test">Camera test</string>
@@ -388,8 +388,8 @@
 
     <string name="start_test_new">Start Testing</string>
     <string name="benji">Factory test</string>
-    <string name="resunme">Reset恢复出厂设置</string>
-    <string name="ensure_power_off">PowerOff确定关机?</string>
+    <string name="resunme">Reset System</string>
+    <string name="ensure_power_off">PowerOff confirm?</string>
     <string name="tip2">Logo: pass (green), not pass (red), not measured (white)</string>
 
     <string name="clear_new">Clear the test data</string>
@@ -401,9 +401,9 @@
     <string name="mic_title">Microphone</string>
     <string name="sim_title">SIM card</string>
     <string name="dual_new">Phone</string>
-    <string name="beiguang_new">Backlight</string>
+    <string name="beiguang_new">Back Light</string>
     <string name="gps">GPS</string>
-    <string name="tempAdjust">Temperature Adjust 温度校准</string>
+    <string name="tempAdjust">Temperature Adjust</string>
     <string name="temperature">Temperature</string>
     <string name="no_temperature">No Temperature device found!</string>
     <string name="anti_check">AntiCheck</string>
@@ -449,25 +449,25 @@
     <string name="screen_resolution">screenResolution</string>
     <string name="download_mode">download_mode</string>
 
-    <string name="beginBackCameraTestCmotor">查看后拉摄像头</string>
-    <string name="rf_yes">是</string>
-    <string name="rf_no">否</string>
-    <string name="screen_bright">背光</string>
-    <string name="screen_bright_test">点击开始背光测试</string>
-    <string name="voice_phone_test">点击进入网络电话测试</string>
-    <string name="bluetootheTest">点击进入蓝牙测试</string>
-    <string name="radarTest">点击进入雷达测试</string>
-    <string name="radar">雷达测试</string>
-    <string name="open_radar">打开雷达</string>
-    <string name="close_radar">关闭雷达</string>
+    <string name="beginBackCameraTestCmotor">back camera preview</string>
+    <string name="rf_yes">yes</string>
+    <string name="rf_no">no</string>
+    <string name="screen_bright">back light</string>
+    <string name="screen_bright_test">start test back light</string>
+    <string name="voice_phone_test">test network phone call</string>
+    <string name="bluetootheTest">test blue tooth</string>
+    <string name="radarTest">test radar</string>
+    <string name="radar">radar test</string>
+    <string name="open_radar">open radar</string>
+    <string name="close_radar">close radar</string>
     <!-- <string name="fm_test">FM测试</string> -->
-    <string name="open_fm">打开FM</string>
-    <string name="close_fm">关闭FM</string>
-    <string name="longitude">经度：</string>
-    <string name="latitude">纬度： </string>
-    <string name="brightness_test">屏幕亮度(请拖动滚动条):</string>
-    <string name="acc_test">acc点火测试</string>
-    <string name="brightLight">按键灯测试</string>
+    <string name="open_fm">open FM</string>
+    <string name="close_fm">close FM</string>
+    <string name="longitude">longitude：</string>
+    <string name="latitude">latitude： </string>
+    <string name="brightness_test">brightness(slide scroll bar.):</string>
+    <string name="acc_test">acc fire test</string>
+    <string name="brightLight">key back light</string>
     <string name="fm_isRing">提示：将收音机的频率调至101.0MHZ，测试收音机是否收到音乐,收到则成功，反之则失败。</string>
     <string name="open_buttonLight">点击打开按键灯</string>
 
diff --git a/app/version_code.properties b/app/version_code.properties
index bc2deb6..8058236 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Mar 20 12:04:10 CST 2021
-VERSION_CODE=93
+#Fri May 21 20:33:05 CST 2021
+VERSION_CODE=96