From: snickersun <snickersun@qq.com>
Date: Sun, 12 Jul 2020 16:28:24 +0000 (+0800)
Subject: release V443
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=8c982f1c7d7c23e994b2616c229b4111020f7857;p=protocol_srv.git

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
index 00000000..643b7642
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 c363fb96..70795ce5 100644
--- 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();
         }
 
-
+        //初始化消息相关配置
+        Config.LoadMessageConfigs();
         if (Config.c41_branch_name.equals("H88")){
 
             if (Config.getH88InitFlag(this)==0) {
@@ -544,8 +545,7 @@ public class CoreService extends Service {
         Config.loadCustomServerAddr(this);
         Config.loadServerSettings(runtime);
 
-        //初始化消息相关配置
-        Config.LoadMessageConfigs();
+
 
 
         //初始化温度测试相关参数
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 e9c8afad..133df780 100644
--- 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);
           }
         }
-      } else if (!ACTION_CLOSE_UNREAD_MSG.equals(paramIntent.getAction()) && !"android.intent.action.BATTERY_LOW".equals(paramIntent.getAction())) {
-        if ("com.enqualcomm.support.ACTION_MISSED_CALL_GET".equals(str)) {
-          contact = (Contact)paramIntent.getParcelableExtra("contact");
-          contact.extra = paramIntent.getStringExtra("date");
-          isSilence = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
-          if (contact != null && !isSilence) {
-            this.initMyDialog(paramContext, contact, 2,"");
-            this.playNotificationVoice(paramContext);
-            VibrateUtil.getInstance(paramContext).VibrateOn(true);
-            this.screenOn(paramContext);
-          }
-        }
-        //如果来电了，还有未读的消息，干脆关掉，防止影响接电话。
-        if (mCustomDialog != null && mCustomDialog.isShowing()) {
-          mCustomDialog.dismiss();
-        }
+
       }else if (ACTION_TEMP_RESULT.equals(str)) {
       double wrist_temp=paramIntent.getDoubleExtra(KEY_TEMP_WRIST,0.0f);
       double body_temp=paramIntent.getDoubleExtra(KEY_TEMP_BODY,0.0f);
@@ -378,6 +363,7 @@ public class ProcessReceiver extends BroadcastReceiver {
       Deliver.sendLocationMSG(temperatureMsg);
 
     } else {
+      //如果来电了，还有未读的消息，干脆关掉，防止影响接电话。
         if (mCustomDialog != null && mCustomDialog.isShowing()) {
           mCustomDialog.dismiss();
         }
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 80aaaa23..8ccf1707 100644
--- 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+"秒");
 
             Config.setLocationMode(runtime.getContextProxy().context, ICLocation.CUSTOM_MOD8_GPS);
-            Config.setLocationCycle(runtime.getContextProxy().context,Integer.valueOf(time));
+            Config.setLocationCycle(runtime.getContextProxy().context,Integer.valueOf(time)*60);
             runtime.getLocationInstance().setWorkingMod(Config.getLocationMode(runtime.getContextProxy().context));
             runtime.getLocationInstance().setLocation_cycle(Config.getLocationCycle(runtime.getContextProxy().context));
             //set AlarmCycle  and trigger Location
diff --git a/app/version_code.properties b/app/version_code.properties
index 0c27c55f..e75c4726 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sun Jul 12 22:52:23 CST 2020
-VERSION_CODE=442
+#Mon Jul 13 00:22:23 CST 2020
+VERSION_CODE=443