修复搜星个数错误，减少每次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 8907605..2c1b211 100644 (file)
--- 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:\r
 \r
               //GPS 优先的话多给些时间（10秒）\r
-            if (checktimes> 60) timeout=true;\r
+            if (checktimes> 50) timeout=true;\r
 \r
             if ((lbs_ok && timeout==true) ||(lbs_ok && gps_ok && wifi_ok )||(lbs_ok&&gps_nosignal&&wifi_ok)){\r
 \r
@@ -708,11 +708,11 @@ public void updateCellInfo() {
               LocationClient.linkOK=false;\r
               try {\r
                 if (KeepAlive.isConnected) {\r
-                  //如果 服务器连接状态，等30秒\r
+                  //如果 服务器连接状态，等30秒,随时等待数据发送\r
                   Logger.i("KeepAlive.isConnected "+KeepAlive.isConnected+" delay 30000ms");\r
                   this.condition.await(30000L, TimeUnit.MILLISECONDS);\r
                 } else {\r
-                  //如果服务器断开，等5秒 以便连接后尽快响应\r
+                  //如果服务器断开，等5秒 以便连接后尽快进入下一循环，尽量及时响应\r
                 Logger.i("KeepAlive.isConnected "+KeepAlive.isConnected+ "  , connection isconnected "+connection.isServerConnected()+" delay 5000ms");\r
 \r
                   this.condition.await(5000L, TimeUnit.MILLISECONDS);\r

diff --git a/app/src/main/java/com/ic/protocol/NMEAListener.java b/app/src/main/java/com/ic/protocol/NMEAListener.java
index 4b8cbeb..edc9a0b 100644 (file)
--- 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 {
 \r
         count++;\r
       }\r
-      sb2.append("搜索"+searchCout+"次，搜索到卫星个数:"+maxSatellites+" , (SNR>0)：" + numSatelliteList.size()+" \n Max 3 SNRs[ " );\r
+      sb2.append("搜索"+searchCout+"次，搜索到卫星个数:"+count+" , (SNR>0)：" + numSatelliteList.size()+" \n Max 3 SNRs[ " );\r
       for (int i=0;i<max3Satellite.size();i++){\r
         sb2.append(max3Satellite.get(i).getSnr());\r
         sb2.append(", ");\r