merge files.

diff --cc app/src/main/java/com/ic/blood/Gh301Activity.java
index ee8b273,c14577a..b0be611
--- 1/app/src/main/java/com/ic/blood/Gh301Activity.java
--- 2/app/src/main/java/com/ic/blood/Gh301Activity.java
+++ b/app/src/main/java/com/ic/blood/Gh301Activity.java
@@@ -13,11 -12,9 +13,12 @@@ import com.ic.blood.fragment.JustHeartR
  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 {
 +
 +    private String isShowBothInfo;
 +
      @Override
      protected void onCreate(@Nullable Bundle savedInstanceState) {
          super.onCreate(savedInstanceState);
@@@ -28,16 -25,12 +29,18 @@@
          String isGh301 = SystemUtils
                  .getSystemPropertiesString("persist.sys.is_gh301",
                          "false");
-         if (Boolean.parseBoolean(isGh301)) {
-             showFragment(Boolean.parseBoolean(isShowBothInfo) ? HeartRateAndBloodOxygenFragment.newInstance() :
-                     JustHeartRateFragment.newInstance());
-         } else {
 +        //hr:heart_rate,br:blood oxygen
 +        isShowBothInfo = SystemUtils
 +                .getSystemPropertiesString("persist.sys.hr_and_bo",
 +                        "false");
 +
 +
+ 
+         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 --cc app/src/main/java/com/ic/blood/WelcomeActivity.java
Simple merge