From ff761a07a58d1c9cb49a17427e275020cb174a37 Mon Sep 17 00:00:00 2001
From: snickersun <snickersun@qq.com>
Date: Tue, 7 Jan 2020 15:00:41 +0800
Subject: [PATCH] update gps

---
 .../executionHistory/executionHistory.bin     | Bin 2731883 -> 2731883 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/5.4.1/fileHashes/fileHashes.bin       | Bin 264669 -> 264969 bytes
 .gradle/5.4.1/fileHashes/fileHashes.lock      | Bin 17 -> 17 bytes
 .gradle/5.4.1/javaCompile/classAnalysis.bin   | Bin 6879938 -> 6887230 bytes
 .gradle/5.4.1/javaCompile/javaCompile.lock    | Bin 17 -> 17 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .idea/workspace.xml                           | 158 ++++++++----------
 .../java/com/ic/protocol/NMEAListener.java    |  79 ++++++---
 9 files changed, 125 insertions(+), 112 deletions(-)

diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
index 24892496bb988f953aba8df7c6cb0b83025cd8a2..b210b7bd40e0b9c420f943cc3c7902bdd608a357 100644
GIT binary patch
delta 3422
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
Q_<!@vdc0?Z9z)#t3(!xQIRF3v

delta 3440
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
Sy5#?Fk=c)r3^SpL+Wrkc&vQ}$

diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock
index 82d4bd2cf541d76bea19dd4a29c0ffcc71496e6e..e83888bd38de2d9faed2e0f382770c148f17d75d 100644
GIT binary patch
literal 17
VcmZQxe8+%I(`3UV1~6a}1pqBs1HS+O

literal 17
VcmZQxe8+%I(`3UV1~6dU4FE0u1Y`gJ

diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin
index 36d9f2dfda0dce81a222e7af1a488ae0a92019e0..e6dd7e5ad4f619f3baf2ced8f2a63e70a20c2876 100644
GIT binary patch
delta 4255
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

delta 3952
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

diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
index 42ebb4bd413ae614502f82f44549a54b9d3f418a..3e440393384b66846f4ff062cd7528900fb533f2 100644
GIT binary patch
literal 17
VcmZS9ewIDkXOC|w0~l!K0{}6t1bzSj

literal 17
VcmZS9ewIDkXOC|w0~n|n0{}5)1Uvu$

diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin
index 21649e028b5a07ae86582edaab30d85ae7fd7263..aeefaa1da34e0a0f0909c307e27f1c0f661d481b 100644
GIT binary patch
delta 3174
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
RYR<vyeRKr=Z$E%V{|@|-iRJ(R

delta 1151
zcmY+@T}+#06bEol+ZTADg#s-UXu;QwO*%?HfK3ou&@pH&8=Y&J?HFZK3PchJWCUFZ
zBQ<ZfgiIEer?8ofxH&PA*`PaOkU1S25aj~H1tdejI5f(|GL~(Ls3#H=z4+Zd`JbGR
zXL9ta^qa>YNPB`1lmw+g*=JnjEojH6Tii%GPA_r#C|G1IHI5RtRO8TyrZtX4k|+{Q
zcoIWmiJT}%9Em4Nl0Xtk5>cUPO+66{&A73lzRly^C+Z>%2NCMNJU0E6bC4}gI_q&=
znLIQA0qnh&T$qVJ+(~|00^_XiM|%rXt=RqS>Wck3emtGb-GD>*X=h5d1Rr*#ICNZB
zM0w^PEO^E}#P;^OD?~n&LNp|mq>*%@B|4HpGRbp9AkUK>WGBfYyU1?x0?8(NvIqH4
zPRTQ9!is*wcpPf37_yThg<m6fUz}mq`;`LgykBV&d&UgdGnQM|0Po>Ss*z7c$TRlJ
zp`Y#1+DmZ6X4G2XAl_{=p4DOCym20&p2>?2Z(-&Iqr3t7G3TkVDF#20n2OS2g!!D#
zEEaM)HKHQJgo+IF!UG86Pcn-)8r=%Z4M1(Y<wP3S79oFhl6^U9pAofs3&}&RKEKWm
zZam$duaCva?)*g+@T@x8{l2Ih$Vc5k!973J;Ln={f)+Cp_9n`pkoBjzvP7$TFWE<4
zB!#4iyo6SD@uhi4$EEe+vmCy&Q5>U&LF6yhm4i4YEg@DMliCUyNN{7wwwi<wMr~dh
zl%ZiQ;FgNrH*KVpl#!RoD`Y<@CkIFccHgW#^&z~4kB`}J3v902-VElju%cjJUw6wy
zuFsBKpJRF-T*kRO4%&bGJxA|O2!{nfzx`x+(;+TzzKYA6PFp(#Wi(bjlcBMt%A)&k
zQf{b9%ncnRhcGu(ol*p~cwoNTEXDH+)faTw|C__k51S(Y2}O^@bzDxz`+1zp9EpFb
zT(ju_VL=(UU31Fn5~r+($!j=eJ>r?9Fzwcn)nwLpIlmHXRqi4F|A}Ib!Hqcv&(lt@
zV%9ZJnTnk|Q((f;aZfXk!lP<){IE$Xnio8zh8#un!t1Bjp#(pg@HQz}W=NsIvRUs@
z3HxhM(S`c&y={trYiy4Kzxdtz-3};a?<##}oKyOibdWGCByP8KvD7y!1vC2h`&<f~
zarvgB*u?2FKk{B5ef^QJ(3rH{U2BI=Z0$HkYRPd@NBpFooFFI38{|#WfUO;Yo)(bd
f!_`2O5_f%T3&}9%NuXH@ZDHX`3T`DdPW|#Xk5J46

diff --git a/.gradle/5.4.1/javaCompile/javaCompile.lock b/.gradle/5.4.1/javaCompile/javaCompile.lock
index 2ea28360e09643fe6ae741c11c3c812f06dd8a9e..b07e8c11c65cb98967593f340e69eb57acc00303 100644
GIT binary patch
literal 17
VcmZSnt-0xphMmoK1~7<d2LLxa1s(tZ

literal 17
VcmZSnt-0xphMmoK1~7>50{}My1myq#

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 41c763b0153c490787e4d5c40eaa0fb096db6b73..9aee7d1328f566cea66323fdd0e8e0ee48a11584 100644
GIT binary patch
literal 17
VcmZQxwQ6FEqHEbq1~6bd0su111gro6

literal 17
VcmZQxwQ6FEqHEbq1~6dL001&D1P}lK

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