From: snickersun Date: Mon, 26 Oct 2020 11:07:57 +0000 (+0800) Subject: release V675 X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=b15348dbc834a95616c8b4d599e64733681b0f84;p=protocol_srv.git 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 29d7abd9..a0394706 100644 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 4e3d20da..c839722e 100644 --- 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 36767bf1..4a3981e8 100644 --- 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){ //没有充电，上次电池level > 15% , 上次电池并且不是 低电状态，则报警 - if (runtime.isPowerConnected()==false && runtime.getBatterylevel()<= 15 && runtime.getBatterylevel()> 5) { + if (runtime.isPowerConnected()==false && runtime.getBatterylevel()<= 10 && runtime.getBatterylevel()> 5 && runtime.getBatteryLow()==false) { Intent intent=new Intent(); intent.setAction(ACTION_BATTERYLOW); intent.putExtra(KEY_BATTERY_EVENT,1); 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 78407afe..a60b1be0 100644 --- 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; case BPHP: handleBPHP(); - mConnection.DeliverCMDMessageToSystem("IWAPHP",cmd);//通知下面线程状态变化 + mConnection.DeliverCMDMessageToSystem("APHP",cmd);//通知下面线程状态变化 break; case BPX1://设置 心率血压血氧修正值 handleBPX1(cmd,mConnection,mRuntime); diff --git a/app/version_code.properties b/app/version_code.properties index c9350043..d7199029 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Sun Oct 25 00:53:08 CST 2020 -VERSION_CODE=674 +#Mon Oct 26 19:01:39 CST 2020 +VERSION_CODE=675 diff --git a/dNSCache/dNSCache.iml b/dNSCache/dNSCache.iml index 9e1eb977..8d78d7a1 100644 --- a/dNSCache/dNSCache.iml +++ b/dNSCache/dNSCache.iml @@ -1,5 +1,5 @@ - + @@ -19,8 +19,8 @@ @@ -31,16 +31,16 @@ - + - - + + diff --git a/icsupport.iml b/icsupport.iml index 9c9054b6..b525d968 100644 --- a/icsupport.iml +++ b/icsupport.iml @@ -1,5 +1,5 @@ - + diff --git a/local.properties b/local.properties index 3fdf6cc1..85972cc3 100644 --- a/local.properties +++ b/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Sat Sep 05 01:02:47 CST 2020 -sdk.dir=D\:\\Android\\Sdk +#Mon Oct 12 09:44:16 CST 2020 +sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk