From 9dc23ba9c47b2bfe585c863f8efbe7fe845d50a0 Mon Sep 17 00:00:00 2001
From: TrillGates <williamtrillgates@gmail.com>
Date: Fri, 3 Dec 2021 11:29:41 +0800
Subject: [PATCH] =?utf8?q?=E6=B7=BB=E5=8A=A0=E5=BF=83=E7=8E=87=E4=BD=8E?=
 =?utf8?q?=E4=BA=8E60=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/ic/blood/fragment/AllFragment.java  | 8 +++-----
 .../main/java/com/ic/blood/presenter/BloodPresenter.java  | 3 +++
 app/src/main/res/values-en/strings.xml                    | 3 ++-
 app/src/main/res/values-ja/strings.xml                    | 1 +
 app/src/main/res/values-zh-rCN/strings.xml                | 3 ++-
 app/src/main/res/values-zh-rHK/strings.xml                | 3 ++-
 app/src/main/res/values-zh-rTW/strings.xml                | 3 ++-
 app/src/main/res/values/strings.xml                       | 3 ++-
 8 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/ic/blood/fragment/AllFragment.java b/app/src/main/java/com/ic/blood/fragment/AllFragment.java
index fee4a8c..18eff2d 100644
--- a/app/src/main/java/com/ic/blood/fragment/AllFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/AllFragment.java
@@ -20,7 +20,6 @@ import com.ic.blood.BloodActivity;
 import com.ic.blood.R;
 import com.ic.blood.model.BloodCheckModel;
 import com.ic.blood.presenter.BloodPresenter;
-import com.ic.blood.util.IcLog;
 import com.ic.blood.util.SystemUtils;
 import com.ic.iclooger.ICLogger;
 
@@ -35,7 +34,6 @@ import static android.content.Context.POWER_SERVICE;
 
 public class AllFragment extends Fragment {
 
-    private static final String TAG = "BloodFragment";
 
     private Context mContext;
 
@@ -228,7 +226,7 @@ public class AllFragment extends Fragment {
         });
 
         bloodModel.getObsCheckEnd().observe(getViewLifecycleOwner(), end -> {
-            IcLog.i(TAG, "finish");
+            ICLogger.i("finish");
             ((BloodActivity) mContext).finish();
         });
     }
@@ -241,7 +239,7 @@ public class AllFragment extends Fragment {
     }
 
     private void releaseWakeLock() {
-        IcLog.i(TAG, "Release WakeLock");
+        ICLogger.d("Release WakeLock");
         if (mWakeLock != null) {
             mWakeLock.release();
         }
@@ -261,7 +259,7 @@ public class AllFragment extends Fragment {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        IcLog.i(TAG, "onDestroy");
+        ICLogger.d("onDestroy");
 
         //取消广播注册，释放资源
         bloodModel.onViewDestroy();
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 d484372..93d147b 100644
--- a/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
+++ b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
@@ -233,6 +233,9 @@ public class BloodPresenter {
             //提示一下就好
             if (hh == 0) {
                 mObsStateTips.postValue(mContext.getString(R.string.tips_not_data_check));
+            } else if (hh < 60) {
+                //提示获取数据有问题
+                mObsStateTips.postValue(mContext.getString(R.string.error_result_retest_tips_text));
             } else {
                 mObsBloodValue.postValue(new String[]{
                         String.valueOf(hv),
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index fb0169e..26f3ea8 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -20,8 +20,9 @@
 
     <string name="app_name">IcBlood</string>
 
-    <string name="background_test">Program is exist in backstage，wait...</string>
+    <string name="background_test">Program is exist in backstage，wait…</string>
     <string name="background_wait">Have other tests in background,Please try again later!</string>
     <string name="dialog_warn">Warn</string>
     <string name="dialog_confirm">Yes</string>
+    <string name="error_result_retest_tips_text">Data error,please retest</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 8ef5ce2..550b495 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -24,4 +24,5 @@
     <string name="background_wait">測定できません、しばらく置いてからお試しください！</string>
     <string name="dialog_warn">注意</string>
     <string name="dialog_confirm">確認</string>
+    <string name="error_result_retest_tips_text">データ異常,再測定</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 70665f7..33aecfc 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -20,8 +20,9 @@
 
     <string name="app_name">IcBlood</string>
 
-    <string name="background_test">后台正在测试心率，直接监听测试结果...</string>
+    <string name="background_test">后台正在测试心率，直接监听测试结果…</string>
     <string name="background_wait">后台测试服务繁忙，请稍后再试！</string>
     <string name="dialog_warn">提醒</string>
     <string name="dialog_confirm">确认</string>
+    <string name="error_result_retest_tips_text">数据测试异常，请重测</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 4869f85..1a9c542 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -20,8 +20,9 @@
 
     <string name="app_name">IcBlood</string>
 
-    <string name="background_test">後臺正在測試心率，直接監聽測試結果...</string>
+    <string name="background_test">後臺正在測試心率，直接監聽測試結果…</string>
     <string name="background_wait">後臺測試服務繁忙，請稍後再試！</string>
     <string name="dialog_warn">提醒</string>
     <string name="dialog_confirm">確認</string>
+    <string name="error_result_retest_tips_text">数据测试异常，请重测</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 4869f85..1a9c542 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -20,8 +20,9 @@
 
     <string name="app_name">IcBlood</string>
 
-    <string name="background_test">後臺正在測試心率，直接監聽測試結果...</string>
+    <string name="background_test">後臺正在測試心率，直接監聽測試結果…</string>
     <string name="background_wait">後臺測試服務繁忙，請稍後再試！</string>
     <string name="dialog_warn">提醒</string>
     <string name="dialog_confirm">確認</string>
+    <string name="error_result_retest_tips_text">数据测试异常，请重测</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 70665f7..33aecfc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,8 +20,9 @@
 
     <string name="app_name">IcBlood</string>
 
-    <string name="background_test">后台正在测试心率，直接监听测试结果...</string>
+    <string name="background_test">后台正在测试心率，直接监听测试结果…</string>
     <string name="background_wait">后台测试服务繁忙，请稍后再试！</string>
     <string name="dialog_warn">提醒</string>
     <string name="dialog_confirm">确认</string>
+    <string name="error_result_retest_tips_text">数据测试异常，请重测</string>
 </resources>
-- 
2.17.1