update gps

diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
index 2489249..b210b7b 100644 (file)
Binary files a/.gradle/5.4.1/executionHistory/executionHistory.bin and b/.gradle/5.4.1/executionHistory/executionHistory.bin differ

diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock
index 82d4bd2..e83888b 100644 (file)
Binary files a/.gradle/5.4.1/executionHistory/executionHistory.lock and b/.gradle/5.4.1/executionHistory/executionHistory.lock differ

diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin
index 36d9f2d..e6dd7e5 100644 (file)
Binary files a/.gradle/5.4.1/fileHashes/fileHashes.bin and b/.gradle/5.4.1/fileHashes/fileHashes.bin differ

diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
index 42ebb4b..3e44039 100644 (file)
Binary files a/.gradle/5.4.1/fileHashes/fileHashes.lock and b/.gradle/5.4.1/fileHashes/fileHashes.lock differ

diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin
index 21649e0..aeefaa1 100644 (file)
Binary files a/.gradle/5.4.1/javaCompile/classAnalysis.bin and b/.gradle/5.4.1/javaCompile/classAnalysis.bin differ

diff --git a/.gradle/5.4.1/javaCompile/javaCompile.lock b/.gradle/5.4.1/javaCompile/javaCompile.lock
index 2ea2836..b07e8c1 100644 (file)
Binary files a/.gradle/5.4.1/javaCompile/javaCompile.lock and b/.gradle/5.4.1/javaCompile/javaCompile.lock differ

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 41c763b..9aee7d1 100644 (file)
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b40189b..6e67cb5 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,45 +10,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a0feeb22-06b0-4f90-bebc-7c0a45a72929" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2_jar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/StepCounterInterface.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/release/ICSer_V110_202001070902_release.apk" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/release/output.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GSensorListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GSensorListener.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/version_code.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/version_code.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/library/library.iml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/settings.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/settings.gradle" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -77,11 +46,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="467">
-              <caret line="748" column="35" selection-start-line="748" selection-start-column="31" selection-end-line="748" selection-end-column="35" />
+            <state relative-caret-position="106">
+              <caret line="451" column="17" lean-forward="true" selection-start-line="451" selection-start-column="17" selection-end-line="451" selection-end-column="17" />
               <folding>
                 <element signature="e#28369#28370#0" expanded="true" />
                 <element signature="e#28404#28405#0" expanded="true" />
@@ -97,17 +66,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="478">
-              <caret line="382" column="5" lean-forward="true" selection-start-line="382" selection-start-column="5" selection-end-line="382" selection-end-column="5" />
+            <state relative-caret-position="345">
+              <caret line="381" column="46" lean-forward="true" selection-start-line="381" selection-start-column="46" selection-end-line="381" selection-end-column="46" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="174">
-              <caret line="86" lean-forward="true" selection-start-line="86" selection-end-line="86" />
+            <state relative-caret-position="46">
+              <caret line="356" column="24" selection-start-line="356" selection-start-column="24" selection-end-line="356" selection-end-column="24" />
               <folding>
                 <element signature="e#914#928#0" expanded="true" />
                 <element signature="e#1000#1014#0" expanded="true" />
@@ -121,8 +90,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="267">
-              <caret line="518" column="30" selection-start-line="518" selection-start-column="30" selection-end-line="518" selection-end-column="30" />
+            <state relative-caret-position="228">
+              <caret line="129" column="20" selection-start-line="129" selection-start-column="20" selection-end-line="129" selection-end-column="20" />
             </state>
           </provider>
         </entry>
@@ -149,6 +118,15 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="330">
+              <caret line="262" column="25" selection-start-line="262" selection-start-column="14" selection-end-line="262" selection-end-column="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/StepCounterInterface.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -188,9 +166,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>queue</find>
-      <find>location</find>
-      <find>getApkBaseName</find>
       <find>bootClasspath</find>
       <find>TYPE_STEP_COUNTER</find>
       <find>CompileOptions</find>
@@ -205,19 +180,22 @@
       <find>EqcAlgorithmInterfaceMethod3</find>
       <find>EqcAlgorithmInterfaceMethod2</find>
       <find>H10</find>
-      <find>Start</find>
       <find>gpstest</find>
-      <find>scanresult</find>
-      <find>locationManager</find>
-      <find>flag</find>
       <find>GPS_PROVIDER</find>
       <find>readGpsThread</find>
-      <find>ReadGpsThread</find>
       <find>locationListener</find>
       <find>requestLocationUpdates</find>
       <find>LocationManager</find>
       <find>locationInfo</find>
       <find>getBestLocation</find>
+      <find>isFrist</find>
+      <find>updateView</find>
+      <find>updateGpsStatus</find>
+      <find>flag</find>
+      <find>ReadGpsThread</find>
+      <find>scanresult</find>
+      <find>locationManager</find>
+      <find>Start</find>
     </findStrings>
   </component>
   <component name="GenerateSignedApkSettings">
@@ -453,11 +431,11 @@
       <window_info id="Resources Explorer" order="7" sideWeight="0.49861497" weight="0.32995737" />
       <window_info id="Capture Tool" order="8" />
       <window_info anchor="bottom" id="Run" order="0" />
-      <window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.6551173" weight="0.44902387" />
+      <window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.6540512" weight="0.44902387" />
       <window_info anchor="bottom" id="TODO" order="2" weight="0.329718" />
-      <window_info active="true" anchor="bottom" id="Find" order="3" sideWeight="0.4968017" visible="true" weight="0.47396964" />
+      <window_info active="true" anchor="bottom" id="Find" order="3" sideWeight="0.49573562" visible="true" weight="0.47396964" />
       <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49840087" weight="0.329718" />
-      <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50319827" side_tool="true" visible="true" weight="0.47396964" />
+      <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.5042644" side_tool="true" visible="true" weight="0.47396964" />
       <window_info anchor="bottom" id="Version Control" order="6" weight="0.329718" />
       <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49840087" weight="0.21691974" />
       <window_info anchor="bottom" id="Debug" order="8" sideWeight="0.49626866" weight="0.329718" />
@@ -682,13 +660,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1254">
-          <caret line="76" column="39" selection-start-line="76" selection-start-column="39" selection-end-line="76" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/TimeUtil.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="76">
@@ -819,21 +790,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="467">
-          <caret line="748" column="35" selection-start-line="748" selection-start-column="31" selection-end-line="748" selection-end-column="35" />
-          <folding>
-            <element signature="e#28369#28370#0" expanded="true" />
-            <element signature="e#28404#28405#0" expanded="true" />
-            <element signature="e#28457#28458#0" expanded="true" />
-            <element signature="e#28501#28502#0" expanded="true" />
-            <element signature="e#35729#35730#0" expanded="true" />
-            <element signature="e#35765#35766#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="273">
@@ -858,13 +814,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="267">
-          <caret line="518" column="30" selection-start-line="518" selection-start-column="30" selection-end-line="518" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/location/LocationListener.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="114">
@@ -879,13 +828,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="478">
-          <caret line="382" column="5" lean-forward="true" selection-start-line="382" selection-start-column="5" selection-end-line="382" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GPSListener.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="216">
@@ -920,10 +862,24 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="262" column="25" selection-start-line="262" selection-start-column="14" selection-end-line="262" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="381" column="46" lean-forward="true" selection-start-line="381" selection-start-column="46" selection-end-line="381" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="174">
-          <caret line="86" lean-forward="true" selection-start-line="86" selection-end-line="86" />
+        <state relative-caret-position="46">
+          <caret line="356" column="24" selection-start-line="356" selection-start-column="24" selection-end-line="356" selection-end-column="24" />
           <folding>
             <element signature="e#914#928#0" expanded="true" />
             <element signature="e#1000#1014#0" expanded="true" />
@@ -933,5 +889,27 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="228">
+          <caret line="129" column="20" selection-start-line="129" selection-start-column="20" selection-end-line="129" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="451" column="17" lean-forward="true" selection-start-line="451" selection-start-column="17" selection-end-line="451" selection-end-column="17" />
+          <folding>
+            <element signature="e#28369#28370#0" expanded="true" />
+            <element signature="e#28404#28405#0" expanded="true" />
+            <element signature="e#28457#28458#0" expanded="true" />
+            <element signature="e#28501#28502#0" expanded="true" />
+            <element signature="e#35729#35730#0" expanded="true" />
+            <element signature="e#35765#35766#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/protocol/NMEAListener.java b/app/src/main/java/com/ic/protocol/NMEAListener.java
index 721babe..6efb646 100644 (file)
--- a/app/src/main/java/com/ic/protocol/NMEAListener.java
+++ b/app/src/main/java/com/ic/protocol/NMEAListener.java
@@ -32,10 +32,13 @@ public class NMEAListener implements NmeaListener, LocationListener {
   private List<GpsSatellite> numSatelliteList = new ArrayList<GpsSatellite>(); // 卫星信号\r
   private List<GpsSatellite> max3Satellite = new ArrayList<GpsSatellite>(); // 卫星信号\r
   private int satelliteInfo = 0;\r
-  private ReadGpsThread readGpsThread;\r
+  private ReadGpsThread readGpsThread=null;\r
   private double longitude;\r
   private double latitude;\r
   private boolean flag;\r
+  private int SearchTimeout = 120;\r
+  private int noSignalCount=0;\r
+  private int searchCout=0;\r
   int gpsMode;\r
   int numberOfSatellites;\r
   Runtime runtime;\r
@@ -43,6 +46,7 @@ public class NMEAListener implements NmeaListener, LocationListener {
   public NMEAListener(LocationManager paramLocationManager, Runtime paramRuntime) {\r
     this.locationManager = paramLocationManager;\r
     this.runtime = paramRuntime;\r
+//    readGpsThread=new ReadGpsThread();\r
   }\r
   \r
   public void onLocationChanged(Location paramLocation) {}\r
@@ -68,23 +72,23 @@ public class NMEAListener implements NmeaListener, LocationListener {
         case  GpsStatus.GPS_EVENT_SATELLITE_STATUS:\r
 \r
 \r
-            //如果是自动测试，则有3颗大于20的就算通过\r
-            if (max3Satellite.size() >= 3  && max3Satellite.get(2).getSnr()>=30) {\r
-\r
-              if (readGpsThread != null) {\r
-                readGpsThread.endThread();\r
-              }\r
-              if (flag) {\r
-                flag = false;\r
-                pass();\r
-              }\r
-            }\r
+//            //如果是自动测试，则有3颗大于20的就算通过\r
+//            if (max3Satellite.size() >= 3  && max3Satellite.get(2).getSnr()>=30) {\r
+//\r
+//              if (readGpsThread != null) {\r
+//                readGpsThread.endThread();\r
+//              }\r
+//              if (flag) {\r
+//                flag = false;\r
+//                pass();\r
+//              }\r
+//            }\r
 \r
 \r
             //如果是pcba测试，则只要有一颗大于30的星就算通过。\r
-            if (max3Satellite.size() > 0  && max3Satellite.get(0).getSnr()>=30) {\r
-\r
-\r
+//            if (max3Satellite.size() > 0  && max3Satellite.get(0).getSnr()>=30) {\r
+            //GPS 5秒钟搜不到足够多的星，认为不能定位，取消搜星\r
+            if(noSignalCount > 5){\r
               if (readGpsThread != null) {\r
                 readGpsThread.endThread();\r
               }\r
@@ -103,10 +107,11 @@ public class NMEAListener implements NmeaListener, LocationListener {
           if (readGpsThread != null) {\r
             readGpsThread.endThread();\r
           }\r
-          if (flag) {\r
-            flag = false;\r
+//          定位算通过\r
+//          if (flag) {\r
+            flag = true;\r
             pass();\r
-          }\r
+//          }\r
           break;\r
         case  GpsStatus.GPS_EVENT_STARTED:\r
           // tvGps.setText("GPS_EVENT_STARTED");\r
@@ -172,6 +177,7 @@ public class NMEAListener implements NmeaListener, LocationListener {
       if (readGpsThread != null) {\r
         readGpsThread.endThread();\r
       }\r
+      NMEAListener.this.stopListen();\r
       return false;\r
     }\r
   });\r
@@ -202,8 +208,10 @@ public class NMEAListener implements NmeaListener, LocationListener {
   private int updateGpsStatus(int event, GpsStatus status) {\r
     StringBuilder sb2 = new StringBuilder("");\r
     float strengh = 0;\r
+    searchCout++;\r
     if (status == null) {\r
-      sb2.append("搜索到卫星个数：" + 0);\r
+      sb2.append("搜索"+searchCout+"次，搜到卫星个数：" + 0);\r
+      noSignalCount++;\r
     } else if (event == GpsStatus.GPS_EVENT_SATELLITE_STATUS) {\r
       int maxSatellites = status.getMaxSatellites();\r
       Iterator<GpsSatellite> it = status.getSatellites().iterator();\r
@@ -222,14 +230,27 @@ public class NMEAListener implements NmeaListener, LocationListener {
 \r
         count++;\r
       }\r
-      sb2.append("搜索到卫星个数(SNR>0)：" + numSatelliteList.size()+" \n Max 3 SNRs[ " );\r
+      sb2.append("搜索"+searchCout+"次，搜索到卫星个数(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
       }\r
       sb2.append(" ]");\r
+      if (numSatelliteList.size()< 3){\r
+        noSignalCount++;\r
+      }\r
     }\r
 \r
+    if (searchCout>SearchTimeout){\r
+      sb2.append(" 搜索"+searchCout+"次，超过"+SearchTimeout+"限制退出GPS定位");\r
+      flag=false;\r
+      pass();\r
+    }\r
+    if (noSignalCount> 5){\r
+      sb2.append(" 搜索"+searchCout+"次，超过"+noSignalCount+"次没有收到星，退出GPS定位");\r
+      flag=false;\r
+      pass();\r
+    }\r
 \r
     Log.e("dxc", sb2.toString());\r
 \r
@@ -238,6 +259,14 @@ public class NMEAListener implements NmeaListener, LocationListener {
   }\r
   private void pass(){\r
 \r
+    // 经纬度 保留6位小数点\r
+    DecimalFormat df = new DecimalFormat("#.000000");\r
+    String strLatitude = df.format(latitude);\r
+    String strLongitude = df.format(longitude);\r
+    runtime.setLatitude(strLatitude);\r
+    runtime.setLongitude(strLongitude);\r
+    runtime.setLocation(locationInfo);\r
+    NMEAListener.this.temHandler.sendMessage(new Message());\r
   }\r
 \r
   boolean isFrist = true;\r
@@ -328,13 +357,19 @@ public class NMEAListener implements NmeaListener, LocationListener {
   public boolean startListen() {\r
     this.locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0L, 0.0F, this);\r
     this.listening = true;\r
+    noSignalCount=0;\r
+    longitude=0;\r
+    latitude=0;\r
+    searchCout=0;\r
     locationManager.addGpsStatusListener(statusListener);//搜星\r
-    return this.locationManager.addNmeaListener(this);\r
+//    this.locationManager.addNmeaListener(this);\r
+\r
+    return true;\r
   }\r
   \r
 \r
   public void stopListen() {\r
-    this.locationManager.removeNmeaListener(this);\r
+//    this.locationManager.removeNmeaListener(this);\r
     this.locationManager.removeUpdates(this);\r
     this.listening = false;\r
   }\r