From: kfl_614 <kfl_614@163.com>
Date: Mon, 30 Nov 2020 09:26:58 +0000 (+0800)
Subject: adjust first page notify content.
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=27b711063d4134e276373b8fec6debc6e72e4635;p=IcBlood.git

adjust first page notify content.
---

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 dcaa259..c5ed8d5 100644
--- a/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
@@ -72,6 +72,7 @@ public class BloodFragment extends Fragment {
         bloodBinding = FragmentBloodBinding.inflate(inflater, container, false);
 
         bloodBinding.setIsShowTips(true);
+        bloodBinding.setTopTips(getString(R.string.tips_quiet_please));
 
         initBloodModel();
         setGifDrawable();
@@ -107,6 +108,7 @@ public class BloodFragment extends Fragment {
         bloodModel = new ViewModelProvider(this, factory).get(BloodCheckModel.class);
         bloodModel.getObsStateTips().observe(this, value -> {
             bloodBinding.setFinishTips(value);
+            bloodBinding.setBottomTips(value);
         });
         bloodModel.getObsBloodValue().observe(getViewLifecycleOwner(), value -> {
             bloodBinding.setIsShowTips(false);
@@ -126,11 +128,13 @@ public class BloodFragment extends Fragment {
             bloodBinding.setOxygenValue(value[3]);
         });
 
-        bloodModel.getObsTipsInfo().observe(getViewLifecycleOwner(), tips -> {
-            bloodBinding.setIsShowTips(true);
-            bloodBinding.setTopTips(tips[0]);
-            bloodBinding.setBottomTips(tips[1]);
-        });
+        //bloodModel.getObsTipsInfo().observe(getViewLifecycleOwner(), tips -> {
+        //这里做法不好呀，连文字资源都由底层的ID来控制
+        //这样子耦合度非常高了，所以注释了，不使用这种方式更新提示。
+        //bloodBinding.setIsShowTips(true);
+        //bloodBinding.setTopTips(tips[0]);
+        //bloodBinding.setBottomTips(tips[1]);
+        //});
 
         bloodModel.getObsCheckEnd().observe(getViewLifecycleOwner(), end -> {
             IcLog.i(TAG, "finish");
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 c5a5dca..b75608c 100644
--- a/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
+++ b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
@@ -95,6 +95,8 @@ public class BloodPresenter {
         if (!isAntiOff) {
             //配戴了
             bindRemoteService();
+        } else {
+            mObsStateTips.postValue(mContext.getString(R.string.tips_not_wear));
         }
     }
 
@@ -116,6 +118,7 @@ public class BloodPresenter {
             }
             if (state == STATE_ANTI_OFF) {
                 //手表脱掉了0
+                mObsStateTips.postValue(mContext.getString(R.string.tips_not_wear));
             } else if (state == STATE_ANTI_ON && mService == null) {
                 //配戴了，但是还没有连接远程服务
                 bindRemoteService();
@@ -158,6 +161,7 @@ public class BloodPresenter {
 
     public void startCheckBlood() {
         if (mService != null) {
+            mObsStateTips.postValue(mContext.getString(R.string.tips_ing_check));
             //处理UI变化
             try {
                 mService.startCheckBlood();