1.新增完成血压测试后。中间增加测量完成提示。

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 ac2c60f..a421b9d 100644 (file)
--- a/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
@@ -18,6 +18,7 @@ import android.widget.ImageView;
 
 import com.ic.blood.BloodActivity;
 import com.ic.blood.BloodApp;
+import com.ic.blood.R;
 import com.ic.blood.databinding.FragmentBloodBinding;
 import com.ic.blood.model.BloodCheckModel;
 import com.ic.blood.util.IcLog;
@@ -105,6 +106,8 @@ public class BloodFragment extends Fragment {
             bloodBinding.setHighValue(value[0]);
             bloodBinding.setLowValue(value[1]);
             bloodBinding.setHeartValue(value[2]);
+            bloodBinding.setFinishTips(getString(R.string.tips_finish_check));
+            gifFromAssets.stop();
             delayHandler.sendMessageDelayed(new Message(),1000*10);
         });
 

diff --git a/app/src/main/res/layout/fragment_blood.xml b/app/src/main/res/layout/fragment_blood.xml
index 75747d8..73d4e27 100644 (file)
--- a/app/src/main/res/layout/fragment_blood.xml
+++ b/app/src/main/res/layout/fragment_blood.xml
@@ -29,6 +29,10 @@
         <variable
             name="lowValue"
             type="String" />
+        
+        <variable
+            name="finishTips"
+            type="String" />
     </data>
 
     <FrameLayout
@@ -42,6 +46,12 @@
             android:layout_height="match_parent"
             android:layout_gravity="center" />
 
+        <TextView
+            style="@style/bloodTextStyle"
+            android:text="@{finishTips}"
+            android:layout_gravity="center"
+            android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}"/>
+
         <TextView
             android:id="@+id/ic_tips_top"
             style="@style/bloodTextStyle"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3b46295..8318609 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,6 +11,7 @@
     <string name="tips_ing_check">正在测量中</string>
     <string name="tips_stop_check">已停止测量</string>
     <string name="tips_not_data_check">未测量到数据</string>
+    <string name="tips_finish_check">测量完成</string>
 
     <string name="program_abnormal">很抱歉,程序出现异常,即将退出</string>
 

diff --git a/app/version_code.properties b/app/version_code.properties
index b4ea3f5..b284582 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Apr 10 16:27:36 CST 2020\r
-VERSION_CODE=20\r
+#Wed Apr 15 18:37:13 CST 2020\r
+VERSION_CODE=23\r