安安增加血氧测量

diff --git a/app/src/main/java/com/ic/blood/Gh301Activity.java b/app/src/main/java/com/ic/blood/Gh301Activity.java
index 4cd7e98..c14577a 100644 (file)
--- a/app/src/main/java/com/ic/blood/Gh301Activity.java
+++ b/app/src/main/java/com/ic/blood/Gh301Activity.java
@@ -12,6 +12,7 @@ import com.ic.blood.fragment.HeartRateFragment;
 import com.ic.blood.fragment.OxygenFragment;
 import com.ic.blood.fragment.SelectFragment;
 import com.ic.blood.util.SystemUtils;
+import com.ic.iclooger.ICLogger;
 
 public class Gh301Activity extends AppCompatActivity {
     @Override
@@ -25,7 +26,9 @@ public class Gh301Activity extends AppCompatActivity {
                 .getSystemPropertiesString("persist.sys.is_gh301",
                         "false");
 
-        if (Boolean.parseBoolean(isGh301)) {
+        String customname = SystemUtils.getSystemProperties("persist.sys.customname");
+        ICLogger.i("customname = "+customname);
+        if (Boolean.parseBoolean(isGh301) && !customname.equals("AA")) {
             showFragment(HeartRateFragment.newInstance());
         }else {
             showFragment(SelectFragment.newInstance());

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