release V93

添加 C49 支持，
添加GH30X支持

diff --git a/app/release/FactoryMode_V89_202103052229_release.apk b/app/release/FactoryMode_V93_202103201204_release.apk
similarity index 94%
rename from app/release/FactoryMode_V89_202103052229_release.apk
rename to app/release/FactoryMode_V93_202103201204_release.apk
index e9ad4ff..9cad39c 100644 (file)
Binary files a/app/release/FactoryMode_V89_202103052229_release.apk and b/app/release/FactoryMode_V93_202103201204_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index fd9e29d..19a5567 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":89,"versionName":"202103052229","enabled":true,"outputFile":"FactoryMode_V89_202103052229_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V89_202103052229_release.apk","properties":{}}]
\ No newline at end of file
+[{"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

diff --git a/app/src/main/java/com/ic/jni/ICJniUtils.java b/app/src/main/java/com/ic/jni/ICJniUtils.java
index 6d235c9..4f7e189 100644 (file)
--- a/app/src/main/java/com/ic/jni/ICJniUtils.java
+++ b/app/src/main/java/com/ic/jni/ICJniUtils.java
@@ -30,6 +30,7 @@ public class ICJniUtils {
         PPG_EGC_TYPE_HRS3301,
         PPG_EGC_TYPE_IC66,
         PPG_EGC_TYPE_PAH8002,
+        PPG_EGC_TYPE_GH30X,
         PPG_EGC_TYPE_MAX
     };
 

diff --git a/app/src/main/java/mobile/miki/HeartRate.java b/app/src/main/java/mobile/miki/HeartRate.java
index 0881c86..dd870f6 100644 (file)
--- a/app/src/main/java/mobile/miki/HeartRate.java
+++ b/app/src/main/java/mobile/miki/HeartRate.java
@@ -61,7 +61,7 @@ public class HeartRate extends BaseActivity implements View.OnClickListener, Sen
         }else {
             hrsType = ICJniUtils.isPPGavailable();
             Log.i("dxc", "heartrate available : " + hrsType);
-            if (hrsType == ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_IC66.ordinal()) {
+            if (hrsType == ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_IC66.ordinal() || hrsType == ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_GH30X.ordinal()) {
 
                 mSensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
                 mHeartRate = mSensorManager.getDefaultSensor(TYPE_HEART_RATE);
@@ -135,7 +135,7 @@ public class HeartRate extends BaseActivity implements View.OnClickListener, Sen
             mSensorManager.unregisterListener(this);
             Log.i("dxc", "Heart Rate PPG_EGC_TYPE_IC66  closed");
         }else {
-            if (hrsType == ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_IC66.ordinal()) {
+            if (hrsType == ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_IC66.ordinal() || hrsType == ICJniUtils.PPG_EGC_SensorType.PPG_EGC_TYPE_GH30X.ordinal()) {
                 mSensorManager.unregisterListener(this);
                 Log.i("dxc", "Heart Rate PPG_EGC_TYPE_IC66  closed");
             } else if (hrsType > 0) {

diff --git a/app/src/main/java/mobile/miki/util/Config.java b/app/src/main/java/mobile/miki/util/Config.java
index a2b41cd..e46982e 100644 (file)
--- a/app/src/main/java/mobile/miki/util/Config.java
+++ b/app/src/main/java/mobile/miki/util/Config.java
@@ -327,6 +327,15 @@ public class Config {
             testResultList.add("heartrate");
             testResultList.add("temperature");
             testResultList.add("anti");
+        } else if (FTUtils.isC49()){
+            list.add(context.getString(R.string.test_keypad));
+            list.remove(context.getString(R.string.camera));
+            list.add(context.getString(R.string.heartrate));
+            list.add(context.getString(R.string.temperature));
+            testResultList.add("keys");
+            testResultList.remove("camera");
+            testResultList.add("heartrate");
+            testResultList.add("temperature");
         }
         stateArr = new String[testResultList.size()];
         return list;

diff --git a/app/src/main/java/mobile/miki/util/FTUtils.java b/app/src/main/java/mobile/miki/util/FTUtils.java
index 3293b30..86e8d22 100644 (file)
--- a/app/src/main/java/mobile/miki/util/FTUtils.java
+++ b/app/src/main/java/mobile/miki/util/FTUtils.java
@@ -286,4 +286,13 @@ public class FTUtils {
         }
         return false;
     }
+
+    public static boolean isC49(){
+        if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("MW13M")
+                || SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("MW13C")
+        ){
+            return true;
+        }
+        return false;
+    }
 }

diff --git a/app/version_code.properties b/app/version_code.properties
index 235ebba..bc2deb6 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Mar 05 22:29:50 CST 2021
-VERSION_CODE=89
+#Sat Mar 20 12:04:10 CST 2021
+VERSION_CODE=93