adjust test tips text.

diff --git a/app/src/main/java/com/ic/blood/BloodActivity.java b/app/src/main/java/com/ic/blood/BloodActivity.java
index e1109dd..04baa12 100644 (file)
--- a/app/src/main/java/com/ic/blood/BloodActivity.java
+++ b/app/src/main/java/com/ic/blood/BloodActivity.java
@@ -14,7 +14,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
 import com.ic.blood.fragment.BloodFragment;
-import com.ic.blood.fragment.HeartRateAndOxygenFragment;
+import com.ic.blood.fragment.HeartRateFragment;
 import com.ic.blood.util.IcLog;
 import com.ic.blood.util.SystemUtils;
 
@@ -37,7 +37,7 @@ public class BloodActivity extends AppCompatActivity {
             if ("false".equals(noSupportBlood)) {
                 commitFragment(BloodFragment.newInstance());
             } else {
-                commitFragment(HeartRateAndOxygenFragment.newInstance());
+                commitFragment(HeartRateFragment.newInstance());
             }
         } catch (Exception e) {
             e.printStackTrace();

diff --git a/app/src/main/java/com/ic/blood/Gh301Activity.java b/app/src/main/java/com/ic/blood/Gh301Activity.java
index 1ce54a5..17fd5a7 100644 (file)
--- a/app/src/main/java/com/ic/blood/Gh301Activity.java
+++ b/app/src/main/java/com/ic/blood/Gh301Activity.java
@@ -8,7 +8,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
-import com.ic.blood.fragment.HeartRateAndOxygenFragment;
+import com.ic.blood.fragment.HeartRateFragment;
 import com.ic.blood.fragment.OxygenFragment;
 import com.ic.blood.fragment.SelectFragment;
 
@@ -34,7 +34,7 @@ public class Gh301Activity extends AppCompatActivity {
     }
 
     public void showHeartRatePage() {
-        showFragment(HeartRateAndOxygenFragment.newInstance());
+        showFragment(HeartRateFragment.newInstance());
     }
 
     @Override

diff --git a/app/src/main/java/com/ic/blood/fragment/HeartRateAndOxygenFragment.java b/app/src/main/java/com/ic/blood/fragment/HeartRateFragment.java
similarity index 91%
rename from app/src/main/java/com/ic/blood/fragment/HeartRateAndOxygenFragment.java
rename to app/src/main/java/com/ic/blood/fragment/HeartRateFragment.java
index 335dc96..380b67d 100644 (file)
--- a/app/src/main/java/com/ic/blood/fragment/HeartRateAndOxygenFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/HeartRateFragment.java
@@ -18,7 +18,7 @@ import androidx.lifecycle.ViewModelProvider;
 import com.ic.blood.BloodActivity;
 import com.ic.blood.BloodApp;
 import com.ic.blood.R;
-import com.ic.blood.databinding.FragmentOxygenHeartRateBinding;
+import com.ic.blood.databinding.FragmentHeartRateBinding;
 import com.ic.blood.model.BloodCheckModel;
 import com.ic.blood.presenter.BloodPresenter;
 import com.ic.blood.util.IcLog;
@@ -35,14 +35,14 @@ import static android.content.Context.POWER_SERVICE;
 /**
  * 这个是只有心率和血氧的UI
  */
-public class HeartRateAndOxygenFragment extends Fragment {
+public class HeartRateFragment extends Fragment {
 
     private static final String TAG = "BloodFragment";
 
     private Context mContext;
     private BloodApp mApp;
 
-    private FragmentOxygenHeartRateBinding bloodBinding;
+    private FragmentHeartRateBinding bloodBinding;
 
     private PowerManager.WakeLock mWakeLock = null;
     private BloodCheckModel bloodModel;
@@ -53,8 +53,8 @@ public class HeartRateAndOxygenFragment extends Fragment {
     private GifImageView gifImageView;
     private ImageView heartRateView;
 
-    public static HeartRateAndOxygenFragment newInstance() {
-        return new HeartRateAndOxygenFragment();
+    public static HeartRateFragment newInstance() {
+        return new HeartRateFragment();
     }
 
     @Override
@@ -74,7 +74,7 @@ public class HeartRateAndOxygenFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        bloodBinding = FragmentOxygenHeartRateBinding.inflate(inflater, container, false);
+        bloodBinding = FragmentHeartRateBinding.inflate(inflater, container, false);
         bloodBinding.setIsShowTips(true);
         bloodBinding.setTopTips(getString(R.string.tips_quiet_please));
         initBloodModel();
@@ -192,16 +192,16 @@ public class HeartRateAndOxygenFragment extends Fragment {
     }
 
     private static class DelayExecuteHandler extends Handler {
-        private final WeakReference<HeartRateAndOxygenFragment> mFragment;
+        private final WeakReference<HeartRateFragment> mFragment;
 
-        public DelayExecuteHandler(HeartRateAndOxygenFragment fragment) {
+        public DelayExecuteHandler(HeartRateFragment fragment) {
             mFragment = new WeakReference<>(fragment);
         }
 
         @Override
         public void dispatchMessage(@NonNull Message msg) {
             super.dispatchMessage(msg);
-            HeartRateAndOxygenFragment heartRateFragment = mFragment.get();
+            HeartRateFragment heartRateFragment = mFragment.get();
             if (heartRateFragment != null) {
                 heartRateFragment.releaseWakeLock();
             }

diff --git a/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
index 06347a8..510a835 100644 (file)
--- a/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
+++ b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
@@ -8,12 +8,10 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import android.util.SparseArray;
 
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import com.ic.aidl.blood.BloodState;
 import com.ic.blood.R;
 import com.ic.blood.util.IcLog;
 import com.ic.blood.util.SystemUtils;
@@ -38,7 +36,6 @@ public class BloodPresenter {
 
     private IHeartRateSensorService mService;
 
-    private SparseArray<String> mTipsSpares;
     //判断有没有配戴的，如果没有配戴的话，就不更新数据了
     private boolean mHasWear = false;
 
@@ -50,15 +47,6 @@ public class BloodPresenter {
 
     public BloodPresenter(Context context) {
         this.mContext = context;
-        mTipsSpares = new SparseArray<>();
-        mTipsSpares.put(BloodState.BLOOD_NULL_TIPS, "");
-        mTipsSpares.put(BloodState.BLOOD_NOT_DEVICE, context.getString(R.string.tips_not_device));
-        mTipsSpares.put(BloodState.BLOOD_PLEASE_QUIET, context.getString(R.string.tips_quiet_please));
-        mTipsSpares.put(BloodState.BLOOD_START_CHECK, context.getString(R.string.tips_start_check));
-        mTipsSpares.put(BloodState.BLOOD_NOT_WEAR, context.getString(R.string.tips_not_wear));
-        mTipsSpares.put(BloodState.BLOOD_ING_CHECK, context.getString(R.string.tips_ing_check));
-        mTipsSpares.put(BloodState.BLOOD_STOP_CHECK, context.getString(R.string.tips_stop_check));
-        mTipsSpares.put(BloodState.BLOOD_NOT_DATA_CHECK, context.getString(R.string.tips_not_data_check));
 
         mObsBloodValue = new MutableLiveData<>();
         mObsTipsInfo = new MutableLiveData<>();
@@ -185,7 +173,8 @@ public class BloodPresenter {
     public void startCheckBlood() {
         IcLog.d(TAG, "startCheckBlood...");
         if (mService != null) {
-            mObsStateTips.postValue(mContext.getString(R.string.tips_ing_check));
+            String string = getTestingString();
+            mObsStateTips.postValue(string);
             //处理UI变化
             try {
                 /**
@@ -284,7 +273,8 @@ public class BloodPresenter {
                     String.valueOf(heartRate.getBloodLow()),
                     String.valueOf(heartRate.getHeartRate()),
                     String.valueOf(heartRate.getOxygen())});
-            mObsStateTips.postValue(mContext.getString(R.string.tips_ing_check));
+            String string = getTestingString();
+            mObsStateTips.postValue(string);
         }
 
         @Override
@@ -307,6 +297,16 @@ public class BloodPresenter {
 
     };
 
+    private String getTestingString() {
+        String string = mContext.getString(R.string.tips_ing_check);
+        if (testType == TestType.JUST_OXYGEN) {
+            string = mContext.getString(R.string.tips_ing_check_blood_oxygen);
+        } else if (testType == TestType.JUST_HEART_RATE) {
+            string = mContext.getString(R.string.tips_ing_check_heart_rate);
+        }
+        return string;
+    }
+
 
     public LiveData<String> getObsStateTips() {
         return mObsStateTips;

diff --git a/app/src/main/res/layout/fragment_oxygen_heart_rate.xml b/app/src/main/res/layout/fragment_heart_rate.xml
similarity index 96%
rename from app/src/main/res/layout/fragment_oxygen_heart_rate.xml
rename to app/src/main/res/layout/fragment_heart_rate.xml
index c486ca9..cc3c81a 100644 (file)
--- a/app/src/main/res/layout/fragment_oxygen_heart_rate.xml
+++ b/app/src/main/res/layout/fragment_heart_rate.xml
@@ -79,9 +79,8 @@
             android:id="@+id/ic_heart_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:layout_marginLeft="20dp"
-            android:layout_marginTop="30dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="36dp"
             android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
 
             <TextView
@@ -103,9 +102,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="right"
+
             android:layout_marginTop="30dp"
             android:layout_marginRight="20dp"
-            android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/ic_blood_oxygen_name"

diff --git a/app/src/main/res/layout/fragment_oxygen.xml b/app/src/main/res/layout/fragment_oxygen.xml
index c486ca9..69c567e 100644 (file)
--- a/app/src/main/res/layout/fragment_oxygen.xml
+++ b/app/src/main/res/layout/fragment_oxygen.xml
@@ -82,7 +82,7 @@
             android:layout_gravity="left"
             android:layout_marginLeft="20dp"
             android:layout_marginTop="30dp"
-            android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/ic_heart_name"
@@ -102,9 +102,8 @@
             android:id="@+id/ic_oxygen_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:layout_marginTop="30dp"
-            android:layout_marginRight="20dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="36dp"
             android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
 
             <TextView

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 3dd7817..e3e9da6 100644 (file)
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -10,6 +10,8 @@
     <string name="tips_quiet_please">Keep quiet</string>
     <string name="tips_start_check">Prepare</string>
     <string name="tips_ing_check">Processing</string>
+    <string name="tips_ing_check_heart_rate">Testing HeartRate</string>
+    <string name="tips_ing_check_blood_oxygen">Testing oxygen</string>
     <string name="tips_stop_check">Stop</string>
     <string name="tips_not_data_check">No data</string>
     <string name="tips_finish_check">Complete</string>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 32001ae..2d16398 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -10,6 +10,8 @@
     <string name="tips_quiet_please">安静にしてください</string>
     <string name="tips_start_check">測量を準備する</string>
     <string name="tips_ing_check">測定中</string>
+    <string name="tips_ing_check_heart_rate">測定中 HeartRate</string>
+    <string name="tips_ing_check_blood_oxygen">測定中 oxygen</string>
     <string name="tips_stop_check">測定を停止した</string>
     <string name="tips_not_data_check">データは計測されていない</string>
     <string name="tips_finish_check">測定完了</string>

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a776852..751b9fe 100644 (file)
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -10,6 +10,8 @@
     <string name="tips_quiet_please">请保持安静</string>
     <string name="tips_start_check">准备测量</string>
     <string name="tips_ing_check">正在测量中</string>
+    <string name="tips_ing_check_heart_rate">正在测量心率</string>
+    <string name="tips_ing_check_blood_oxygen">正在测量血氧</string>
     <string name="tips_stop_check">已停止测量</string>
     <string name="tips_not_data_check">未测量到数据</string>
     <string name="tips_finish_check">测量完成</string>

diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 72b3ec5..53e3ab3 100644 (file)
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -10,6 +10,8 @@
     <string name="tips_quiet_please">請保持安靜</string>
     <string name="tips_start_check">準備測量</string>
     <string name="tips_ing_check">正在測量中</string>
+    <string name="tips_ing_check_heart_rate">正在測量心率</string>
+    <string name="tips_ing_check_blood_oxygen">正在測量血氧</string>
     <string name="tips_stop_check">已停止測量</string>
     <string name="tips_not_data_check">未測量到數據</string>
     <string name="tips_finish_check">測量完成</string>

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 72b3ec5..53e3ab3 100644 (file)
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -10,6 +10,8 @@
     <string name="tips_quiet_please">請保持安靜</string>
     <string name="tips_start_check">準備測量</string>
     <string name="tips_ing_check">正在測量中</string>
+    <string name="tips_ing_check_heart_rate">正在測量心率</string>
+    <string name="tips_ing_check_blood_oxygen">正在測量血氧</string>
     <string name="tips_stop_check">已停止測量</string>
     <string name="tips_not_data_check">未測量到數據</string>
     <string name="tips_finish_check">測量完成</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a776852..751b9fe 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,6 +10,8 @@
     <string name="tips_quiet_please">请保持安静</string>
     <string name="tips_start_check">准备测量</string>
     <string name="tips_ing_check">正在测量中</string>
+    <string name="tips_ing_check_heart_rate">正在测量心率</string>
+    <string name="tips_ing_check_blood_oxygen">正在测量血氧</string>
     <string name="tips_stop_check">已停止测量</string>
     <string name="tips_not_data_check">未测量到数据</string>
     <string name="tips_finish_check">测量完成</string>