From: SnickerSun <scy@incartech.cn>
Date: Tue, 20 Jul 2021 15:59:29 +0000 (+0800)
Subject: release V118
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=f1f05c8b2589c7165ddca02d5cbed01a735dff1a;p=factoryMode.git

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
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
--- 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
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -192,6 +192,9 @@
         <activity
             android:name=".HeartRate"
             android:label="@string/heartrate" />
+        <activity
+            android:name=".GyroScope"
+            android:label="@string/gyroscope" />
         <activity
             android:name=".HeartRateSystemTest"
             android:label="@string/gh3011_systemtest" />
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
--- 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
--- 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;
 import mobile.miki.GpsTest;
 import mobile.miki.GravitySensorActivity;
+import mobile.miki.GyroScope;
 import mobile.miki.HeartRate;
 import mobile.miki.KeysTestActivity;
 import mobile.miki.MikeTest;
@@ -148,6 +149,8 @@ public class Config {
             return context.getResources().getString(R.string.temperature);
         }else if (ClassName.equals(PressureActivity.class.getSimpleName())){
             return context.getResources().getString(R.string.test_pressure);
+        }else if (ClassName.equals(GyroScope.class.getSimpleName())){
+            return context.getResources().getString(R.string.gyroscope);
         }else {
 
             return null;
@@ -205,6 +208,8 @@ public class Config {
             intent = new Intent(context, TemperatureActivity.class);
         }else if (testItemName.equals(context.getResources().getString(R.string.test_pressure))) {
             intent = new Intent(context, PressureActivity.class);
+        }else if (testItemName.equals(context.getResources().getString(R.string.gyroscope))) {
+            intent = new Intent(context, GyroScope.class);
         }
 
         if (intent != null) {
@@ -355,10 +360,12 @@ public class Config {
             list.remove(context.getString(R.string.camera));
             list.add(context.getString(R.string.heartrate));
             list.add(context.getString(R.string.temperature));
+            list.add(context.getString(R.string.gyroscope));
             testResultList.add("keys");
             testResultList.remove("camera");
             testResultList.add("heartrate");
             testResultList.add("temperature");
+            testResultList.add("gyroscope");
         } else if (FTUtils.isl004()){
             list.remove(context.getString(R.string.touch));
             testResultList.remove("touch");
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
--- 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
--- 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
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sun Jul 18 06:51:35 CST 2021
-VERSION_CODE=117
+#Mon Jul 19 21:07:38 CST 2021
+VERSION_CODE=118