From: snickersun <scy@incartech.cn>
Date: Wed, 17 Jun 2020 15:33:55 +0000 (+0800)
Subject: release 423
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=2d884d8bc3051e3aea7741f3626038d1512d652b;p=protocol_srv.git

release 423
1、修改登录流程AP00登录后才发送AP03
2、修改Heartrate测试判断，以便兼容新的心率传感器
---

diff --git a/app/app.iml b/app/app.iml
index d430e477..96972aaf 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -18,7 +18,7 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false"/>
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml"/>
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res"/>
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res"/>
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug"/>
         <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value=""/>
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets"/>
       </configuration>
diff --git a/app/release/ICSer_V422_2006152116_release.apk b/app/release/ICSer_V422_2006152116_release.apk
deleted file mode 100644
index 135a69c5..00000000
Binary files a/app/release/ICSer_V422_2006152116_release.apk and /dev/null differ
diff --git a/app/release/ICSer_V423_2006172332_release.apk b/app/release/ICSer_V423_2006172332_release.apk
new file mode 100644
index 00000000..0f640f3d
Binary files /dev/null and b/app/release/ICSer_V423_2006172332_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 6300ee62..2782e93e 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -735,9 +735,13 @@ public class CoreService extends Service {
                     if (connection.isServerConnected() && runtime.isServerProtocolConnected()) {
                         this.mKeepAlive.onHeartAlarm(this.connection, this.runtime);
                     } else {
-                        ICLogger.i("check 发送心跳包时，如果发现服务器没有响应，或者socket连接，则重新尝试连接服务器！");
-                        connection.disconnectServer();
-                        this.startConnectionRetryTimer();
+                       // if (this.mKeepAlive.is_retry_time_above_limit()) {
+                            ICLogger.i("check 发送心跳包时，如果发现服务器没有响应，或者socket连接，则重新尝试连接服务器！");
+                            connection.disconnectServer();
+                            this.startConnectionRetryTimer();
+                       // }else{
+                      //      ICLogger.i("");
+                      //  }
                     }
                     setHeartAlarm();
                     if (Config.LOG_TOFILE)
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 f07da65c..84397870 100644
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -381,6 +381,7 @@ public static void sendLocationMSG( String Msg){
             if (Config.do_broadCast_message_no_indication)
             {
 
+              ICLogger.d(Constants.ACTION_MESSAGE_RECEIVED+" "+paramStringMessage.isFromCache());
                 //广播 voice消息
                 intent = new Intent();
                 intent.setAction(Constants.ACTION_MESSAGE_RECEIVED);
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 ad96c3dc..b76e91b1 100644
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -215,7 +215,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
     mWakeLock=null;
   }
   public void startPPG(){
-    if (ICJniUtils.isPPGavailable()==1 && isTimerStarted==false) {
+    if (ICJniUtils.isPPGavailable()>0 && isTimerStarted==false) {
       currentStat=heartRateStatus.HEARTRATE_WORKINGSTAT.HEARTRATE_OPEN;
       delayCount=4;//检测成功后4秒发送数据
       notWaredCount=5; //初始化没有佩戴的检测次数5，连续5秒没有佩戴则取消检测
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 605e80e5..ef65cb58 100644
--- a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
+++ b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
@@ -53,11 +53,13 @@ public class KeepAlive extends AbstractConnectionService {
 
 //服务器收到AP03 会返回BP03，如果PB03 规定时间没收到，则认为发送心跳失败，需要重发，
   private boolean is_heartBeat_send_success=false;
+  private boolean is_login_send_success=false;
   //如果重试5次还没有连接上，则需要重新断开连接重新连接服务器。
   private int hearBeatResendCount=0;
   private int MaxHeartbeatResendTime=6;
   //每次retry发送心跳的间隔为20秒
   private int heartBeatRetryTimeout=20;
+
   //监测 心跳服务器响应的timer
   private ScheduledThreadPoolExecutor scheduled = null;
   private Runnable CheckSrvResponseTimerTask=new Runnable() {
@@ -108,7 +110,11 @@ public class KeepAlive extends AbstractConnectionService {
           //更新系统的IMEI
           boolean ret=DeviceInfoUtil.updateImei(mRuntime);
           ICLogger.i("Update IMEI "+ret);
-          connection.send(protocolAPIHelper.genStringMessage("heart", protocolAPIHelper.getHeartbeatMSG(mRuntime)));
+          if (is_login_send_success)
+            connection.send(protocolAPIHelper.genStringMessage("heart", protocolAPIHelper.getHeartbeatMSG(mRuntime)));
+          else
+            connection.send(protocolAPIHelper.genStringMessage("heart", protocolAPIHelper.getLoginMSG(mRuntime)));
+
         }
       }
 
@@ -247,24 +253,14 @@ public class KeepAlive extends AbstractConnectionService {
     boolean ret=DeviceInfoUtil.updateImei(paramRuntime);
     ICLogger.i("Update IMEI "+ret);
     //发送登录包
+    is_login_send_success=false;
     Observable.timer(500L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {
       public void call(Long param1Long) {
         connection.send(protocolAPIHelper.genStringMessage("AP00",protocolAPIHelper.getLoginMSG(paramRuntime)));
 
       }
     });
-    //心跳开始发送的时候，先重置response检测标志
-    is_heartBeat_send_success=false;
-    //发送心跳包
-    Observable.timer(3500L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {
-      public void call(Long param1Long) {
-        //这时重新连接服务器才进行的连接，理论上close已经设置false，此次可以认为协议定然断开，所以设置为false作为双重保险。
-        mRuntime.setServerProtocolConnected(false);
-        connection.send(protocolAPIHelper.genStringMessage("heart",protocolAPIHelper.getHeartbeatMSG(paramRuntime)));
-        //发送完心跳后，开始检查服务器响应
-        startResponseCheckTimer();
-      }
-    });
+
 
 
      isConnected = true;
@@ -310,7 +306,7 @@ public class KeepAlive extends AbstractConnectionService {
 
 //      LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_ON);
 //      Deliver.triggerSendThread(); //链接上就尝试清除 buffer中的数据
-      CoreService.getInstance().stopConnectionRetryTimer();
+
       if (CoreService.needLocateInAfterHeartBeat==true){
         //第一次启动或者系统Close后重连的时候，重置LocationCycle
         CoreService.needLocateInAfterHeartBeat=false;
@@ -320,6 +316,24 @@ public class KeepAlive extends AbstractConnectionService {
     }else   if (paramStringMessage.cmd().equals("BP00")) {
       //广播服务器连接成功的消息
       paramRuntime.getContextProxy().sendBroadcastServerConnectionChanged(true);
+      //登录包收到就停止重链接服务器
+      CoreService.getInstance().stopConnectionRetryTimer();
+      is_login_send_success=true;
+      //收到登录包反馈后再发送心跳
+
+      //心跳开始发送的时候，先重置response检测标志
+      is_heartBeat_send_success=false;
+      //发送心跳包
+      Observable.timer(3500L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {
+        public void call(Long param1Long) {
+          //这时重新连接服务器才进行的连接，理论上close已经设置false，此次可以认为协议定然断开，所以设置为false作为双重保险。
+          mRuntime.setServerProtocolConnected(false);
+          connection.send(protocolAPIHelper.genStringMessage("heart",protocolAPIHelper.getHeartbeatMSG(paramRuntime)));
+          //发送完心跳后，开始检查服务器响应
+          startResponseCheckTimer();
+        }
+      });
+
     }
     return false;
   }
diff --git a/app/version_code.properties b/app/version_code.properties
index 3d738310..0df057be 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Jun 15 21:16:00 CST 2020
-VERSION_CODE=422
+#Wed Jun 17 23:32:50 CST 2020
+VERSION_CODE=423