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 (file)
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 (file)
--- 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 (file)
--- 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");\r
             testResultList.add("vibrator");\r
             testResultList.add("anti");\r
+        } else if (FTUtils.isL56A()){\r
+            list.add(context.getString(R.string.test_keypad));\r
+            list.add(context.getString(R.string.shakeTest));\r
+            list.add(context.getString(R.string.heartrate));\r
+            testResultList.add("keys");\r
+            testResultList.add("vibrator");\r
+            testResultList.add("heartrate");\r
+\r
+            list.add(context.getString(R.string.temperature));\r
+            testResultList.add("temperature");\r
+\r
         } else if (FTUtils.isQ3F()){\r
 \r
             list.add(context.getString(R.string.test_keypad));\r
@@ -347,17 +358,6 @@ public class Config {
             testResultList.add("temperature");\r
             list.add(context.getString(R.string.anti_check));\r
             testResultList.add("anti");\r
-        } else if (FTUtils.isL56A()){\r
-            list.add(context.getString(R.string.test_keypad));\r
-            list.add(context.getString(R.string.shakeTest));\r
-            list.add(context.getString(R.string.heartrate));\r
-            testResultList.add("keys");\r
-            testResultList.add("vibrator");\r
-            testResultList.add("heartrate");\r
-\r
-            list.add(context.getString(R.string.temperature));\r
-            testResultList.add("temperature");\r
-\r
         }\r
 \r
         stateArr = new String[testResultList.size()];\r

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 (file)
--- 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;\r
     }\r
     public static boolean isL56A(){\r
-        if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("L56A"))\r
+        if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("L56A")||SystemProperties.get("persist.sys.id_num","").contains("L69"))\r
             return true;\r
         else\r
             return false;\r

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 (file)
--- 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 (file)
--- 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 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Jun 05 14:43:49 CST 2021\r
-VERSION_CODE=104\r
+#Thu Jun 17 09:43:27 CST 2021\r
+VERSION_CODE=105\r