From: kfl_614 <kfl_614@163.com>
Date: Wed, 6 Jan 2021 07:28:04 +0000 (+0800)
Subject: filter data upload as heart is zero.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=611ab1238c2d0ec4c67cf00b31438b0538bcdfbf;p=IcBlood.git

filter data upload as heart is zero.
---

diff --git a/app/release/ICL02Blood_V57_202012022054_release.apk b/app/release/ICL02Blood_V59_202101031933_release.apk
similarity index 54%
rename from app/release/ICL02Blood_V57_202012022054_release.apk
rename to app/release/ICL02Blood_V59_202101031933_release.apk
index 04b8f71..64718bc 100644
Binary files a/app/release/ICL02Blood_V57_202012022054_release.apk and b/app/release/ICL02Blood_V59_202101031933_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index eba939a..05114e4 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":57,"versionName":"202012022054","enabled":true,"outputFile":"ICL02Blood_V57_202012022054_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V57_202012022054_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":59,"versionName":"202101031933","enabled":true,"outputFile":"ICL02Blood_V59_202101031933_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V59_202101031933_release.apk","properties":{}}]
\ No newline at end of file
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 6d2f4d0..0c62fe9 100644
--- a/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
+++ b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
@@ -188,11 +188,17 @@ public class BloodPresenter {
 
     private void updateBoolValue(int hv, int lv, int hh, int oxygen) {
         if (mObsBloodValue != null) {
-            mObsBloodValue.postValue(new String[]{
-                    String.valueOf(hv),
-                    String.valueOf(lv),
-                    String.valueOf(hh),
-                    String.valueOf(oxygen)});
+            //判断数据值，如果为0的话，那么就不更新UI了
+            //提示一下就好
+            if (hh == 0) {
+                mObsStateTips.postValue(mContext.getString(R.string.tips_not_data_check));
+            } else {
+                mObsBloodValue.postValue(new String[]{
+                        String.valueOf(hv),
+                        String.valueOf(lv),
+                        String.valueOf(hh),
+                        String.valueOf(oxygen)});
+            }
         }
     }
 
@@ -226,10 +232,10 @@ public class BloodPresenter {
                     + heartRate.getBloodHeight() + " low == >  " + heartRate.getBloodLow() +
                     " heart === > " + heartRate.getHeartRate()
                     + " oxygen == > " + heartRate.getOxygen());
+            mObsStateTips.postValue(mContext.getString(R.string.tips_finish_check));
             //最终结果
             updateBoolValue(heartRate.getHeartRate(), heartRate.getBloodLow(),
                     heartRate.getHeartRate(), heartRate.getOxygen());
-            mObsStateTips.postValue(mContext.getString(R.string.tips_finish_check));
         }
 
         @Override
diff --git a/app/src/main/java/com/ic/blood/util/IcLog.java b/app/src/main/java/com/ic/blood/util/IcLog.java
index 8417ff1..e875a62 100644
--- a/app/src/main/java/com/ic/blood/util/IcLog.java
+++ b/app/src/main/java/com/ic/blood/util/IcLog.java
@@ -12,7 +12,8 @@ import com.ic.blood.BuildConfig;
 public class IcLog {
 
     private static final String DOT = ".";
-    private static boolean isDebug = BuildConfig.DEBUG;
+    //private static boolean isDebug = BuildConfig.DEBUG;
+    private static boolean isDebug = true;
     private static String tagHead = "";
 
     public static void v(String tag, String msg) {
@@ -39,9 +40,9 @@ public class IcLog {
         }
     }
 
-    public static void e(String tag, String msg,Throwable tr) {
+    public static void e(String tag, String msg, Throwable tr) {
         if (isDebug) {
-            Log.e(mergeHeadTag(tag), msg,tr);
+            Log.e(mergeHeadTag(tag), msg, tr);
         }
     }
 
diff --git a/app/version_code.properties b/app/version_code.properties
index b2f604a..33dd98c 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Dec 02 20:54:45 CST 2020
-VERSION_CODE=57
+#Sun Jan 03 19:33:18 CST 2021
+VERSION_CODE=59