release V118

添加C49C 陀螺仪测试

diff --git a/app/release/FactoryMode_V117_202107180651_release.apk b/app/release/FactoryMode_V117_202107180651_release.apk
deleted file mode 100644 (file)
index dad5cf2..0000000
Binary files a/app/release/FactoryMode_V117_202107180651_release.apk and /dev/null differ

diff --git a/app/release/output.json b/app/release/output.json
index 2c633f6..8df2398 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":117,"versionName":"202107180651","enabled":true,"outputFile":"FactoryMode_V117_202107180651_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V117_202107180651_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":118,"versionName":"202107192107","enabled":true,"outputFile":"FactoryMode_V118_202107192107_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V118_202107192107_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3919ca0..53387dc 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -192,6 +192,9 @@
         <activity\r
             android:name=".HeartRate"\r
             android:label="@string/heartrate" />\r
+        <activity\r
+            android:name=".GyroScope"\r
+            android:label="@string/gyroscope" />\r
         <activity\r
             android:name=".HeartRateSystemTest"\r
             android:label="@string/gh3011_systemtest" />\r

diff --git a/app/src/main/java/mobile/miki/mainui/TestMainList.java b/app/src/main/java/mobile/miki/mainui/TestMainList.java
index 3a761e5..9213cda 100644 (file)
--- a/app/src/main/java/mobile/miki/mainui/TestMainList.java
+++ b/app/src/main/java/mobile/miki/mainui/TestMainList.java
@@ -240,6 +240,7 @@ public class TestMainList extends BaseActivity implements OnClickListener {
                 intent = new Intent(TestMainList.this, HeartRateSystemTest.class);
                 startActivity(intent);
                 break;
+
             default:
                 break;
         }

diff --git a/app/src/main/java/mobile/miki/util/Config.java b/app/src/main/java/mobile/miki/util/Config.java
index 674b2ca..aeb13ad 100644 (file)
--- a/app/src/main/java/mobile/miki/util/Config.java
+++ b/app/src/main/java/mobile/miki/util/Config.java
@@ -16,6 +16,7 @@ import mobile.miki.DSPActivity;
 import mobile.miki.DialerTestActivity;\r
 import mobile.miki.GpsTest;\r
 import mobile.miki.GravitySensorActivity;\r
+import mobile.miki.GyroScope;\r
 import mobile.miki.HeartRate;\r
 import mobile.miki.KeysTestActivity;\r
 import mobile.miki.MikeTest;\r
@@ -148,6 +149,8 @@ public class Config {
             return context.getResources().getString(R.string.temperature);\r
         }else if (ClassName.equals(PressureActivity.class.getSimpleName())){\r
             return context.getResources().getString(R.string.test_pressure);\r
+        }else if (ClassName.equals(GyroScope.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.gyroscope);\r
         }else {\r
 \r
             return null;\r
@@ -205,6 +208,8 @@ public class Config {
             intent = new Intent(context, TemperatureActivity.class);\r
         }else if (testItemName.equals(context.getResources().getString(R.string.test_pressure))) {\r
             intent = new Intent(context, PressureActivity.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.gyroscope))) {\r
+            intent = new Intent(context, GyroScope.class);\r
         }\r
 \r
         if (intent != null) {\r
@@ -355,10 +360,12 @@ public class Config {
             list.remove(context.getString(R.string.camera));\r
             list.add(context.getString(R.string.heartrate));\r
             list.add(context.getString(R.string.temperature));\r
+            list.add(context.getString(R.string.gyroscope));\r
             testResultList.add("keys");\r
             testResultList.remove("camera");\r
             testResultList.add("heartrate");\r
             testResultList.add("temperature");\r
+            testResultList.add("gyroscope");\r
         } else if (FTUtils.isl004()){\r
             list.remove(context.getString(R.string.touch));\r
             testResultList.remove("touch");\r

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 378e4cb..ae9b352 100644 (file)
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -904,9 +904,9 @@
     <string name="flag_position">标志位检查</string>
     <string name="isWeared">佩戴</string>
     <string name="heartrate">心率</string>
-
+    <string name="gyroscope">陀螺仪</string>
     <string name="no_heartrate">无心率设备!</string>
-
+    <string name="no_gyroscope">无陀螺仪设备!</string>
 
     <string name="gps_full_title">GPS状态:</string>
     <string name="gps_star_count">星数:</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5b0b05d..7804c7a 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -925,6 +925,8 @@
     <string name="isWeared">isWeared</string>
     <string name="heartrate">HeartRate</string>
     <string name="no_heartrate">No HeartRate device found!</string>
+    <string name="gyroscope">GyroScope</string>
+    <string name="no_gyroscope">No GyroScope device found!</string>
 
     <string name="hall">hall</string>
 

diff --git a/app/version_code.properties b/app/version_code.properties
index 8cd3a46..89ba990 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sun Jul 18 06:51:35 CST 2021\r
-VERSION_CODE=117\r
+#Mon Jul 19 21:07:38 CST 2021\r
+VERSION_CODE=118\r