From: SnickerSun <scy@incartech.cn>
Date: Thu, 17 Jun 2021 01:44:24 +0000 (+0800)
Subject: release V105
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=b3e2e609cbe1084a1402fba57fcbf62d2cd276e0;p=factoryMode.git

release V105
添加 L69A 支持
---

diff --git a/app/release/FactoryMode_V105_202106170943_release.apk b/app/release/FactoryMode_V105_202106170943_release.apk
new file mode 100644
index 0000000..9285988
Binary files /dev/null and b/app/release/FactoryMode_V105_202106170943_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index c4bfe22..5ad3bf7 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":104,"versionName":"202106051443","enabled":true,"outputFile":"FactoryMode_V104_202106051443_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V104_202106051443_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":105,"versionName":"202106170943","enabled":true,"outputFile":"FactoryMode_V105_202106170943_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V105_202106170943_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/mobile/miki/util/Config.java b/app/src/main/java/mobile/miki/util/Config.java
index eddc18b..c156845 100644
--- a/app/src/main/java/mobile/miki/util/Config.java
+++ b/app/src/main/java/mobile/miki/util/Config.java
@@ -299,6 +299,17 @@ public class Config {
             testResultList.add("temperature");
             testResultList.add("vibrator");
             testResultList.add("anti");
+        } else if (FTUtils.isL56A()){
+            list.add(context.getString(R.string.test_keypad));
+            list.add(context.getString(R.string.shakeTest));
+            list.add(context.getString(R.string.heartrate));
+            testResultList.add("keys");
+            testResultList.add("vibrator");
+            testResultList.add("heartrate");
+
+            list.add(context.getString(R.string.temperature));
+            testResultList.add("temperature");
+
         } else if (FTUtils.isQ3F()){
 
             list.add(context.getString(R.string.test_keypad));
@@ -347,17 +358,6 @@ public class Config {
             testResultList.add("temperature");
             list.add(context.getString(R.string.anti_check));
             testResultList.add("anti");
-        } else if (FTUtils.isL56A()){
-            list.add(context.getString(R.string.test_keypad));
-            list.add(context.getString(R.string.shakeTest));
-            list.add(context.getString(R.string.heartrate));
-            testResultList.add("keys");
-            testResultList.add("vibrator");
-            testResultList.add("heartrate");
-
-            list.add(context.getString(R.string.temperature));
-            testResultList.add("temperature");
-
         }
 
         stateArr = new String[testResultList.size()];
diff --git a/app/src/main/java/mobile/miki/util/FTUtils.java b/app/src/main/java/mobile/miki/util/FTUtils.java
index 797a7c2..d145e20 100644
--- a/app/src/main/java/mobile/miki/util/FTUtils.java
+++ b/app/src/main/java/mobile/miki/util/FTUtils.java
@@ -308,7 +308,7 @@ public class FTUtils {
         return false;
     }
     public static boolean isL56A(){
-        if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("L56A"))
+        if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("L56A")||SystemProperties.get("persist.sys.id_num","").contains("L69"))
             return true;
         else
             return false;
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6582184..a236717 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -863,8 +863,9 @@
     <string name="more">更多设置</string>
     <string name="unbound">解绑</string>
     <string name="tempAdjust">温度校准</string>
-    <string name="temperature_body">BODY_温度测试</string>
-    <string name="temperature_env">ENV_温度测试</string>
+    <string name="temperature">温度测试</string>
+    <string name="temperature_body">BODY_温度</string>
+    <string name="temperature_env">ENV_温度</string>
     <string name="no_temperature">没发现测温设备！</string>
     <string name="anti_check">佩戴检测</string>
     <string name="no_pressure">没发现气压设备！</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 30339f9..f557dba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -405,6 +405,7 @@
     <string name="gps">GPS</string>
     <string name="tempAdjust">Temperature Adjust</string>
     <string name="temp_data_get_text">get temperature data</string>
+    <string name="temperature">Temperature</string>
     <string name="temperature_body">BODY_Temperature</string>
     <string name="temperature_env">ENV_Temperature</string>
     <string name="no_temperature">No Temperature device found!</string>
diff --git a/app/version_code.properties b/app/version_code.properties
index 95bc251..ea1c9c9 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Jun 05 14:43:49 CST 2021
-VERSION_CODE=104
+#Thu Jun 17 09:43:27 CST 2021
+VERSION_CODE=105