From: snickersun <scy@incartech.cn>
Date: Thu, 8 Oct 2020 09:43:06 +0000 (+0800)
Subject: release V45
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9e6c6921daf2d7ba0b3ca1a73affa3094c2adf19;p=IcBlood.git

release V45
添加血氧显示，并在中间值显示过程中提示正在检测，防止用户以为已经检测完毕提前关闭窗口。
---

diff --git a/app/release/ICL02Blood_V44_202009081835_release.apk b/app/release/ICL02Blood_V45_202010081741_release.apk
similarity index 50%
rename from app/release/ICL02Blood_V44_202009081835_release.apk
rename to app/release/ICL02Blood_V45_202010081741_release.apk
index 687e9f9..2ccac14 100644
Binary files a/app/release/ICL02Blood_V44_202009081835_release.apk and b/app/release/ICL02Blood_V45_202010081741_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index a72466a..e8839e6 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":44,"versionName":"202009081835","enabled":true,"outputFile":"ICL02Blood_V44_202009081835_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V44_202009081835_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":45,"versionName":"202010081741","enabled":true,"outputFile":"ICL02Blood_V45_202010081741_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V45_202010081741_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/blood/fragment/BloodFragment.java b/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
index 0433099..3373484 100644
--- a/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
@@ -108,6 +108,7 @@ public class BloodFragment extends Fragment {
             bloodBinding.setHighValue(value[0]);
             bloodBinding.setLowValue(value[1]);
             bloodBinding.setHeartValue(value[2]);
+            bloodBinding.setOxygenValue(value[3]);
             bloodBinding.setFinishTips(getString(R.string.tips_finish_check));
             gifFromAssets.stop();
             delayHandler.sendMessageDelayed(new Message(),1000*10);
@@ -118,6 +119,8 @@ public class BloodFragment extends Fragment {
             bloodBinding.setHighValue(value[0]);
             bloodBinding.setLowValue(value[1]);
             bloodBinding.setHeartValue(value[2]);
+            bloodBinding.setOxygenValue(value[3]);
+            bloodBinding.setFinishTips(getString(R.string.tips_ing_check));
         });
 
         bloodModel.getObsTipsInfo().observe(getViewLifecycleOwner(), tips -> {
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 5531d32..f57b64d 100644
--- a/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
+++ b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
@@ -118,12 +118,13 @@ public class BloodPresenter {
         }
     }
 
-    private void updateBoolValue(int hv, int lv, int hh) {
+    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(hh),
+                    String.valueOf(oxygen)});
         }
     }
 
@@ -156,12 +157,13 @@ public class BloodPresenter {
             mObsBloodTempValue.postValue(new String[]{
                     String.valueOf(high),
                     String.valueOf(low),
-                    String.valueOf(heart)});
+                    String.valueOf(heart),
+                    String.valueOf(oxygen)});
         }
 
         @Override
         public void updateBloodCheckResult(int high, int low, int heart, int oxygen) throws RemoteException {
-            updateBoolValue(high, low, heart);
+            updateBoolValue(high, low, heart,oxygen);
         }
 
         @Override
diff --git a/app/src/main/res/layout/fragment_blood.xml b/app/src/main/res/layout/fragment_blood.xml
index ee2b7d3..2ceed0a 100644
--- a/app/src/main/res/layout/fragment_blood.xml
+++ b/app/src/main/res/layout/fragment_blood.xml
@@ -22,6 +22,9 @@
             name="heartValue"
             type="String" />
 
+        <variable
+            name="oxygenValue"
+            type="String" />
         <variable
             name="highValue"
             type="String" />
@@ -69,27 +72,47 @@
             android:visibility="@{isShowTips ? View.VISIBLE : View.GONE}"/>
 
         <RelativeLayout
-            android:id="@+id/ic_heart_layout"
+        android:id="@+id/ic_heart_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="40dp"
+        android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
+
+        <TextView
+            android:id="@+id/ic_heart_name"
+            style="@style/bloodTextStyle"
+            android:layout_marginEnd="10dp"
+            android:text="@string/ic_heart_rate" />
+
+        <TextView
+            style="@style/bloodTextStyle"
+            android:id="@+id/ic_heart_value"
+            android:layout_marginStart="10dp"
+            android:layout_toEndOf="@id/ic_heart_name"
+            android:text="@{heartValue}"/>
+    </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/ic_oxygen_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="40dp"
+            android:layout_marginTop="80dp"
             android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
 
             <TextView
-                android:id="@+id/ic_heart_name"
+                android:id="@+id/ic_blood_oxygen_name"
                 style="@style/bloodTextStyle"
                 android:layout_marginEnd="10dp"
-                android:text="@string/ic_heart_rate" />
+                android:text="@string/ic_blood_oxygen" />
 
             <TextView
                 style="@style/bloodTextStyle"
-                android:id="@+id/ic_heart_value"
+                android:id="@+id/ic_blood_oxygen"
                 android:layout_marginStart="10dp"
-                android:layout_toEndOf="@id/ic_heart_name"
-                android:text="@{heartValue}"/>
+                android:layout_toEndOf="@id/ic_blood_oxygen_name"
+                android:text="@{oxygenValue}"/>
         </RelativeLayout>
-
         <RelativeLayout
             android:id="@+id/ic_high_layout"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 2c41e48..3dd7817 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -2,6 +2,7 @@
     <string name="ic_high_pressure">SBP</string>
     <string name="ic_low_pressure">DBP</string>
     <string name="ic_heart_rate">HR.</string>
+    <string name="ic_blood_oxygen">SPO2</string>
 
     <string name="tips_not_device">No device</string>
     <string name="tips_not_wear">Not worn</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8318609..a776852 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2,6 +2,7 @@
     <string name="ic_high_pressure">高压</string>
     <string name="ic_low_pressure">低压</string>
     <string name="ic_heart_rate">心率</string>
+    <string name="ic_blood_oxygen">血氧</string>
 
     <string name="tips_not_device">未检测到设备</string>
     <string name="tips_not_wear">未正确佩戴</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index bd78661..72b3ec5 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -2,6 +2,7 @@
     <string name="ic_high_pressure">高壓</string>
     <string name="ic_low_pressure">低壓</string>
     <string name="ic_heart_rate">心率</string>
+    <string name="ic_blood_oxygen">血氧</string>
 
     <string name="tips_not_device">未檢測到設備</string>
     <string name="tips_not_wear">未正確佩戴</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index bd78661..72b3ec5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2,6 +2,7 @@
     <string name="ic_high_pressure">高壓</string>
     <string name="ic_low_pressure">低壓</string>
     <string name="ic_heart_rate">心率</string>
+    <string name="ic_blood_oxygen">血氧</string>
 
     <string name="tips_not_device">未檢測到設備</string>
     <string name="tips_not_wear">未正確佩戴</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8318609..a776852 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,6 +2,7 @@
     <string name="ic_high_pressure">高压</string>
     <string name="ic_low_pressure">低压</string>
     <string name="ic_heart_rate">心率</string>
+    <string name="ic_blood_oxygen">血氧</string>
 
     <string name="tips_not_device">未检测到设备</string>
     <string name="tips_not_wear">未正确佩戴</string>
diff --git a/app/version_code.properties b/app/version_code.properties
index d88bc0d..b86b315 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Sep 08 18:35:11 CST 2020
-VERSION_CODE=44
+#Thu Oct 08 17:41:16 CST 2020
+VERSION_CODE=45