From: snickersun <scy@incartech.cn>
Date: Sat, 18 Jan 2020 09:34:23 +0000 (+0800)
Subject: 修复搜星个数错误，减少每次GPS等待时间为50秒，之前60秒，而间隔时间也是60秒，会造成必然错过一次定位。
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=0736807aec54f1374d5f4cabb6e1955c35014a1b;p=icsupport.git

修复搜星个数错误，减少每次GPS等待时间为50秒，之前60秒，而间隔时间也是60秒，会造成必然错过一次定位。
---

diff --git a/app/src/main/java/com/ic/protocol/LocationClient.java b/app/src/main/java/com/ic/protocol/LocationClient.java
index 8907605d..2c1b2119 100644
--- a/app/src/main/java/com/ic/protocol/LocationClient.java
+++ b/app/src/main/java/com/ic/protocol/LocationClient.java
@@ -351,7 +351,7 @@ public class LocationClient {
           case ICLocation.REALTIME_MOD:
 
               //GPS 优先的话多给些时间（10秒）
-            if (checktimes> 60) timeout=true;
+            if (checktimes> 50) timeout=true;
 
             if ((lbs_ok && timeout==true) ||(lbs_ok && gps_ok && wifi_ok )||(lbs_ok&&gps_nosignal&&wifi_ok)){
 
@@ -708,11 +708,11 @@ public void updateCellInfo() {
               LocationClient.linkOK=false;
               try {
                 if (KeepAlive.isConnected) {
-                  //如果 服务器连接状态，等30秒
+                  //如果 服务器连接状态，等30秒,随时等待数据发送
                   Logger.i("KeepAlive.isConnected "+KeepAlive.isConnected+" delay 30000ms");
                   this.condition.await(30000L, TimeUnit.MILLISECONDS);
                 } else {
-                  //如果服务器断开，等5秒 以便连接后尽快响应
+                  //如果服务器断开，等5秒 以便连接后尽快进入下一循环，尽量及时响应
                 Logger.i("KeepAlive.isConnected "+KeepAlive.isConnected+ "  , connection isconnected "+connection.isServerConnected()+" delay 5000ms");
 
                   this.condition.await(5000L, TimeUnit.MILLISECONDS);
diff --git a/app/src/main/java/com/ic/protocol/NMEAListener.java b/app/src/main/java/com/ic/protocol/NMEAListener.java
index 4b8cbeba..edc9a0ba 100644
--- a/app/src/main/java/com/ic/protocol/NMEAListener.java
+++ b/app/src/main/java/com/ic/protocol/NMEAListener.java
@@ -208,7 +208,7 @@ public class NMEAListener implements NmeaListener, LocationListener {
 
         count++;
       }
-      sb2.append("搜索"+searchCout+"次，搜索到卫星个数:"+maxSatellites+" , (SNR>0)：" + numSatelliteList.size()+" \n Max 3 SNRs[ " );
+      sb2.append("搜索"+searchCout+"次，搜索到卫星个数:"+count+" , (SNR>0)：" + numSatelliteList.size()+" \n Max 3 SNRs[ " );
       for (int i=0;i<max3Satellite.size();i++){
         sb2.append(max3Satellite.get(i).getSnr());
         sb2.append(", ");