1.增加多语言，心率中间值

diff --git a/app/src/main/aidl/com/ic/aidl/blood/IBloodAidlInterface.aidl b/app/src/main/aidl/com/ic/aidl/blood/IBloodAidlInterface.aidl
index 0723be4..0caf2ed 100644 (file)
--- a/app/src/main/aidl/com/ic/aidl/blood/IBloodAidlInterface.aidl
+++ b/app/src/main/aidl/com/ic/aidl/blood/IBloodAidlInterface.aidl
@@ -1,3 +1,4 @@
+// ITempAidlInterface.aidl
 package com.ic.aidl.blood;
 
 // Declare any non-default types here with import statements
@@ -7,7 +8,7 @@ interface IBloodAidlInterface {
      * Demonstrates some basic types that you can use as parameters
      * and return values in AIDL.
      */
-
+     void updateBloodCheckTemp(int high,int low,int heart);
      void updateBloodCheckResult(int high,int low,int heart);
      void updateBloodCheckTips(int top,int bottom);
 }

diff --git a/app/src/main/aidl/com/ic/aidl/blood/IBloodRemoteService.aidl b/app/src/main/aidl/com/ic/aidl/blood/IBloodRemoteService.aidl
index c141e08..f1a51a7 100644 (file)
--- a/app/src/main/aidl/com/ic/aidl/blood/IBloodRemoteService.aidl
+++ b/app/src/main/aidl/com/ic/aidl/blood/IBloodRemoteService.aidl
@@ -1,3 +1,4 @@
+// ITempRemoteService.aidl
 package com.ic.aidl.blood;
 
 // Declare any non-default types here with import statements

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 a421b9d..3d21f70 100644 (file)
--- a/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
+++ b/app/src/main/java/com/ic/blood/fragment/BloodFragment.java
@@ -111,6 +111,13 @@ public class BloodFragment extends Fragment {
             delayHandler.sendMessageDelayed(new Message(),1000*10);
         });
 
+        bloodModel.getObsBloodTempValue().observe(getViewLifecycleOwner(), value -> {
+            bloodBinding.setIsShowTips(false);
+            bloodBinding.setHighValue(value[0]);
+            bloodBinding.setLowValue(value[1]);
+            bloodBinding.setHeartValue(value[2]);
+        });
+
         bloodModel.getObsTipsInfo().observe(getViewLifecycleOwner(), tips -> {
             bloodBinding.setIsShowTips(true);
             bloodBinding.setTopTips(tips[0]);

diff --git a/app/src/main/java/com/ic/blood/model/BloodCheckModel.java b/app/src/main/java/com/ic/blood/model/BloodCheckModel.java
index 7b8b24e..0434991 100644 (file)
--- a/app/src/main/java/com/ic/blood/model/BloodCheckModel.java
+++ b/app/src/main/java/com/ic/blood/model/BloodCheckModel.java
@@ -16,6 +16,7 @@ public class BloodCheckModel extends AndroidViewModel {
     private final BloodPresenter bloodPresenter;
 
     private LiveData<String[]> mObsBloodValue;
+    private LiveData<String[]> mObsBloodTempValue;
     private LiveData<String[]> mObsTipsInfo;
     private LiveData<Integer> mObsCheckEnd;
 
@@ -25,6 +26,7 @@ public class BloodCheckModel extends AndroidViewModel {
         mObsBloodValue = bloodPresenter.getObsBloodValue();
         mObsTipsInfo = bloodPresenter.getObsTipsInfo();
         mObsCheckEnd = bloodPresenter.getObsCheckEnd();
+        mObsBloodTempValue = bloodPresenter.getObsBloodTempValue();
     }
 
     public LiveData<String[]> getObsBloodValue() {
@@ -35,6 +37,10 @@ public class BloodCheckModel extends AndroidViewModel {
         return mObsTipsInfo;
     }
 
+    public LiveData<String[]> getObsBloodTempValue() {
+        return mObsBloodTempValue;
+    }
+
     public LiveData<Integer> getObsCheckEnd() {
         return mObsCheckEnd;
     }

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 3591bc7..47c259d 100644 (file)
--- a/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
+++ b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
@@ -31,6 +31,7 @@ public class BloodPresenter {
     private MutableLiveData<String[]> mObsBloodValue;
     private MutableLiveData<String[]> mObsTipsInfo;
     private MutableLiveData<Integer> mObsCheckEnd;
+    private MutableLiveData<String[]> mObsBloodTempValue;
 
     private IBloodRemoteService mService;
 
@@ -51,6 +52,7 @@ public class BloodPresenter {
         mObsBloodValue = new MutableLiveData<>();
         mObsTipsInfo = new MutableLiveData<>();
         mObsCheckEnd = new MutableLiveData<>();
+        mObsBloodTempValue = new MutableLiveData<>();
     }
 
     public MutableLiveData<String[]> getObsBloodValue() {
@@ -65,6 +67,10 @@ public class BloodPresenter {
         return mObsCheckEnd;
     }
 
+    public MutableLiveData<String[]> getObsBloodTempValue() {
+        return mObsBloodTempValue;
+    }
+
     public void registerScreenReceiver() {
         ServiceUtil.bindServiceUtil(mContext, "com.ic.action.WORK_SERVICE", connection, mContext.getPackageName());
     }
@@ -151,6 +157,14 @@ public class BloodPresenter {
         public void updateBloodCheckTips(int top, int bottom) throws RemoteException {
             updateTipsInfo(mTipsSpares.get(top), mTipsSpares.get(bottom));
         }
+
+        @Override
+        public void updateBloodCheckTemp(int high, int low, int heart) throws RemoteException {
+            mObsBloodTempValue.postValue(new String[]{
+                    String.valueOf(high),
+                    String.valueOf(low),
+                    String.valueOf(heart)});
+        }
     };
 
 

diff --git a/app/src/main/res/layout/fragment_blood.xml b/app/src/main/res/layout/fragment_blood.xml
index 73d4e27..ee2b7d3 100644 (file)
--- a/app/src/main/res/layout/fragment_blood.xml
+++ b/app/src/main/res/layout/fragment_blood.xml
@@ -56,7 +56,7 @@
             android:id="@+id/ic_tips_top"
             style="@style/bloodTextStyle"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="30dp"
             android:text="@{topTips}"
             android:visibility="@{isShowTips ? View.VISIBLE : View.GONE}"/>
 
@@ -64,7 +64,7 @@
             android:id="@+id/ic_tips_bottom"
             style="@style/bloodTextStyle"
             android:layout_gravity="bottom|center_horizontal"
-            android:layout_marginBottom="10dp"
+            android:layout_marginBottom="50dp"
             android:text="@{bottomTips}"
             android:visibility="@{isShowTips ? View.VISIBLE : View.GONE}"/>
 
@@ -73,7 +73,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="40dp"
             android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
 
             <TextView
@@ -95,7 +95,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            android:layout_marginStart="30dp"
+            android:layout_marginStart="40dp"
+            android:layout_marginBottom="50dp"
             android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
 
             <TextView
@@ -116,7 +117,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_marginEnd="30dp"
+            android:layout_marginEnd="40dp"
+            android:layout_marginBottom="50dp"
             android:visibility="@{isShowTips ? View.GONE : View.VISIBLE}">
 
             <TextView

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
new file mode 100644 (file)
index 0000000..2c41e48
--- /dev/null
+++ b/app/src/main/res/values-en/strings.xml
@@ -0,0 +1,19 @@
+<resources>
+    <string name="ic_high_pressure">SBP</string>
+    <string name="ic_low_pressure">DBP</string>
+    <string name="ic_heart_rate">HR.</string>
+
+    <string name="tips_not_device">No device</string>
+    <string name="tips_not_wear">Not worn</string>
+
+    <string name="tips_quiet_please">Keep quiet</string>
+    <string name="tips_start_check">Prepare</string>
+    <string name="tips_ing_check">Processing</string>
+    <string name="tips_stop_check">Stop</string>
+    <string name="tips_not_data_check">No data</string>
+    <string name="tips_finish_check">Complete</string>
+
+    <string name="program_abnormal">Sorry, the program has an exception, will exit</string>
+
+    <string name="app_name">IcBlood</string>
+</resources>

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644 (file)
index 0000000..8318609
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,19 @@
+<resources>
+    <string name="ic_high_pressure">高压</string>
+    <string name="ic_low_pressure">低压</string>
+    <string name="ic_heart_rate">心率</string>
+
+    <string name="tips_not_device">未检测到设备</string>
+    <string name="tips_not_wear">未正确佩戴</string>
+
+    <string name="tips_quiet_please">请保持安静</string>
+    <string name="tips_start_check">准备测量</string>
+    <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>
+
+    <string name="app_name">IcBlood</string>
+</resources>

diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
new file mode 100644 (file)
index 0000000..bd78661
--- /dev/null
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -0,0 +1,19 @@
+<resources>
+    <string name="ic_high_pressure">高壓</string>
+    <string name="ic_low_pressure">低壓</string>
+    <string name="ic_heart_rate">心率</string>
+
+    <string name="tips_not_device">未檢測到設備</string>
+    <string name="tips_not_wear">未正確佩戴</string>
+
+    <string name="tips_quiet_please">請保持安靜</string>
+    <string name="tips_start_check">準備測量</string>
+    <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>
+
+    <string name="app_name">IcBlood</string>
+</resources>

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
new file mode 100644 (file)
index 0000000..bd78661
--- /dev/null
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,19 @@
+<resources>
+    <string name="ic_high_pressure">高壓</string>
+    <string name="ic_low_pressure">低壓</string>
+    <string name="ic_heart_rate">心率</string>
+
+    <string name="tips_not_device">未檢測到設備</string>
+    <string name="tips_not_wear">未正確佩戴</string>
+
+    <string name="tips_quiet_please">請保持安靜</string>
+    <string name="tips_start_check">準備測量</string>
+    <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>
+
+    <string name="app_name">IcBlood</string>
+</resources>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0aef5f8..d87cbee 100644 (file)
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,6 +14,6 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textColor">#FFFFFF</item>
-        <item name="android:textSize">42sp</item>
+        <item name="android:textSize">32sp</item>
     </style>
 </resources>

diff --git a/app/version_code.properties b/app/version_code.properties
index b284582..3d3c466 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Apr 15 18:37:13 CST 2020\r
-VERSION_CODE=23\r
+#Wed Jul 29 21:10:46 CST 2020\r
+VERSION_CODE=37\r