releast ICL02Blood_V77_202106212050_release

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

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

diff --git a/app/release/output.json b/app/release/output.json
index 8472d0a..bc069a4 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":76,"versionName":"202106031526","enabled":true,"outputFile":"ICL02Blood_V76_202106031526_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V76_202106031526_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":77,"versionName":"202106212050","enabled":true,"outputFile":"ICL02Blood_V77_202106212050_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V77_202106212050_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/blood/BloodActivity.java b/app/src/main/java/com/ic/blood/BloodActivity.java
index 04baa12..85b5231 100644 (file)
--- a/app/src/main/java/com/ic/blood/BloodActivity.java
+++ b/app/src/main/java/com/ic/blood/BloodActivity.java
@@ -5,7 +5,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.WindowManager;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -14,9 +13,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
 import com.ic.blood.fragment.BloodFragment;
-import com.ic.blood.fragment.HeartRateFragment;
 import com.ic.blood.util.IcLog;
-import com.ic.blood.util.SystemUtils;
 
 public class BloodActivity extends AppCompatActivity {
 
@@ -29,20 +26,7 @@ public class BloodActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_blood);
         fragmentManager = getSupportFragmentManager();
-        try {
-            String noSupportBlood = SystemUtils
-                    .getSystemPropertiesString("persist.sys.no_blood_pressure",
-                            "false");
-            Log.d(TAG, "protocolCode == > " + noSupportBlood);
-            if ("false".equals(noSupportBlood)) {
-                commitFragment(BloodFragment.newInstance());
-            } else {
-                commitFragment(HeartRateFragment.newInstance());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            commitFragment(BloodFragment.newInstance());
-        }
+        commitFragment(BloodFragment.newInstance());
         IcLog.d("TAG", "onCreate...");
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(Intent.ACTION_SCREEN_OFF);

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

diff --git a/app/version_code.properties b/app/version_code.properties
index fd2c3f4..1157116 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Jun 03 15:26:59 CST 2021
-VERSION_CODE=76
+#Mon Jun 21 20:50:18 CST 2021
+VERSION_CODE=77