release V40

修改blood接口，适配新的icWorkService.
添加oxygen 数据发送。只是未有显示。

diff --git a/app/release/ICL02Blood_V39_202008242019_release.apk b/app/release/ICL02Blood_V40_202009072003_release.apk
similarity index 54%
rename from app/release/ICL02Blood_V39_202008242019_release.apk
rename to app/release/ICL02Blood_V40_202009072003_release.apk
index fa4d0a5..442af0b 100644 (file)
Binary files a/app/release/ICL02Blood_V39_202008242019_release.apk and b/app/release/ICL02Blood_V40_202009072003_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 69a526f..1819211 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":39,"versionName":"202008242019","enabled":true,"outputFile":"ICL02Blood_V39_202008242019_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V39_202008242019_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":40,"versionName":"202009072003","enabled":true,"outputFile":"ICL02Blood_V40_202009072003_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V40_202009072003_release.apk","properties":{}}]
\ No newline at end of file

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 0caf2ed..9e1182c 100644 (file)
--- a/app/src/main/aidl/com/ic/aidl/blood/IBloodAidlInterface.aidl
+++ b/app/src/main/aidl/com/ic/aidl/blood/IBloodAidlInterface.aidl
@@ -8,7 +8,8 @@ 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 updateBloodCheckTemp(int high,int low,int heart,int oxygen);
+     void updateBloodCheckResult(int high,int low,int heart,int oxygen);
      void updateBloodCheckTips(int top,int bottom);
+
 }

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 3cc6c9d..5531d32 100644 (file)
--- a/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
+++ b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
@@ -148,24 +148,26 @@ public class BloodPresenter {
     };
 
     private IBloodAidlInterface.Stub bloodInterface = new IBloodAidlInterface.Stub() {
-        @Override
-        public void updateBloodCheckResult(int high, int low, int heart) throws RemoteException {
-            updateBoolValue(high, low, heart);
-        }
 
 
         @Override
-        public void updateBloodCheckTips(int top, int bottom) throws RemoteException {
-            updateTipsInfo(mTipsSpares.get(top), mTipsSpares.get(bottom));
-        }
+        public void updateBloodCheckTemp(int high, int low, int heart, int oxygen) throws RemoteException {
 
-        @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)});
         }
+
+        @Override
+        public void updateBloodCheckResult(int high, int low, int heart, int oxygen) throws RemoteException {
+            updateBoolValue(high, low, heart);
+        }
+
+        @Override
+        public void updateBloodCheckTips(int top, int bottom) throws RemoteException {
+            updateTipsInfo(mTipsSpares.get(top), mTipsSpares.get(bottom));
+        }
     };
 
 

diff --git a/app/version_code.properties b/app/version_code.properties
index 5998efa..78728ed 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Aug 24 20:19:54 CST 2020\r
-VERSION_CODE=39\r
+#Mon Sep 07 20:03:58 CST 2020\r
+VERSION_CODE=40\r