release V443

1、BP15按照分钟计量 in protocol_ic
2、修复体温界面测量后不发送测量值问题

diff --git a/app/release/ICSer_V443_2007130022_release.apk b/app/release/ICSer_V443_2007130022_release.apk
new file mode 100644 (file)
index 0000000..643b764
Binary files /dev/null and b/app/release/ICSer_V443_2007130022_release.apk differ

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index c363fb9..70795ce 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -524,7 +524,8 @@ public class CoreService extends Service {
             resetStepCount();\r
         }\r
 \r
-\r
+        //初始化消息相关配置\r
+        Config.LoadMessageConfigs();\r
         if (Config.c41_branch_name.equals("H88")){\r
 \r
             if (Config.getH88InitFlag(this)==0) {\r
@@ -544,8 +545,7 @@ public class CoreService extends Service {
         Config.loadCustomServerAddr(this);\r
         Config.loadServerSettings(runtime);\r
 \r
-        //初始化消息相关配置\r
-        Config.LoadMessageConfigs();\r
+\r
 \r
 \r
         //初始化温度测试相关参数\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
index e9c8afa..133df78 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -354,22 +354,7 @@ public class ProcessReceiver extends BroadcastReceiver {
             this.screenOn(paramContext);\r
           }\r
         }\r
-      } else if (!ACTION_CLOSE_UNREAD_MSG.equals(paramIntent.getAction()) && !"android.intent.action.BATTERY_LOW".equals(paramIntent.getAction())) {\r
-        if ("com.enqualcomm.support.ACTION_MISSED_CALL_GET".equals(str)) {\r
-          contact = (Contact)paramIntent.getParcelableExtra("contact");\r
-          contact.extra = paramIntent.getStringExtra("date");\r
-          isSilence = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);\r
-          if (contact != null && !isSilence) {\r
-            this.initMyDialog(paramContext, contact, 2,"");\r
-            this.playNotificationVoice(paramContext);\r
-            VibrateUtil.getInstance(paramContext).VibrateOn(true);\r
-            this.screenOn(paramContext);\r
-          }\r
-        }\r
-        //如果来电了，还有未读的消息，干脆关掉，防止影响接电话。\r
-        if (mCustomDialog != null && mCustomDialog.isShowing()) {\r
-          mCustomDialog.dismiss();\r
-        }\r
+\r
       }else if (ACTION_TEMP_RESULT.equals(str)) {\r
       double wrist_temp=paramIntent.getDoubleExtra(KEY_TEMP_WRIST,0.0f);\r
       double body_temp=paramIntent.getDoubleExtra(KEY_TEMP_BODY,0.0f);\r
@@ -378,6 +363,7 @@ public class ProcessReceiver extends BroadcastReceiver {
       Deliver.sendLocationMSG(temperatureMsg);\r
 \r
     } else {\r
+      //如果来电了，还有未读的消息，干脆关掉，防止影响接电话。\r
         if (mCustomDialog != null && mCustomDialog.isShowing()) {\r
           mCustomDialog.dismiss();\r
         }\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 80aaaa2..8ccf170 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -1270,7 +1270,7 @@ public class protocol_ic {
             ICLogger.i("BP15 , 定位周期="+time+"秒");\r
 \r
             Config.setLocationMode(runtime.getContextProxy().context, ICLocation.CUSTOM_MOD8_GPS);\r
-            Config.setLocationCycle(runtime.getContextProxy().context,Integer.valueOf(time));\r
+            Config.setLocationCycle(runtime.getContextProxy().context,Integer.valueOf(time)*60);\r
             runtime.getLocationInstance().setWorkingMod(Config.getLocationMode(runtime.getContextProxy().context));\r
             runtime.getLocationInstance().setLocation_cycle(Config.getLocationCycle(runtime.getContextProxy().context));\r
             //set AlarmCycle  and trigger Location\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 0c27c55..e75c472 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sun Jul 12 22:52:23 CST 2020\r
-VERSION_CODE=442\r
+#Mon Jul 13 00:22:23 CST 2020\r
+VERSION_CODE=443\r