release V675

1、解决APHP 上传检测错误造成的协议消息死锁问题
2、电池报警改为10%上报一次，5% 上报至少一次。

diff --git a/app/release/ICSer_V674_2010250053_release.apk b/app/release/ICSer_V675_2010261901_release.apk
similarity index 78%
rename from app/release/ICSer_V674_2010250053_release.apk
rename to app/release/ICSer_V675_2010261901_release.apk
index 29d7abd..a039470 100644 (file)
Binary files a/app/release/ICSer_V674_2010250053_release.apk and b/app/release/ICSer_V675_2010261901_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 4e3d20d..c839722 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":674,"versionName":"2010250053","enabled":true,"outputFile":"ICSer_V674_2010250053_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V674_2010250053_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":675,"versionName":"2010261901","enabled":true,"outputFile":"ICSer_V675_2010261901_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V675_2010261901_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
index 36767bf..4a3981e 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
@@ -149,7 +149,7 @@ public class BatteryUtil {
   public static void checkAndSendBatteryEvent(Context context, Runtime runtime){\r
 \r
     //没有充电，上次电池level > 15% , 上次电池并且不是 低电状态，则报警\r
-    if (runtime.isPowerConnected()==false  && runtime.getBatterylevel()<= 15 && runtime.getBatterylevel()> 5) {\r
+    if (runtime.isPowerConnected()==false  && runtime.getBatterylevel()<= 10 && runtime.getBatterylevel()> 5 && runtime.getBatteryLow()==false) {\r
       Intent intent=new Intent();\r
       intent.setAction(ACTION_BATTERYLOW);\r
       intent.putExtra(KEY_BATTERY_EVENT,1);\r

diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java
index 78407af..a60b1be 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -2676,7 +2676,7 @@ public class protocol_ic {
                 break;\r
             case BPHP:\r
                 handleBPHP();\r
-                mConnection.DeliverCMDMessageToSystem("IWAPHP",cmd);//通知下面线程状态变化\r
+                mConnection.DeliverCMDMessageToSystem("APHP",cmd);//通知下面线程状态变化\r
                 break;\r
             case BPX1://设置 心率血压血氧修正值\r
                 handleBPX1(cmd,mConnection,mRuntime);\r

diff --git a/app/version_code.properties b/app/version_code.properties
index c935004..d719902 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sun Oct 25 00:53:08 CST 2020\r
-VERSION_CODE=674\r
+#Mon Oct 26 19:01:39 CST 2020\r
+VERSION_CODE=675\r

diff --git a/dNSCache/dNSCache.iml b/dNSCache/dNSCache.iml
index 9e1eb97..8d78d7a 100644 (file)
--- a/dNSCache/dNSCache.iml
+++ b/dNSCache/dNSCache.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<module external.linked.project.id=":dNSCache" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">\r
+<module external.linked.project.id=":dNSCache" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="icsupport" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">\r
   <component name="FacetManager">\r
     <facet type="android-gradle" name="Android-Gradle">\r
       <configuration>\r
@@ -19,8 +19,8 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />\r
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />\r
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />\r
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />\r
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />\r
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />\r
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" />\r
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />\r
         <option name="PROJECT_TYPE" value="1" />\r
       </configuration>\r
@@ -31,16 +31,16 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />\r
     <exclude-output />\r
     <content url="file://$MODULE_DIR$">\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />\r

diff --git a/icsupport.iml b/icsupport.iml
index 9c9054b..b525d96 100644 (file)
--- a/icsupport.iml
+++ b/icsupport.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<module external.linked.project.id="icsupport" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">\r
+<module external.linked.project.id="icsupport" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">\r
   <component name="FacetManager">\r
     <facet type="java-gradle" name="Java-Gradle">\r
       <configuration>\r

diff --git a/local.properties b/local.properties
index 3fdf6cc..85972cc 100644 (file)
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.\r
 # For customization when using a Version Control System, please read the\r
 # header note.\r
-#Sat Sep 05 01:02:47 CST 2020\r
-sdk.dir=D\:\\Android\\Sdk\r
+#Mon Oct 12 09:44:16 CST 2020\r
+sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk\r