From: snickersun <scy@incartech.cn>
Date: Mon, 24 Aug 2020 08:44:03 +0000 (+0800)
Subject: release ICL02Blood V25 202008241641
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=6d0dd1320d9c448b96fba203a7593085b55a65e1;p=IcBlood.git

release ICL02Blood V25 202008241641
修复aidl接口不适配造成的 H88 无法测试心率问题
---

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d291b3d..5cd135a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..17c8136
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..b6ea2b1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/release/ICL02Blood_V25_202008241641_release.apk b/app/release/ICL02Blood_V25_202008241641_release.apk
new file mode 100644
index 0000000..bbb23cd
Binary files /dev/null and b/app/release/ICL02Blood_V25_202008241641_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
new file mode 100644
index 0000000..0f4d366
--- /dev/null
+++ b/app/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":25,"versionName":"202008241641","enabled":true,"outputFile":"ICL02Blood_V25_202008241641_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V25_202008241641_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 0723be4..1e715ed 100644
--- a/app/src/main/aidl/com/ic/aidl/blood/IBloodAidlInterface.aidl
+++ b/app/src/main/aidl/com/ic/aidl/blood/IBloodAidlInterface.aidl
@@ -7,7 +7,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/java/com/ic/blood/presenter/BloodPresenter.java b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
index 3591bc7..db5efb3 100644
--- a/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
+++ b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
@@ -142,11 +142,17 @@ public class BloodPresenter {
     };
 
     private IBloodAidlInterface.Stub bloodInterface = new IBloodAidlInterface.Stub() {
+        @Override
+        public void updateBloodCheckTemp(int high, int low, int heart) throws RemoteException {
+
+        }
+
         @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));
diff --git a/app/version_code.properties b/app/version_code.properties
index b284582..db89dfd 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Apr 15 18:37:13 CST 2020
-VERSION_CODE=23
+#Mon Aug 24 16:41:16 CST 2020
+VERSION_CODE=25