release V81

添加GH301，GH3011的区分支持。

diff --git a/app/release/ICL02Blood_V81_202107081941_release.apk b/app/release/ICL02Blood_V81_202107081941_release.apk
new file mode 100644 (file)
index 0000000..df83b37
Binary files /dev/null and b/app/release/ICL02Blood_V81_202107081941_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 329db5f..73d3836 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":79,"versionName":"202107071723","enabled":true,"outputFile":"ICL02Blood_V79_202107071723_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V79_202107071723_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":81,"versionName":"202107081941","enabled":true,"outputFile":"ICL02Blood_V81_202107081941_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V81_202107081941_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/blood/Gh301Activity.java b/app/src/main/java/com/ic/blood/Gh301Activity.java
index 17fd5a7..4cd7e98 100644 (file)
--- a/app/src/main/java/com/ic/blood/Gh301Activity.java
+++ b/app/src/main/java/com/ic/blood/Gh301Activity.java
@@ -11,6 +11,7 @@ import androidx.fragment.app.FragmentTransaction;
 import com.ic.blood.fragment.HeartRateFragment;
 import com.ic.blood.fragment.OxygenFragment;
 import com.ic.blood.fragment.SelectFragment;
+import com.ic.blood.util.SystemUtils;
 
 public class Gh301Activity extends AppCompatActivity {
     @Override
@@ -19,7 +20,16 @@ public class Gh301Activity extends AppCompatActivity {
         setContentView(R.layout.activity_blood);
         //先显示选择测试的UI
         //切换Activity即可
-        showFragment(SelectFragment.newInstance());
+
+        String isGh301 = SystemUtils
+                .getSystemPropertiesString("persist.sys.is_gh301",
+                        "false");
+
+        if (Boolean.parseBoolean(isGh301)) {
+            showFragment(HeartRateFragment.newInstance());
+        }else {
+            showFragment(SelectFragment.newInstance());
+        }
     }
 
     private void showFragment(Fragment fragment) {

diff --git a/app/src/main/java/com/ic/blood/WelcomeActivity.java b/app/src/main/java/com/ic/blood/WelcomeActivity.java
index 08ba62b..bfbc2cc 100644 (file)
--- a/app/src/main/java/com/ic/blood/WelcomeActivity.java
+++ b/app/src/main/java/com/ic/blood/WelcomeActivity.java
@@ -22,7 +22,11 @@ public class WelcomeActivity extends AppCompatActivity {
         String isGh301 = SystemUtils
                 .getSystemPropertiesString("persist.sys.is_gh301",
                         "false");
-        if (Boolean.parseBoolean(isGh301)) {
+        String isGh3011 = SystemUtils
+                .getSystemPropertiesString("persist.sys.is_gh3011",
+                        "false");
+
+        if (Boolean.parseBoolean(isGh301)||Boolean.parseBoolean(isGh3011)) {
             //如是果是gh301，那么就跳转到测量选项页面
             startActivity(new Intent(this, Gh301Activity.class));
         } else {

diff --git a/app/src/main/java/com/ic/blood/util/IcLog.java b/app/src/main/java/com/ic/blood/util/IcLog.java
index 1d8611c..9ae47b7 100644 (file)
--- a/app/src/main/java/com/ic/blood/util/IcLog.java
+++ b/app/src/main/java/com/ic/blood/util/IcLog.java
@@ -1,5 +1,7 @@
 package com.ic.blood.util;
 
+import com.ic.iclooger.ICLogger;
+
 /**
  * @author RyanLee
  * @date 2018/2/2

diff --git a/app/version_code.properties b/app/version_code.properties
index 7ba8a11..785f1f6 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Jul 07 17:23:59 CST 2021\r
-VERSION_CODE=79\r
+#Thu Jul 08 19:41:22 CST 2021\r
+VERSION_CODE=81\r