From: TrillGates <williamtrillgates@gmail.com>
Date: Fri, 3 Sep 2021 10:50:12 +0000 (+0800)
Subject: fixed heart rate notification values issues.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=6d2c4e5bae103c6a72797224f04aa19a278fc7ea;p=icsupport.git

fixed heart rate notification values issues.
---

diff --git a/app/release/ICSer_V943_2109031614_release.apk b/app/release/ICSer_V944_2109031730_release.apk
similarity index 77%
rename from app/release/ICSer_V943_2109031614_release.apk
rename to app/release/ICSer_V944_2109031730_release.apk
index 226ab70a..61ead30c 100644
Binary files a/app/release/ICSer_V943_2109031614_release.apk and b/app/release/ICSer_V944_2109031730_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 676d6114..397cdf1f 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":943,"versionName":"2109031614","enabled":true,"outputFile":"ICSer_V943_2109031614_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V943_2109031614_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":944,"versionName":"2109031730","enabled":true,"outputFile":"ICSer_V944_2109031730_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V944_2109031730_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index c0af4fc2..4d17ffee 100644
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -206,6 +206,7 @@ public class ICSmsManager extends BroadcastReceiver {
         ContentValues contentValues = new ContentValues();
         contentValues.put(ICDatabaseHelper.notification_category, "com.ic.mms");
         contentValues.put(ICDatabaseHelper.notification_title, targetDisplay);
+        contentValues.put(ICDatabaseHelper.notification_phone, phoneNum);
         contentValues.put(ICDatabaseHelper.notification_type, type);
         contentValues.put(ICDatabaseHelper.notification_date, System.currentTimeMillis());
         contentValues.put(ICDatabaseHelper.notification_order, 0);
diff --git a/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java b/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java
index 019f37cf..e4ceea28 100644
--- a/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java
@@ -248,6 +248,8 @@ public class ICDatabaseHelper extends SQLiteOpenHelper {
                 " text, " +
                 notification_order +
                 " integer, " +
+                notification_phone +
+                " integer, " +
                 notification_date +
                 " date, " +
                 notification_create_time +
@@ -308,6 +310,7 @@ public class ICDatabaseHelper extends SQLiteOpenHelper {
     public static final String tb_notification = "notification";
     public static final String notification_id = "_id";
     public static final String notification_title = "title";
+    public static final String notification_phone = "phone";
     public static final String notification_date = "date";
     //短信，未接电话，心率，血氧，体温（这个控制icon）
     public static final String notification_type = "type";
diff --git a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
index 2e4f6d73..c2cfe091 100644
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -245,7 +245,8 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
             if (bloodHeightValue > Config.LIMIT_VALUE_BPH_H || bloodHeightValue < Config.LIMIT_VALUE_BPH_L) {
                 //警报，血压高值超出范围
                 ICLogger.d("血压高压异常...");
-                createWarningNotification(context.getString(R.string.blood_presure_exception_tips_text) + bloodHeightValue + "/100mmHg)",
+                createWarningNotification(context.getString(R.string.blood_presure_exception_tips_text)
+                                + bloodHeightValue + "/100mmHg)",
                         NOTIFICATION_TYPE_BLOOD_PRESSURE, Constants.WARNING_MSG_TYPE_BLOOD_PRESSURE);
                 VibrateUtil.getInstance(context).vibrateOn(true);
             }
@@ -256,7 +257,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
             if (bloodLowValue > Config.LIMIT_VALUE_BPL_H || bloodLowValue < Config.LIMIT_VALUE_BPL_L) {
                 //警报，血压低值超出范围
                 ICLogger.d("血压低压异常...");
-                createWarningNotification(context.getString(R.string.blood_presure_exception_tips_text) + bloodHeightValue + "/100mmHg)",
+                createWarningNotification(context.getString(R.string.blood_presure_exception_tips_text) + bloodLowValue + "/100mmHg)",
                         NOTIFICATION_TYPE_BLOOD_PRESSURE, Constants.WARNING_MSG_TYPE_BLOOD_PRESSURE);
                 VibrateUtil.getInstance(context).vibrateOn(true);
             }
diff --git a/app/version_code.properties b/app/version_code.properties
index 66d1e171..26b8202e 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Sep 03 16:14:44 CST 2021
-VERSION_CODE=943
+#Fri Sep 03 17:30:20 CST 2021
+VERSION_CODE=944