From: snickersun <scy@incartech.cn>
Date: Sun, 12 Jul 2020 10:45:24 +0000 (+0800)
Subject: release V439
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=d4f08b3187180c02f20ba574e85f2644b77a6140;p=protocol_srv.git

release V439
1、修改 默认心跳时间为5分钟
2、取消登录广播
---

diff --git a/app/release/ICSer_V438_2007100928_release.apk b/app/release/ICSer_V439_2007121833_release.apk
similarity index 79%
rename from app/release/ICSer_V438_2007100928_release.apk
rename to app/release/ICSer_V439_2007121833_release.apk
index 4e6ff5d7..dc102780 100644
Binary files a/app/release/ICSer_V438_2007100928_release.apk and b/app/release/ICSer_V439_2007121833_release.apk differ
diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 67c99dae..c6a3b9ca 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -299,7 +299,7 @@ public class Config {
 
 
   public static int getHeartBeatCycle(Context context){
-    return SharPreferenceUtil.getPrefInt(context,KeyHeartBeatCycle,3);
+    return SharPreferenceUtil.getPrefInt(context,KeyHeartBeatCycle,5);
   }
 
   public static void setHeartBeatCycle(Context context,int cycle){
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index ed9a2550..e3113404 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -523,7 +523,9 @@ public class CoreService extends Service {
             resetStepCount();
         }
 
-        Config.setHeartBeatCycle(this,3); //临时设置为3分钟，给L03测试用。
+
+
+   //     Config.setHeartBeatCycle(this,3); //临时设置为3分钟，给L03测试用。测试断线问题未解决，取消测试。
         //初始化ServerHeartBeat Cycle
         Config.loadHearBeatSetting(runtime);
         //初始化PPG，LocationMod，LocationCycle
diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
index 020620c1..bb617474 100644
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -382,7 +382,7 @@ public static void sendLocationMSG( String Msg){
 
               ICLogger.d(Constants.ACTION_MESSAGE_RECEIVED+" "+paramStringMessage.isFromCache());
                 //广播 voice消息
-              Intent intent = new Intent();
+                Intent intent = new Intent();
                 intent.setAction(Constants.ACTION_MESSAGE_RECEIVED);
                 intent.putExtra(Constants.KEY_MESSAGE_TYPE,"voice");
                 intent.putExtra(Constants.KEY_MESSAGE_FROM,"广播消息");
diff --git a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
index c6e3704e..8ba5fc0a 100644
--- a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
+++ b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
@@ -315,7 +315,7 @@ public class KeepAlive extends AbstractConnectionService {
       }
     }else   if (paramStringMessage.cmd().equals("BP00")) {
       //广播服务器连接成功的消息
-      paramRuntime.getContextProxy().sendBroadcastServerConnectionChanged(true);
+     // paramRuntime.getContextProxy().sendBroadcastServerConnectionChanged(true);
       //登录包收到就停止重链接服务器
       CoreService.getInstance().stopConnectionRetryTimer();
       is_login_send_success=true;
diff --git a/app/version_code.properties b/app/version_code.properties
index f71d6541..f8849926 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Jul 10 09:28:07 CST 2020
-VERSION_CODE=438
+#Sun Jul 12 18:33:28 CST 2020
+VERSION_CODE=439