From: snickersun <scy@incartech.cn>
Date: Tue, 7 Jan 2020 16:22:08 +0000 (+0800)
Subject: location
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=6c2c7d8f58a06e29a24c9a55be4baf7f7e7b7c0f;p=icsupport.git

location
---

diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
index b210b7bd..4ce6dd44 100644
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 e83888bd..93c34d8c 100644
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 e6dd7e5a..8fc3fdad 100644
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 3e440393..5c88bef8 100644
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/fileHashes/resourceHashesCache.bin b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
index 3e8c001f..4a918c3a 100644
Binary files a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin and b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin
index aeefaa1d..4d96557e 100644
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 b07e8c11..173c6bc9 100644
Binary files a/.gradle/5.4.1/javaCompile/javaCompile.lock and b/.gradle/5.4.1/javaCompile/javaCompile.lock differ
diff --git a/.gradle/5.4.1/javaCompile/taskHistory.bin b/.gradle/5.4.1/javaCompile/taskHistory.bin
index 5879777b..29689075 100644
Binary files a/.gradle/5.4.1/javaCompile/taskHistory.bin and b/.gradle/5.4.1/javaCompile/taskHistory.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 9aee7d13..da8a541b 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 9b692bda..60bbd34d 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 8f0cd045..1b7e468c 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index 0852fa4e..ea3b4314 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/.idea/libraries/Gradle____local_aars___D__workspace_icsupport_app_libs_LauncherCtrl_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___D__workspace_icsupport_app_libs_LauncherCtrl_jar_unspecified_jar.xml
new file mode 100644
index 00000000..0fd1a86b
--- /dev/null
+++ b/.idea/libraries/Gradle____local_aars___D__workspace_icsupport_app_libs_LauncherCtrl_jar_unspecified_jar.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\LauncherCtrl.jar:unspecified@jar">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/app/libs/LauncherCtrl.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle____local_aars___D__workspace_icsupport_app_libs_okio_2_4_3_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___D__workspace_icsupport_app_libs_okio_2_4_3_jar_unspecified_jar.xml
new file mode 100644
index 00000000..a2edc5c3
--- /dev/null
+++ b/.idea/libraries/Gradle____local_aars___D__workspace_icsupport_app_libs_okio_2_4_3_jar_unspecified_jar.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/app/libs/okio-2.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6f32454d..6fd9e2bb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6e67cb5a..587dbaf9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,14 +10,41 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a0feeb22-06b0-4f90-bebc-7c0a45a72929" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____local_aars___D__workspace_icsupport_app_libs_LauncherCtrl_jar_unspecified_jar.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____local_aars___D__workspace_icsupport_app_libs_okio_2_4_3_jar_unspecified_jar.xml" 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/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.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/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/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/adapter/protocolAPIHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/ICLocation.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/ICLocation.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/BatteryUtil.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/src/main/java/com/ic/protocol/utils/Logger.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Logger.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/icsupport.iml" beforeDir="false" afterPath="$PROJECT_DIR$/icsupport.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/okio/okio.iml" beforeDir="false" afterPath="$PROJECT_DIR$/okio/okio.iml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -28,7 +55,7 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="860312001002391" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="860312001004444" />
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
       <ProjectState />
@@ -46,18 +73,13 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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/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" />
+            <state relative-caret-position="112">
+              <caret line="706" column="35" selection-start-line="706" selection-start-column="35" selection-end-line="706" 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" />
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -66,90 +88,101 @@
       <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="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 relative-caret-position="302">
+              <caret line="152" column="53" selection-start-line="152" selection-start-column="53" selection-end-line="152" selection-end-column="53" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java">
           <provider selected="true" editor-type-id="text-editor">
-            <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" />
-                <element signature="e#3747#3748#0" expanded="true" />
-                <element signature="e#3777#3778#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="292">
+              <caret line="274" column="48" lean-forward="true" selection-start-line="274" selection-start-column="48" selection-end-line="274" selection-end-column="48" />
             </state>
           </provider>
         </entry>
       </file>
-      <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/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 relative-caret-position="139">
+              <caret line="646" column="28" selection-start-line="646" selection-start-column="28" selection-end-line="646" selection-end-column="28" />
+              <folding>
+                <element signature="e#21469#21647#0" expanded="true" />
+                <element signature="e#21646#21647#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ContextProxy.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GSensorListener.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="125">
-              <caret line="47" column="15" selection-start-line="47" selection-start-column="15" selection-end-line="47" selection-end-column="15" />
+            <state relative-caret-position="228">
+              <caret line="167" column="33" lean-forward="true" selection-start-line="167" selection-start-column="33" selection-end-line="167" selection-end-column="33" />
+              <folding>
+                <element signature="e#1040#2307#0" expanded="true" />
+                <element signature="e#2306#2307#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GSensorListener.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="387">
-              <caret line="183" column="19" lean-forward="true" selection-start-line="183" selection-start-column="19" selection-end-line="183" selection-end-column="19" />
-              <folding>
-                <element signature="e#989#2296#0" expanded="true" />
-                <element signature="e#2295#2296#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="151">
+              <caret line="244" selection-start-line="244" selection-end-line="244" />
             </state>
           </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">
+        <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="330">
-              <caret line="262" column="25" selection-start-line="262" selection-start-column="14" selection-end-line="262" selection-end-column="25" />
+            <state relative-caret-position="-100">
+              <caret line="31" column="2" lean-forward="true" selection-start-line="31" selection-start-column="2" selection-end-line="31" selection-end-column="2" />
             </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">
+        <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="37">
-              <caret line="27" column="34" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="34" />
+            <state relative-caret-position="-51">
+              <caret line="327" selection-start-line="327" selection-end-line="327" />
               <folding>
-                <element signature="e#622#623#0" expanded="true" />
-                <element signature="e#662#663#0" expanded="true" />
-                <element signature="e#708#709#0" expanded="true" />
-                <element signature="e#748#749#0" expanded="true" />
+                <element signature="e#8624#8625#0" expanded="true" />
+                <element signature="e#8649#8650#0" expanded="true" />
+                <element signature="e#8787#8788#0" expanded="true" />
+                <element signature="e#9167#9168#0" expanded="true" />
+                <element signature="e#9189#9190#0" expanded="true" />
+                <element signature="e#9247#9248#0" expanded="true" />
+                <element signature="e#9269#9270#0" expanded="true" />
+                <element signature="e#9313#9314#0" expanded="true" />
+                <element signature="e#9335#9336#0" expanded="true" />
+                <element signature="e#9370#9371#0" expanded="true" />
+                <element signature="e#9391#9392#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/ICLocation.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="273">
-              <caret line="125" column="3" lean-forward="true" selection-start-line="125" selection-start-column="3" selection-end-line="125" selection-end-column="3" />
+            <state relative-caret-position="453">
+              <caret line="96" column="20" selection-start-line="96" selection-start-column="20" selection-end-line="96" selection-end-column="20" />
               <folding>
-                <element signature="e#519#844#0" expanded="true" />
-                <element signature="e#843#844#0" expanded="true" />
+                <element signature="e#1252#1253#0" expanded="true" />
+                <element signature="e#1291#1292#0" expanded="true" />
+                <element signature="e#2789#2790#0" expanded="true" />
+                <element signature="e#2815#2816#0" expanded="true" />
+                <element signature="e#2957#2958#0" expanded="true" />
+                <element signature="e#2983#2984#0" expanded="true" />
+                <element signature="e#3018#3019#0" expanded="true" />
+                <element signature="e#3051#3052#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -166,40 +199,44 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>bootClasspath</find>
-      <find>TYPE_STEP_COUNTER</find>
-      <find>CompileOptions</find>
-      <find>sensorManager</find>
-      <find>maxTime</find>
-      <find>paramWakeLock</find>
-      <find>handler</find>
-      <find>msg.what</find>
-      <find>getCellInfo</find>
-      <find>setOnWiFiInfoListener</find>
-      <find>mRuntime</find>
-      <find>EqcAlgorithmInterfaceMethod3</find>
-      <find>EqcAlgorithmInterfaceMethod2</find>
-      <find>H10</find>
-      <find>gpstest</find>
-      <find>GPS_PROVIDER</find>
-      <find>readGpsThread</find>
-      <find>locationListener</find>
-      <find>requestLocationUpdates</find>
-      <find>LocationManager</find>
-      <find>locationInfo</find>
+      <find>repeat</find>
+      <find>UpdateHeartBeatTimeout</find>
+      <find>onHeartAlarm</find>
+      <find>HeartAlarm</find>
+      <find>SignalStrength</find>
+      <find>queryLast</find>
+      <find>BatteryUtil</find>
+      <find>AP03</find>
+      <find>srvIP</find>
+      <find>setBatter</find>
+      <find>setTotalStepCount</find>
+      <find>stepcount</find>
+      <find>setBattery</find>
+      <find>format</find>
+      <find>stop</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>
+      <find>FIXED</find>
+      <find>GPS_FIXED</find>
+      <find>StepCount</find>
+      <find>startGpsLocate();</find>
+      <find>startGpsLocate</find>
+      <find>runtime</find>
+      <find>delay</find>
+      <find>gpsp</find>
+      <find>_FIXED</find>
+      <find>getGPSDATA</find>
+      <find>saveste</find>
+      <find>开启GPS开启wifi扫描</find>
+      <find>getwifi</find>
+      <find>stringMessage</find>
     </findStrings>
+    <replaceStrings>
+      <replace>stop</replace>
+      <replace>GPS_CURRENT_STATUS</replace>
+    </replaceStrings>
   </component>
   <component name="GenerateSignedApkSettings">
-    <option name="KEY_STORE_PATH" value="D:\Snicker\icsupport\app\EQC_G5.jks" />
+    <option name="KEY_STORE_PATH" value="D:\workspace\icsupport\app\EQC_G5.jks" />
     <option name="KEY_ALIAS" value="watch_g5" />
     <option name="REMEMBER_PASSWORDS" value="true" />
     <option name="BUILD_TARGET_KEY" value="apk" />
@@ -211,34 +248,38 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/SynchronousTime.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmHelper.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java" />
         <option value="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" />
         <option value="$PROJECT_DIR$/app/build.gradle" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RunCMD.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ExeCommand.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/StepCounterInterface.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GPSListener.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Logger.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GSensorListener.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/ICLocation.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GPSListener.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1038" />
-    <option name="height" value="742" />
+    <option name="x" value="29" />
+    <option name="y" value="111" />
+    <option name="width" value="964" />
+    <option name="height" value="784" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -263,20 +304,6 @@
               <item name="java" type="edd41e36:AndroidSourceTypeNode" />
               <item name="protocol" type="cbb59c9e:AndroidPsiDirectoryNode" />
             </path>
-            <path>
-              <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
-              <item name="protocol" type="cbb59c9e:AndroidPsiDirectoryNode" />
-              <item name="adapter" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
-              <item name="protocol" type="cbb59c9e:AndroidPsiDirectoryNode" />
-              <item name="bean" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
               <item name="app" type="feadf853:AndroidModuleNode" />
@@ -299,17 +326,21 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="ExportApk.ApkPath" value="D:\Snicker\icsupport\app" />
-    <property name="ExportApk.BuildVariants" value="release" />
+    <property name="DEBUGGABLE_DEVICE" value="sprd-c41_q3fd-860312001004444" />
+    <property name="DEBUGGABLE_PROCESS" value="com.ic.protocol" />
+    <property name="DEBUGGER_ID" value="Auto" />
+    <property name="ExportApk.ApkPath" value="D:\workspace\icsupport\app" />
+    <property name="ExportApk.BuildVariants" value="debug" />
     <property name="ExportApk.SignV1" value="true" />
     <property name="ExportApk.SignV2" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="SHOW_ALL_PROCESSES" value="false" />
     <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/app/EQC_G5.jks" />
     <property name="project.structure.last.edited" value="Dependencies" />
@@ -418,27 +449,27 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="-8" y="-8" width="1858" height="1096" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Captures" order="0" sideWeight="0.50138503" side_tool="true" weight="0.32995737" />
-      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.78969073" visible="true" weight="0.26066098" />
+      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.7834275" visible="true" weight="0.26028922" />
       <window_info id="Structure" order="2" sideWeight="0.50138503" side_tool="true" weight="0.32995737" />
       <window_info id="Favorites" order="3" sideWeight="0.50138503" side_tool="true" weight="0.32995737" />
-      <window_info id="Build Variants" order="4" sideWeight="0.21030928" side_tool="true" visible="true" weight="0.26066098" />
+      <window_info id="Build Variants" order="4" sideWeight="0.21657251" side_tool="true" weight="0.26028922" />
       <window_info id="Image Layers" order="5" />
       <window_info id="Designer" order="6" />
-      <window_info id="Resources Explorer" order="7" sideWeight="0.49861497" weight="0.32995737" />
+      <window_info id="Resources Explorer" order="7" sideWeight="0.49717513" weight="0.3298109" />
       <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.6540512" weight="0.44902387" />
+      <window_info active="true" anchor="bottom" id="Logcat" order="1" sideWeight="0.63570637" visible="true" weight="0.44802496" />
       <window_info anchor="bottom" id="TODO" order="2" weight="0.329718" />
-      <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.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" />
+      <window_info anchor="bottom" id="Find" order="3" sideWeight="0.48164627" weight="0.47297296" />
+      <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49499443" weight="0.32952183" />
+      <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.36429366" side_tool="true" weight="0.44802496" />
+      <window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49944383" weight="0.32952183" />
+      <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49276975" weight="0.21413721" />
+      <window_info anchor="bottom" id="Debug" order="8" sideWeight="0.4938821" weight="0.32952183" />
       <window_info anchor="bottom" id="Android Profiler" order="9" />
       <window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
       <window_info anchor="right" id="Capture Analysis" order="1" />
@@ -446,467 +477,501 @@
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info anchor="right" id="Palette&#9;" order="4" />
     </layout>
+    <layout-to-restore>
+      <window_info id="Captures" order="0" sideWeight="0.50138503" side_tool="true" weight="0.32995737" />
+      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.7834275" visible="true" weight="0.26028922" />
+      <window_info id="Structure" order="2" sideWeight="0.50138503" side_tool="true" weight="0.32995737" />
+      <window_info id="Favorites" order="3" sideWeight="0.50138503" side_tool="true" weight="0.32995737" />
+      <window_info id="Build Variants" order="4" sideWeight="0.21657251" side_tool="true" visible="true" weight="0.26028922" />
+      <window_info id="Image Layers" order="5" />
+      <window_info id="Designer" order="6" />
+      <window_info id="Resources Explorer" order="7" sideWeight="0.49717513" weight="0.3298109" />
+      <window_info id="Capture Tool" order="8" />
+      <window_info anchor="bottom" id="Run" order="0" />
+      <window_info active="true" anchor="bottom" id="Logcat" order="1" sideWeight="0.63570637" visible="true" weight="0.44802496" />
+      <window_info anchor="bottom" id="TODO" order="2" weight="0.329718" />
+      <window_info anchor="bottom" id="Find" order="3" sideWeight="0.48164627" weight="0.47297296" />
+      <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49499443" weight="0.32952183" />
+      <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.36429366" side_tool="true" visible="true" weight="0.44802496" />
+      <window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49944383" weight="0.32952183" />
+      <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49276975" weight="0.21413721" />
+      <window_info anchor="bottom" id="Debug" order="8" sideWeight="0.4938821" weight="0.32952183" />
+      <window_info anchor="bottom" id="Android Profiler" order="9" />
+      <window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
+      <window_info anchor="right" id="Capture Analysis" order="1" />
+      <window_info anchor="right" id="Gradle" order="2" />
+      <window_info anchor="right" id="Theme Preview" order="3" />
+      <window_info anchor="right" id="Palette&#9;" order="4" />
+    </layout-to-restore>
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java</url>
-          <line>749</line>
-          <properties />
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java</url>
-          <line>318</line>
+          <line>333</line>
           <properties />
           <option name="timeStamp" value="6" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java</url>
-          <line>98</line>
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java</url>
+          <line>487</line>
           <properties />
-          <option name="timeStamp" value="10" />
+          <option name="timeStamp" value="17" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>
       <configuration name="app">
-        <watch expression="mCellInfo.split(&quot;|&quot;)" language="JAVA" />
+        <watch expression="ds.getWifiInfo()" language="JAVA" />
+        <watch expression="ds.getLBSData()" language="JAVA" />
+        <watch expression="CellInfoUtil.getMNC()" language="JAVA" />
+        <watch expression="String.valueOf(CellInfoUtil.getMNC())" language="JAVA" />
+        <watch expression="CellInfoUtil.getCELL_ID()" language="JAVA" />
+        <watch expression="String.valueOf(CellInfoUtil.getMCC())" language="JAVA" />
+        <watch expression="CellInfoUtil.getLAC()" language="JAVA" />
+        <watch expression="runtime.getLocationInstance()" language="JAVA" />
       </configuration>
     </watches-manager>
   </component>
   <component name="debuggerHistoryManager">
     <expressions id="watch">
       <expression>
-        <expression-string>mCellInfo.split(&quot;|&quot;)</expression-string>
+        <expression-string>runtime.getLocationInstance()</expression-string>
         <language-id>JAVA</language-id>
         <evaluation-mode>EXPRESSION</evaluation-mode>
       </expression>
       <expression>
-        <expression-string>mCellInfo.split(&quot;|&quot;)[0]</expression-string>
+        <expression-string>CellInfoUtil.getLAC()</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>String.valueOf(CellInfoUtil.getMCC())</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>CellInfoUtil.getCELL_ID()</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>String.valueOf(CellInfoUtil.getMNC())</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>CellInfoUtil.getMNC()</expression-string>
         <language-id>JAVA</language-id>
         <evaluation-mode>EXPRESSION</evaluation-mode>
       </expression>
       <expression>
-        <expression-string>mCellInfo.split(&quot;|&quot;)[0].split(&quot;,&quot;);</expression-string>
+        <expression-string>ds.getLBSData()</expression-string>
         <language-id>JAVA</language-id>
         <evaluation-mode>EXPRESSION</evaluation-mode>
       </expression>
       <expression>
-        <expression-string>arrayOfString.split(&quot;|&quot;).split(&quot;,&quot;)</expression-string>
+        <expression-string>ds.getWifiInfo()</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>mCellInfo.split(&quot;|&quot;)</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>mCellInfo.split(&quot;|&quot;)[0]</expression-string>
         <language-id>JAVA</language-id>
         <evaluation-mode>EXPRESSION</evaluation-mode>
       </expression>
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RxSocket.java">
+    <entry file="file://$PROJECT_DIR$/local.properties">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/proguard-rules.pro">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gradle.properties">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="272" selection-start-line="272" selection-end-line="272" />
-          <folding>
-            <element signature="e#10316#10317#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="114">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/StringMessage.java">
+    <entry file="file://$PROJECT_DIR$/library/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="34" column="31" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
+        <state relative-caret-position="171">
+          <caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.java">
+    <entry file="file://$PROJECT_DIR$/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="35" selection-start-line="35" selection-end-line="35" />
+        <state relative-caret-position="133">
+          <caret line="7" column="25" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.0/748f0546d5c3c27f1aef07270ffea0c45f0c42a4/rxjava-1.1.0.jar!/rx/Observable.class">
+    <entry file="file://$PROJECT_DIR$/app/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="179">
-          <caret line="1511" selection-start-line="1511" selection-end-line="1511" />
-          <folding>
-            <element signature="e#0#91095#0" expanded="true" />
-            <element signature="e#71666#71667#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="1938">
+          <caret line="102" column="41" selection-start-line="102" selection-start-column="41" selection-end-line="102" selection-end-column="41" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.0/748f0546d5c3c27f1aef07270ffea0c45f0c42a4/rxjava-1.1.0.jar!/rx/observers/SafeSubscriber.class">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/lang/Integer.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="329">
-          <caret line="67" selection-start-line="67" selection-end-line="67" />
+        <state relative-caret-position="202">
+          <caret line="46" column="30" selection-start-line="46" selection-start-column="22" selection-end-line="46" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.0/748f0546d5c3c27f1aef07270ffea0c45f0c42a4/rxjava-1.1.0.jar!/rx/internal/operators/OperatorObserveOn.class">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/hardware/SensorManager.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="179">
-          <caret line="82" selection-start-line="82" selection-end-line="82" />
-          <folding>
-            <element signature="e#2713#2839#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="114">
+          <caret line="10" column="22" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.0/748f0546d5c3c27f1aef07270ffea0c45f0c42a4/rxjava-1.1.0.jar!/rx/internal/schedulers/ScheduledAction.class">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ExeCommand.java" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="196">
-          <caret line="53" selection-start-line="53" selection-end-line="53" />
+        <state relative-caret-position="436">
+          <caret line="72" column="9" lean-forward="true" selection-start-line="72" selection-start-column="9" selection-end-line="72" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/os/Looper.class">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/CrashHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="26" column="23" selection-start-line="26" selection-start-column="23" selection-end-line="26" selection-end-column="23" />
-          <folding>
-            <element signature="e#561#562#0" expanded="true" />
-            <element signature="e#612#613#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="152">
+          <caret line="32" column="59" selection-start-line="32" selection-start-column="44" selection-end-line="32" selection-end-column="59" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java">
+    <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="741">
-          <caret line="54" column="17" selection-start-line="54" selection-start-column="17" selection-end-line="54" selection-end-column="17" />
+        <state relative-caret-position="114">
+          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/os/Handler.class">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/location/GpsStatus.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="418">
-          <caret line="30" column="16" selection-start-line="30" selection-start-column="16" selection-end-line="30" selection-end-column="16" />
-          <folding>
-            <element signature="e#0#3993#0" expanded="true" />
-            <element signature="e#700#701#0" expanded="true" />
-            <element signature="e#751#752#0" expanded="true" />
-          </folding>
+          <caret line="33" column="21" selection-start-line="33" selection-start-column="21" selection-end-line="33" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GPSListener.java" />
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/text/TextUtils.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="29" column="2" lean-forward="true" selection-start-line="29" selection-start-column="2" selection-end-line="29" selection-end-column="2" />
+        <state relative-caret-position="114">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Alarm.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ContextProxy.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-304">
-          <caret line="11" column="10" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
+        <state relative-caret-position="399">
+          <caret line="47" column="15" selection-start-line="47" selection-start-column="15" selection-end-line="47" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/util/concurrent/locks/Condition.class">
+    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+      <provider editor-type-id="android-manifest" />
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
+        <state relative-caret-position="95">
+          <caret line="140" column="86" selection-start-line="140" selection-start-column="86" selection-end-line="140" selection-end-column="86" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/Constants.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/util/concurrent/locks/Condition.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="109">
-          <caret line="111" column="78" selection-start-line="111" selection-start-column="67" selection-end-line="111" selection-end-column="78" />
+        <state relative-caret-position="312">
+          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Logger.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/util/concurrent/LinkedBlockingDeque.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="817">
-          <caret line="43" column="15" lean-forward="true" selection-start-line="43" selection-start-column="15" selection-end-line="43" selection-end-column="15" />
+        <state relative-caret-position="159">
+          <caret line="150" column="13" selection-start-line="150" selection-start-column="13" selection-end-line="150" selection-end-column="13" />
+          <folding>
+            <element signature="e#3757#3758#0" expanded="true" />
+            <element signature="e#3808#3809#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/location/LocationManager.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="281" column="17" selection-start-line="281" selection-start-column="6" selection-end-line="281" selection-end-column="17" />
+        <state relative-caret-position="236">
+          <caret line="217" column="21" selection-start-line="217" selection-start-column="21" selection-end-line="217" selection-end-column="21" />
+          <folding>
+            <element signature="e#7511#7512#0" expanded="true" />
+            <element signature="e#7562#7563#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/FileCache.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="406" column="37" lean-forward="true" selection-start-line="406" selection-start-column="37" selection-end-line="406" selection-end-column="37" />
+        <state relative-caret-position="112">
+          <caret line="18" column="14" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/AlarmManager.class">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="127">
-          <caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="16" />
+        <state relative-caret-position="76">
+          <caret line="4" column="39" selection-start-line="4" selection-start-column="32" selection-end-line="4" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ConnectionListener.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="14" selection-start-line="14" selection-end-line="14" />
+        <state relative-caret-position="190">
+          <caret line="10" column="7" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Locations.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/SynchronousTime.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="76">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/TimeUtil.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Connection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        <state relative-caret-position="133">
+          <caret line="7" column="7" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/SimSignalUtil.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Logger.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <state relative-caret-position="760">
+          <caret line="40" column="22" selection-start-line="40" selection-start-column="22" selection-end-line="40" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmHelper.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1881">
-          <caret line="107" column="53" selection-start-line="107" selection-start-column="51" selection-end-line="107" selection-end-column="53" />
+        <state relative-caret-position="151">
+          <caret line="13" column="23" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/settings.gradle">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/local.properties">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/proguard-rules.pro">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gradle.properties">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="281">
+          <caret line="73" column="39" lean-forward="true" selection-start-line="73" selection-start-column="39" selection-end-line="73" selection-end-column="39" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmHelper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        <state relative-caret-position="443">
+          <caret line="40" column="27" lean-forward="true" selection-start-line="40" selection-start-column="27" selection-end-line="40" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/library/build.gradle">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
+        <state relative-caret-position="167">
+          <caret line="34" column="21" selection-start-line="34" selection-start-column="21" selection-end-line="34" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/build.gradle">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="7" column="25" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
+        <state relative-caret-position="76">
+          <caret line="13" column="21" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/build.gradle">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/telephony/gsm/GsmCellLocation.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1938">
-          <caret line="102" column="41" selection-start-line="102" selection-start-column="41" selection-end-line="102" selection-end-column="41" />
+        <state relative-caret-position="167">
+          <caret line="23" column="15" selection-start-line="23" selection-start-column="15" selection-end-line="23" selection-end-column="15" />
+          <folding>
+            <element signature="e#537#538#0" expanded="true" />
+            <element signature="e#588#589#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/lang/Integer.class">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="46" column="30" selection-start-line="46" selection-start-column="22" selection-end-line="46" selection-end-column="30" />
+        <state relative-caret-position="247">
+          <caret line="285" column="90" selection-start-line="285" selection-start-column="90" selection-end-line="285" selection-end-column="90" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/hardware/SensorManager.class">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/StepCounterInterface.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="10" column="22" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
+        <state relative-caret-position="38">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ExeCommand.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/stepCounter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="235">
-          <caret line="83" column="22" selection-start-line="83" selection-start-column="22" selection-end-line="83" selection-end-column="22" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1050#1051#0" expanded="true" />
-            <element signature="e#1092#1093#0" expanded="true" />
-            <element signature="e#1157#1158#0" expanded="true" />
-            <element signature="e#1192#1193#0" expanded="true" />
-            <element signature="e#1307#1308#0" expanded="true" />
-            <element signature="e#1338#1339#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="38">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/StepCount.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="72" column="9" lean-forward="true" selection-start-line="72" selection-start-column="9" selection-end-line="72" selection-end-column="9" />
+        <state relative-caret-position="38">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ContextProxy.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="47" column="15" selection-start-line="47" selection-start-column="15" selection-end-line="47" selection-end-column="15" />
+        <state relative-caret-position="-781">
+          <caret line="29" column="31" lean-forward="true" selection-start-line="29" selection-start-column="31" selection-end-line="29" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/CrashHandler.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/DeviceInfoUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="32" column="59" selection-start-line="32" selection-start-column="44" selection-end-line="32" selection-end-column="59" />
+        <state relative-caret-position="383">
+          <caret line="168" column="78" selection-start-line="168" selection-start-column="78" selection-end-line="168" selection-end-column="78" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GSensorListener.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="387">
-          <caret line="183" column="19" lean-forward="true" selection-start-line="183" selection-start-column="19" selection-end-line="183" selection-end-column="19" />
-          <folding>
-            <element signature="e#989#2296#0" expanded="true" />
-            <element signature="e#2295#2296#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="2915">
+          <caret line="695" column="1" lean-forward="true" selection-start-line="695" selection-start-column="1" selection-end-line="695" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java">
+    <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="2317">
-          <caret line="388" column="10" selection-start-line="388" selection-start-column="10" selection-end-line="388" selection-end-column="23" />
+        <state relative-caret-position="245">
+          <caret line="213" column="60" selection-start-line="213" selection-start-column="60" selection-end-line="213" selection-end-column="60" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="125" column="3" lean-forward="true" selection-start-line="125" selection-start-column="3" selection-end-line="125" selection-end-column="3" />
-          <folding>
-            <element signature="e#519#844#0" expanded="true" />
-            <element signature="e#843#844#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="292">
+          <caret line="274" column="48" lean-forward="true" selection-start-line="274" selection-start-column="48" selection-end-line="274" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/StepCounterInterface.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/util/Timer.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="37">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="34" />
+        <state relative-caret-position="205">
+          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
           <folding>
-            <element signature="e#622#623#0" expanded="true" />
-            <element signature="e#662#663#0" expanded="true" />
-            <element signature="e#708#709#0" expanded="true" />
-            <element signature="e#748#749#0" expanded="true" />
+            <element signature="e#548#549#0" expanded="true" />
+            <element signature="e#599#600#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/location/LocationListener.class">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/ICLocation.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+        <state relative-caret-position="453">
+          <caret line="96" column="20" selection-start-line="96" selection-start-column="20" selection-end-line="96" selection-end-column="20" />
+          <folding>
+            <element signature="e#1252#1253#0" expanded="true" />
+            <element signature="e#1291#1292#0" expanded="true" />
+            <element signature="e#2789#2790#0" expanded="true" />
+            <element signature="e#2815#2816#0" expanded="true" />
+            <element signature="e#2957#2958#0" expanded="true" />
+            <element signature="e#2983#2984#0" expanded="true" />
+            <element signature="e#3018#3019#0" expanded="true" />
+            <element signature="e#3051#3052#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/location/GpsStatus.class">
+    <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="418">
-          <caret line="33" column="21" selection-start-line="33" selection-start-column="21" selection-end-line="33" selection-end-column="21" />
+        <state relative-caret-position="302">
+          <caret line="152" column="53" selection-start-line="152" selection-start-column="53" selection-end-line="152" selection-end-column="53" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GPSListener.java">
+    <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="216">
-          <caret line="28" column="3" selection-start-line="28" selection-start-column="3" selection-end-line="48" selection-end-column="27" />
+        <state relative-caret-position="112">
+          <caret line="706" column="35" selection-start-line="706" selection-start-column="35" selection-end-line="706" selection-end-column="35" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1311#1325#0" expanded="true" />
-            <element signature="e#1397#1411#0" expanded="true" />
-            <element signature="e#7599#7600#0" expanded="true" />
-            <element signature="e#7639#7640#0" expanded="true" />
-            <element signature="e#11243#12015#0" expanded="true" />
-            <element signature="e#12014#12015#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/location/LocationManager.class">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GSensorListener.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="145" column="19" selection-start-line="145" selection-start-column="19" selection-end-line="145" selection-end-column="19" />
+        <state relative-caret-position="228">
+          <caret line="167" column="33" lean-forward="true" selection-start-line="167" selection-start-column="33" selection-end-line="167" selection-end-column="33" />
           <folding>
-            <element signature="e#5128#5129#0" expanded="true" />
-            <element signature="e#5179#5180#0" expanded="true" />
+            <element signature="e#1040#2307#0" expanded="true" />
+            <element signature="e#2306#2307#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/text/TextUtils.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.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 relative-caret-position="151">
+          <caret line="244" selection-start-line="244" selection-end-line="244" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java">
+    <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="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 relative-caret-position="-100">
+          <caret line="31" column="2" lean-forward="true" selection-start-line="31" selection-start-column="2" selection-end-line="31" selection-end-column="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java">
+    <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="46">
-          <caret line="356" column="24" selection-start-line="356" selection-start-column="24" selection-end-line="356" selection-end-column="24" />
+        <state relative-caret-position="-51">
+          <caret line="327" selection-start-line="327" selection-end-line="327" />
           <folding>
-            <element signature="e#914#928#0" expanded="true" />
-            <element signature="e#1000#1014#0" expanded="true" />
-            <element signature="e#3747#3748#0" expanded="true" />
-            <element signature="e#3777#3778#0" expanded="true" />
+            <element signature="e#8624#8625#0" expanded="true" />
+            <element signature="e#8649#8650#0" expanded="true" />
+            <element signature="e#8787#8788#0" expanded="true" />
+            <element signature="e#9167#9168#0" expanded="true" />
+            <element signature="e#9189#9190#0" expanded="true" />
+            <element signature="e#9247#9248#0" expanded="true" />
+            <element signature="e#9269#9270#0" expanded="true" />
+            <element signature="e#9313#9314#0" expanded="true" />
+            <element signature="e#9335#9336#0" expanded="true" />
+            <element signature="e#9370#9371#0" expanded="true" />
+            <element signature="e#9391#9392#0" expanded="true" />
           </folding>
         </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" />
+        <state relative-caret-position="139">
+          <caret line="646" column="28" selection-start-line="646" selection-start-column="28" selection-end-line="646" selection-end-column="28" />
           <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" />
+            <element signature="e#21469#21647#0" expanded="true" />
+            <element signature="e#21646#21647#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/app/app.iml b/app/app.iml
index 95ac0dd5..f9ea079a 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -103,8 +103,8 @@
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\LauncherCtrl.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\LauncherCtrl.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.ChestnutPlus:TestModules:v1.0.16@aar" level="project" />
diff --git a/app/debug/ICSer_V113_202001071653_debug.apk b/app/debug/ICSer_V113_202001071653_debug.apk
new file mode 100644
index 00000000..7995a7a7
Binary files /dev/null and b/app/debug/ICSer_V113_202001071653_debug.apk differ
diff --git a/app/debug/ICSer_V113_202001080021_debug.apk b/app/debug/ICSer_V113_202001080021_debug.apk
new file mode 100644
index 00000000..5b8e0d67
Binary files /dev/null and b/app/debug/ICSer_V113_202001080021_debug.apk differ
diff --git a/app/debug/output.json b/app/debug/output.json
new file mode 100644
index 00000000..adfa7cde
--- /dev/null
+++ b/app/debug/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":113,"versionName":"202001080021","enabled":true,"outputFile":"ICSer_V113_202001080021_debug.apk","fullName":"debug","baseName":"debug"},"path":"ICSer_V113_202001080021_debug.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/protocol/GSensorListener.java b/app/src/main/java/com/ic/protocol/GSensorListener.java
index 6b619e72..ccd53f76 100644
--- a/app/src/main/java/com/ic/protocol/GSensorListener.java
+++ b/app/src/main/java/com/ic/protocol/GSensorListener.java
@@ -45,6 +45,7 @@ public class GSensorListener implements SensorEventListener {
         int i = StepCounterInterface.getStepCount();//EqcAlgorithmNative.native_EqcAlgorithm_Gsensor_get_step();
 //        GSensorListener (GSensorListener.this, i);
         GSensorListener.this.CURRENT_STEP = i;
+
         StringBuilder stringBuilder1 = new StringBuilder();
         stringBuilder1.append("CURRENT_STEP =");
         stringBuilder1.append(GSensorListener.this.CURRENT_STEP);
@@ -54,10 +55,7 @@ public class GSensorListener implements SensorEventListener {
 //          GSensorListener.getStepCountOver=false;
 //        EqcAlgorithmNative.native_EqcAlgorithmMethod6(0.0F, 0.0F, 0.0F, GSensorListener.this.CURRENT_STEP);
         Context context = GSensorListener.this.mContext;
-        StringBuilder stringBuilder2 = new StringBuilder();
-        stringBuilder2.append("CURRENT_STEP=");
-        stringBuilder2.append(GSensorListener.this.CURRENT_STEP);
-        FileOutputUtil.fileOutput(context, "CURRENT_STEP", stringBuilder2.toString());
+        FileOutputUtil.fileOutput(context, "CURRENT_STEP", stringBuilder1.toString());
 //        GSensorListener.access$502(GSensorListener.this, null);
         GSensorListener.this.releaseWakeLock(GSensorListener.this.mWakeLock);
       }
@@ -105,7 +103,7 @@ public class GSensorListener implements SensorEventListener {
   public int getStepCount() { return this.CURRENT_STEP; }
   
   public PowerManager.WakeLock getWakeLock() {
-    @SuppressLint("InvalidWakeLockTag") PowerManager.WakeLock wakeLock = ((PowerManager)this.mContext.getSystemService(Context.POWER_SERVICE)).newWakeLock(1, "MyWakelockTag_GSensorListener");
+   PowerManager.WakeLock wakeLock = ((PowerManager)this.mContext.getSystemService(Context.POWER_SERVICE)).newWakeLock(1, "MyWakelockTag_GSensorListener");
     wakeLock.acquire(60000L);
     return wakeLock;
   }
diff --git a/app/src/main/java/com/ic/protocol/LocationClient.java b/app/src/main/java/com/ic/protocol/LocationClient.java
index 06b855e1..b4810ce6 100644
--- a/app/src/main/java/com/ic/protocol/LocationClient.java
+++ b/app/src/main/java/com/ic/protocol/LocationClient.java
@@ -7,12 +7,16 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Build;
+import android.os.Handler;
+import android.os.Message;
 import android.os.PowerManager;
 import android.os.SystemClock;
 import android.provider.Settings;
 import android.util.Log;
 
 import com.ic.protocol.adapter.LBSHelper;
+import com.ic.protocol.adapter.protocolAPIHelper;
+import com.ic.protocol.bean.ICLocation;
 import com.ic.protocol.bean.StringMessage;
 import com.ic.protocol.service.Deliver;
 import com.ic.protocol.service.KeepAlive;
@@ -29,6 +33,8 @@ import com.ic.protocol.utils.SimSignalUtil;
 import com.ic.protocol.bean.Runtime;
 import com.ic.protocol.utils.TimeUtil;
 
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingDeque;
@@ -137,14 +143,14 @@ public class LocationClient {
   
   private static StringMessage changeDelayFlag(StringMessage paramStringMessage) {
     String[] arrayOfString2 = paramStringMessage.all();
-    if (arrayOfString2 != null) {
-      arrayOfString2[7] = "1";
-      return paramStringMessage;
-    } 
-    String[] arrayOfString1 = paramStringMessage.isFromCache().split(";");
-    arrayOfString2 = new String[arrayOfString1.length - 1];
-    arrayOfString1[8] = "1";
-    System.arraycopy(arrayOfString1, 0, arrayOfString2, 0, arrayOfString2.length);
+//    if (arrayOfString2 != null) {
+//      arrayOfString2[7] = "1";
+//      return paramStringMessage;
+//    }
+//    String[] arrayOfString1 = paramStringMessage.isFromCache().split(";");
+//    arrayOfString2 = new String[arrayOfString1.length - 1];
+//    arrayOfString1[8] = "1";
+//    System.arraycopy(arrayOfString1, 0, arrayOfString2, 0, arrayOfString2.length);
     return new StringMessage(arrayOfString2);
   }
   
@@ -195,12 +201,15 @@ public class LocationClient {
       this.haveChanegTo4GTime = l;
     } 
   }
-  
+  //计算运动并发送数据
   private void handlerH12() {
     int i = this.gSensorListener.getStepCount();
+    runtime.setTotalStepCount(i);
     this.H12StepCount = DeviceInfoUtil.getStepCount((runtime.getContextProxy()).context);
-//    if (i != 0 && Math.abs(this.H12StepCount - this.mPedometer2) > 1000)
+    if (i != 0 && Math.abs(this.H12StepCount - this.mPedometer2) > 1000) {
 //      connection.send(API.H12(runtime, this.H12StepCount));
+      Logger.i("StepCount 运动开始后 变化超过1000 ，则发送给服务器！");
+    }
   }
   
   private static void loadMessage2Queue() {
@@ -239,7 +248,13 @@ public class LocationClient {
   private void performAlarm(PowerManager.WakeLock paramWakeLock) {
     if (!runtime.isAirMode)
       CellInfoUtil.setCurrentAttachCellInfo(runtime, paramWakeLock);
+    runtime.getLocationInstance().setMNC(String.valueOf(CellInfoUtil.getMNC()));
+    runtime.getLocationInstance().setCID(CellInfoUtil.getCELL_ID());
+    runtime.getLocationInstance().setMCC(String.valueOf(CellInfoUtil.getMCC()));
+    runtime.getLocationInstance().setLAC(CellInfoUtil.getLAC());
+
     sendBatteryNotification();
+    startGpsLocate();
   }
   
   private void performExecute(int paramInt1, int paramInt2, int paramInt3, int paramInt4, double paramDouble1, double paramDouble2, double paramDouble3, float paramFloat1, float paramFloat2, int paramInt5, float paramFloat3, long paramLong1, long paramLong2, String paramString1, String paramString2, int paramInt6, long paramLong3, int paramInt7) {
@@ -340,10 +355,12 @@ public class LocationClient {
   private void sendBatteryNotification() {
     if (runtime.getHaveBatteryChange() && !runtime.getBatterychanging() && !this.batteryNotification) {
 //      connection.send(API.H05(runtime, "2"));
+      Logger.i("sendBatteryNotification LevelChanged ");
       this.batteryNotification = true;
     }
     if (runtime.getBatteryLow() && !runtime.getBatterychanging() && !this.batteryLowNotification) {
 //      connection.send(API.H05(runtime, "1"));
+      Logger.i("sendBatteryNotification Low Battery ");
       this.batteryLowNotification = true;
     }
     if (runtime.getBatterychanging()) {
@@ -351,22 +368,7 @@ public class LocationClient {
       this.batteryLowNotification = false;
     }
   }
-  
-  private static StringMessage setNewKey(StringMessage paramStringMessage, String paramString) {
-    String str = paramStringMessage.isFromCache();
-    if (str != null) {
-      String str1 = str.substring(0, 8);
-      str = str.substring(str.indexOf(";", 8));
-      StringBuilder stringBuilder = new StringBuilder();
-      stringBuilder.append(str1);
-      stringBuilder.append(paramString);
-      stringBuilder.append(str);
-      paramStringMessage.refresh(stringBuilder.toString());
-      return paramStringMessage;
-    } 
-    paramStringMessage.all()[1] = paramString;
-    return paramStringMessage;
-  }
+
   
   public void EqcAlgorithmInterfaceMethod1(final int cycle_location_flag, int paramInt2, final int delay_flag, final double latitude, final double longitude, final double altitude, final float speed, final float bearing, final int sv_no, final float accuracy, final long timestamp_cur, final long timestamp_last_location, final double latitude_last_location, final double longitude_last_location, final int mode, long paramLong3, final int status_cur_location) {
 //    StringBuilder stringBuilder1 = new StringBuilder();
@@ -518,10 +520,46 @@ public class LocationClient {
     this.mLbsHelper.setOnWiFiInfoListener(new LBSHelper.OnWiFiInfoListener() {
           public void getWifiInfoCallBack(String param1String) {
 //            LocationClient.access$002(true);
+            Logger.i("get wifi scan Callback " + param1String);
             LocationClient.mHasWifiResult=true;
             runtime.currentWifiInfo = param1String;
           }
         });
+
+      Single.just(null).observeOn(AndroidSchedulers.mainThread()).subscribe(new Action1<Object>() {
+        public void call(Object param1Object) { LocationClient.this.waitAndSendLocation(); }
+      });
+
+      class MyTimerTask extends TimerTask {
+        public void run() {
+          //发送读取计步消息
+          LocationClient.this.mhandler.sendEmptyMessage(100);
+        }
+      };
+      MyTimerTask  mMyTimerTask = new MyTimerTask();
+      //延时2秒执行发送“读取定位”消息
+      new Timer().schedule(mMyTimerTask, 10000L);
+  }
+  Handler mhandler=new Handler(){
+
+        public void handleMessage(Message msg) {
+          super.handleMessage(msg);
+          if (msg.what != 100)
+            return;
+          waitAndSendLocation();
+        }
+
+  };
+  public void waitAndSendLocation(){
+
+         boolean wifi_ok=false,gps_ok=false,lbs_ok=false;
+        if (runtime.currentWifiInfo !=null  )wifi_ok =true;
+        if (runtime.getLocationInstance().getLocationStat() == ICLocation.LOCATION_STAT.LOCATION_FIXED) gps_ok=true;
+    lbs_ok=((runtime.getLocationInstance().getMNC()==null)?false:true);
+    Logger.i("lbs_ok "+lbs_ok+" waitAndSendLocation wifi_ok " + wifi_ok+ " gps_ok "+gps_ok);
+    if (lbs_ok) {
+      ServiceUtil.offerQueue(protocolAPIHelper.genStringMessage("AP01", protocolAPIHelper.AP01(runtime)));
+    }
   }
 
 //  public void EqcAlgorithmInterfaceMethod3() {
@@ -594,16 +632,20 @@ public void updateCellInfo() {
     stringBuilder.append(runtime.preCellInfo);
     Logger.i(stringBuilder.toString());
     handlerH12();
-    if (!"".equals(runtime.getKey()) && runtime.getKey() != null) {
+//    if (!"".equals(runtime.getKey()) && runtime.getKey() != null) {
       this.gSensorListener.startListen(paramWakeLock);
       performAlarm(paramWakeLock);
-    }
+//    }
   }
   
   public void onReceive(StringMessage paramStringMessage) {
     Logger.i("LocationClient onReceive " +paramStringMessage.cmd() );
     if ("Sport:OK".equals(paramStringMessage.cmd()))
-      this.mPedometer2 = this.H12StepCount; 
+      this.mPedometer2 = this.H12StepCount;
+
+    if ("BP16".equals(paramStringMessage.cmd())){
+      this.startGpsLocate();
+    }
     if (linkOK)
       return; 
     if ("Link:OK".equals(paramStringMessage.cmd())) {
@@ -701,7 +743,7 @@ public void updateCellInfo() {
     intentFilter.addAction("android.intent.action.SCREEN_ON");
     (runtime.getContextProxy()).context.registerReceiver(this.screenOnReceiver, intentFilter);
     (new MyThread2(this.mCondition, this.mLock)).start();
-    startGpsLocate();
+
     this.haveChanegTo4GTime = SystemClock.elapsedRealtime();
   }
   
@@ -730,21 +772,27 @@ public void updateCellInfo() {
     
     public void run() {
       while (true) {
+
+        //循环发送queue 中的数据
         StringMessage stringMessage = null;
         try {
           StringMessage stringMessage1 = (StringMessage)LocationClient.queue.take();
           try {
+
             if (runtime.getSignalStrength() + 110 < LocationClient.getMinSignalStrength(SimSignalUtil.getInstance((runtime.getContextProxy()).context).getNetworkType())) {
               LocationClient.saveQueue();
               stringMessage = stringMessage1;
+
             } else {
-              StringMessage msg_with_new_imei = LocationClient.setNewKey(stringMessage1, runtime.IMEI_CID_KEY());
-              stringMessage = msg_with_new_imei;
 
+
+//              StringMessage msg_with_new_imei = LocationClient.setNewKey(stringMessage1, runtime.IMEI_CID_KEY());
+//              stringMessage = msg_with_new_imei;
+              stringMessage=stringMessage1;
                Context context = (runtime.getContextProxy()).context;
                StringBuilder stringBuilder = new StringBuilder();
               stringBuilder.append("send=");
-              stringBuilder.append(stringMessage.toString());
+              stringBuilder.append(stringMessage.cmd());
               FileOutputUtil.fileOutput(context, "LocationInfo", stringBuilder.toString());
 
               connection.send(stringMessage);
@@ -754,10 +802,13 @@ public void updateCellInfo() {
               LocationClient.mHasWifiResult=false;
               try {
                 if (KeepAlive.isConnected) {
+                  //如果 服务器连接状态，等30秒
                   this.condition.await(30000L, TimeUnit.MILLISECONDS);
                 } else if (stringMessage.all() != null && stringMessage.all()[0].equals("#@H10@#")) {
+                  //如果 消息中有 ，等30秒
                   this.condition.await(30000L, TimeUnit.MILLISECONDS);
                 } else {
+                  //如果服务器断开，等5秒重连
                   this.condition.await(5000L, TimeUnit.MILLISECONDS);
                 }
                 if (linkOK) {
@@ -767,8 +818,9 @@ public void updateCellInfo() {
                   } else if (stringMessage.all() != null && stringMessage.all()[0].equals("#@H42@#")) {
                     Deliver.releaseWakeLockForGetWifiList();
                   }
-                  if (LocationClient.queue.peek() == null)
-                    LocationClient.loadMessage2Queue();
+//                  if (LocationClient.queue.peek() == null)
+//                    //队列空了，就填补队列。这是video用的，可以先不管
+//                    LocationClient.loadMessage2Queue();
                     this.lock.unlock();
 
                   continue;
diff --git a/app/src/main/java/com/ic/protocol/NMEAListener.java b/app/src/main/java/com/ic/protocol/NMEAListener.java
index 6efb6468..d59a0334 100644
--- a/app/src/main/java/com/ic/protocol/NMEAListener.java
+++ b/app/src/main/java/com/ic/protocol/NMEAListener.java
@@ -14,6 +14,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.widget.TextView;
 
+import com.ic.protocol.bean.ICLocation;
 import com.ic.protocol.bean.Runtime;
 import com.ic.protocol.utils.Logger;
 
@@ -26,27 +27,23 @@ public class NMEAListener implements NmeaListener, LocationListener {
   private boolean listening;
   
   private LocationManager locationManager;
-  Location location;
-
   private String locationInfo;
   private List<GpsSatellite> numSatelliteList = new ArrayList<GpsSatellite>(); // 卫星信号
   private List<GpsSatellite> max3Satellite = new ArrayList<GpsSatellite>(); // 卫星信号
-  private int satelliteInfo = 0;
-  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;
+  GPS_CURRENT_STATUS gpsMode;
   int numberOfSatellites;
   Runtime runtime;
   
   public NMEAListener(LocationManager paramLocationManager, Runtime paramRuntime) {
     this.locationManager = paramLocationManager;
     this.runtime = paramRuntime;
-//    readGpsThread=new ReadGpsThread();
   }
   
   public void onLocationChanged(Location paramLocation) {}
@@ -71,31 +68,13 @@ public class NMEAListener implements NmeaListener, LocationListener {
       switch (event){
         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();
-//              }
-//            }
-
-
-            //如果是pcba测试，则只要有一颗大于30的星就算通过。
 //            if (max3Satellite.size() > 0  && max3Satellite.get(0).getSnr()>=30) {
             //GPS 5秒钟搜不到足够多的星，认为不能定位，取消搜星
             if(noSignalCount > 5){
-              if (readGpsThread != null) {
-                readGpsThread.endThread();
-              }
-              if (flag) {
-                flag = false;
-                pass();
-              }
+                gpsMode=GPS_CURRENT_STATUS.GPS_NOTFIXED;
+                runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_GPS_FAILED);
+                stop();
+
             }
 
 
@@ -103,21 +82,26 @@ public class NMEAListener implements NmeaListener, LocationListener {
         case  GpsStatus.GPS_EVENT_FIRST_FIX:
           //普通测试，必须定位才算通过
 //          +" cost "+status.getTimeToFirstFix()+"ms");
-
-          if (readGpsThread != null) {
-            readGpsThread.endThread();
-          }
 //          定位算通过
-//          if (flag) {
-            flag = true;
-            pass();
-//          }
+            gpsMode = GPS_CURRENT_STATUS.GPS_FIXED;
+          runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_FIXED);
+          getBestLocation(locationManager);
+
+            stop();
+
           break;
         case  GpsStatus.GPS_EVENT_STARTED:
           // tvGps.setText("GPS_EVENT_STARTED");
+          gpsMode=GPS_CURRENT_STATUS.GPS_LISTENING;
+          runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_SEARCHING);
+
+          listening=true;
           break;
         case  GpsStatus.GPS_EVENT_STOPPED:
           //  tvGps.setText("GPS_EVENT_STOPPED");
+          runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_CLOSED);
+
+          listening=false;
           break;
         default:
           break;
@@ -130,53 +114,11 @@ public class NMEAListener implements NmeaListener, LocationListener {
   };
 
 
-  class ReadGpsThread extends Thread {
-    private boolean isRunning = false;
-    private int DELAY_MS = 1000;
-    private int count = 0;
-
-    public ReadGpsThread() {
-      isRunning = true;
-    }
-
-    public void endThread() {
-      isRunning = false;
-      readGpsThread = null;
-    }
-
-    @Override
-    public void run() {
-      while (isRunning) {
-        count++;
-        if (numberOfSatellites >= 3) {
-          return;
-        }
-        // 15秒没定位成功，则失败
-        if (count == 120) {
-          Message msg = new Message();
-          temHandler.sendMessage(msg);
-          if (readGpsThread != null) {
-            endThread();
-            return;
-          }
-        }
-        try {
-          Thread.sleep(DELAY_MS);
-        } catch (Exception e) {
-          // TODO: handle exception
-        }
-      }
-      super.run();
-    }
-  }
 
   Handler temHandler = new Handler(new Handler.Callback() {
     @Override
     public boolean handleMessage(Message message) {
 
-      if (readGpsThread != null) {
-        readGpsThread.endThread();
-      }
       NMEAListener.this.stopListen();
       return false;
     }
@@ -243,21 +185,24 @@ public class NMEAListener implements NmeaListener, LocationListener {
 
     if (searchCout>SearchTimeout){
       sb2.append(" 搜索"+searchCout+"次，超过"+SearchTimeout+"限制退出GPS定位");
-      flag=false;
-      pass();
+      gpsMode=GPS_CURRENT_STATUS.GPS_TIMEOUT;
+      runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_GPS_FAILED);
+
+      stop();
     }
     if (noSignalCount> 5){
       sb2.append(" 搜索"+searchCout+"次，超过"+noSignalCount+"次没有收到星，退出GPS定位");
-      flag=false;
-      pass();
+      gpsMode=GPS_CURRENT_STATUS.GPS_NOSINGAL;
+      runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_GPS_FAILED);
+
+      stop();
     }
 
     Log.e("dxc", sb2.toString());
 
-
     return 0;
   }
-  private void pass(){
+  private void stop(){
 
     // 经纬度 保留6位小数点
     DecimalFormat df = new DecimalFormat("#.000000");
@@ -271,54 +216,6 @@ public class NMEAListener implements NmeaListener, LocationListener {
 
   boolean isFrist = true;
 
-  private String updateView(Location location) {
-
-    if (location != null) {
-      longitude = location.getLongitude();
-      latitude = location.getLatitude();
-      if (longitude > 0 && latitude > 0) {
-        //sucess
-        if (readGpsThread != null) {
-          readGpsThread.endThread();
-        }
-        if (isFrist) {
-          isFrist = false;
-          pass();// 定位成功，自动跳转2016.9.19 tyy
-        }
-
-      } else {
-
-
-      }
-
-      long gpsTime = location.getTime();
-
-      double altitude = location.getAltitude();// 海拔
-
-      // 速度
-      float speed = location.getSpeed();// 速度 单位 m/s
-      speed = (speed * 60) / 1000; // 单位转换 km/h
-      // 保留一位小数点
-      DecimalFormat dfSpeed = new DecimalFormat("#.0");
-      String strSpeed = dfSpeed.format(speed);
-      speed = Float.parseFloat(strSpeed);
-      int intSpeed = (int) (speed * 10);
-      // SimpleLogger.d("intSpeed:"+intSpeed);
-
-      // 经纬度 保留6位小数点
-      DecimalFormat df = new DecimalFormat("#.000000");
-      String strLatitude = df.format(latitude);
-      String strLongitude = df.format(longitude);
-
-      StringBuffer sb = new StringBuffer();
-      sb.append("lon " + strLongitude + "\n" + "lat " + strLatitude);
-      Logger.i("satelliteInfo:"+satelliteInfo);
-      return sb.toString();
-    } else {
-      // textView.setText("");
-      return "";
-    }
-  }
 
   public double[] getGpsInfo() {
     String tude = locationInfo;
@@ -339,20 +236,56 @@ public class NMEAListener implements NmeaListener, LocationListener {
    * @param locationManager
    * @return
    */
-  private Location getBestLocation(LocationManager locationManager) {
-    Location result = null;
+  private void getBestLocation(LocationManager locationManager) {
+    Location location = null;
     if (locationManager != null) {
-      result = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-      if (result != null) {
+      location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+      if (location == null) {
+
+
+        location = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+
+      }
+
+      if (location != null) {
+        longitude = location.getLongitude();
+        latitude = location.getLatitude();
+        if (longitude > 0 && latitude > 0 ) {
+          //sucess
+            stop();// 定位成功，自动跳转2016.9.19 tyy
+          }
+
+        }
+
+        long gpsTime = location.getTime();
+
+        double altitude = location.getAltitude();// 海拔
+
+        // 速度
+        float speed = location.getSpeed();// 速度 单位 m/s
+        speed = (speed * 60) / 1000; // 单位转换 km/h
+        // 保留一位小数点
+        DecimalFormat dfSpeed = new DecimalFormat("#.0");
+        String strSpeed = dfSpeed.format(speed);
+        speed = Float.parseFloat(strSpeed);
+        int intSpeed = (int) (speed * 10);
+        // SimpleLogger.d("intSpeed:"+intSpeed);
+
+        // 经纬度 保留6位小数点
+        DecimalFormat df = new DecimalFormat("#.000000");
+        String strLatitude = df.format(latitude);
+        String strLongitude = df.format(longitude);
+
+        StringBuffer sb = new StringBuffer();
+        sb.append("lon " + strLongitude + "\n" + "lat " + strLatitude);
+//        Logger.i("satelliteInfo:"+);
+        Logger.i( sb.toString());
+        runtime.getLocationInstance().setLocation(location.getLatitude(),location.getLongitude(),location.getSpeed(),0);
 
-        return result;
-      } else {
-        result = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
-        return result;
       }
     }
-    return result;
-  }
+
+
 
   public boolean startListen() {
     this.locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0L, 0.0F, this);
@@ -373,4 +306,12 @@ public class NMEAListener implements NmeaListener, LocationListener {
     this.locationManager.removeUpdates(this);
     this.listening = false;
   }
+
+  public enum  GPS_CURRENT_STATUS {
+    GPS_LISTENING,
+    GPS_FIXED,
+    GPS_NOTFIXED,
+    GPS_TIMEOUT,
+    GPS_NOSINGAL,
+  }
 }
diff --git a/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java b/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java
index 3b55470f..ae71a47e 100644
--- a/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java
+++ b/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java
@@ -254,7 +254,7 @@ public class LBSHelper {
                 StringBuilder cdmaSB = new StringBuilder();
                 gsmSb.insert(3, "@");
                 mccmnc.insert(3, "@");
-                this.runtime.setMccAndMnc(mccmnc.toString());
+//                this.runtime.setMccAndMnc(mccmnc.toString());
                  if (celllocation instanceof GsmCellLocation) {
                     GsmCellLocation gsmCell = (GsmCellLocation)celllocation;
                     gsmSb.append("@");
@@ -263,9 +263,9 @@ public class LBSHelper {
                     gsmSb.append(gsmCell.getCid());
                     gsmSb.append("@");
                     gsmSb.append(this.mLastSignal);
-                     this.runtime.setCid(String.format("",gsmCell.getCid()));
+//                     this.runtime.setCid(String.format("%03d",gsmCell.getCid()));
 //                     this.runtime.setLAC(gsmCell.getLac());
-                     this.runtime.setCellinfo(gsmSb.toString());
+//                     this.runtime.setCellinfo(gsmSb.toString());
                     Logger.i("GsmCellLocation "+ gsmSb.toString());
                      FileOutputUtil.fileOutput(this.context, "onCellLocationChanged", gsmSb.toString());
                 } else if (celllocation instanceof CdmaCellLocation) {
@@ -281,7 +281,6 @@ public class LBSHelper {
                     cdmaSB.append("");
                     cdmaSB.append(",");
                     cdmaSB.append(this.mLastSignal);
-                    this.runtime.setCdmaInfo(cdmaSB.toString());
                     Logger.i("CdmaCellLocation");
                     Context var16 = this.context;
                     StringBuilder var8 = new StringBuilder();
@@ -289,23 +288,17 @@ public class LBSHelper {
                     var8.append(cdmaSB.toString());
                     Logger.i(var8.toString());
                     FileOutputUtil.fileOutput(var16, "onCellLocationChanged", var8.toString());
-                } else {
-                    this.runtime.setCdmaInfo((String)null);
                 }
 
-                this.runtime.setCurrentCellInfo(gsmSb.toString());
 
                 cdmaSB = new StringBuilder();
                 cdmaSB.append("lbsInfo CurrentCellInfo== ");
-                cdmaSB.append(this.runtime.getCurrentCellInfo());
+                cdmaSB.append(gsmSb.toString());
                 Logger.i(cdmaSB.toString());
 
                 Context var13 = this.context;
-                StringBuilder var17 = new StringBuilder();
-                var17.append("lbsInfo currentCellInfo== ");
-                var17.append(this.runtime.getCurrentCellInfo());
-                FileOutputUtil.fileOutput(var13, "cellInfoTest", var17.toString());
-                Logger.i("cellInfoTest "+ var17.toString());
+                FileOutputUtil.fileOutput(var13, "cellInfoTest", cdmaSB.toString());
+                Logger.i("cellInfoTest "+ cdmaSB.toString());
                 List neighboringCell_list = telephonyManager.getNeighboringCellInfo();
                 if (neighboringCell_list != null && !neighboringCell_list.isEmpty()) {
                     Iterator cell = neighboringCell_list.iterator();
@@ -375,6 +368,7 @@ public class LBSHelper {
             LBSHelper.this.runtime.setSignalStrength(LBSHelper.this.mLastSignal - 110);
 //            LBSHelper.this.mLastSignal = ss.getGsmSignalStrength();//ss.getDbm();
 //            LBSHelper.this.runtime.setSignalStrength(LBSHelper.this.mLastSignal);
+
         }
     }
 
diff --git a/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java b/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
index f2c253f0..5a6be3b5 100644
--- a/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
@@ -9,6 +9,8 @@ import com.ic.protocol.utils.Logger;
 
 import java.util.HashMap;
 
+import static java.lang.Math.abs;
+
 public class protocolAPIHelper {
     private static final String TAG = "ICSrv." + protocolAPIHelper.class.getSimpleName();
 
@@ -96,8 +98,8 @@ public class protocolAPIHelper {
         cmdMap.put(CMD_TYPE.BP10, "BP10");
         cmdMap.put(CMD_TYPE.AP49, "AP49");
         cmdMap.put(CMD_TYPE.BP49, "BP49");
-        cmdMap.put(CMD_TYPE.APTM, "APHT");
-        cmdMap.put(CMD_TYPE.BPTM, "BPHT");
+        cmdMap.put(CMD_TYPE.APHT, "APHT");
+        cmdMap.put(CMD_TYPE.BPHT, "BPHT");
         cmdMap.put(CMD_TYPE.APTM, "APTM");
         cmdMap.put(CMD_TYPE.BPTM, "BPTM");
         cmdMap.put(CMD_TYPE.AP12, "AP12");
@@ -110,7 +112,7 @@ public class protocolAPIHelper {
         cmdMap.put(CMD_TYPE.BP16, "BP16");
         cmdMap.put(CMD_TYPE.AP17, "AP17");
         cmdMap.put(CMD_TYPE.BP17, "BP17");
-        cmdMap.put(CMD_TYPE.AP18, "AP00");
+        cmdMap.put(CMD_TYPE.AP18, "AP18");
         cmdMap.put(CMD_TYPE.BP18, "BP18");
         cmdMap.put(CMD_TYPE.AP21, "AP21");
         cmdMap.put(CMD_TYPE.BP21, "BP21");
@@ -162,6 +164,14 @@ public class protocolAPIHelper {
         Logger.log(TAG, function, msg);
     }
 
+
+
+    /**/
+    public static StringMessage genStringMessage(String cmdName,String msg){
+            StringMessage sm=new StringMessage(new String[]{cmdName,msg});
+            sm.refresh(msg);
+            return sm;
+    }
     /*
     返回true 表示 cmd 全部解析成功
     返回false表示 cmd至少有一条解析失败，失败的数据归入buffer，下一次识别接着使用
@@ -220,7 +230,7 @@ public class protocolAPIHelper {
 
     public static String AP03(Runtime ds) {
         //示例数据：IWAP03,06000908000102,5555,30#
-        return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP03)).append(CMDSPLIT).append(ds.getSignalStrength())
+        return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP03)).append(CMDSPLIT).append(String.format("%03d",abs(ds.getSignalStrength())))
                 .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0")
                 .append(ds.getProtection()).append(ds.getWorkMode()).append(CMDSPLIT)
                 .append(ds.getTotalStepCount()).append(CMDSPLIT).append(0/*rolltime*/).append(CMDEND).toString();
@@ -233,8 +243,8 @@ public class protocolAPIHelper {
         // Home|74-DE-2B-44-88-8C|97& Home1|74-DE-2B-44-88-8C|97&Home2|74-DE-2B-44-88-8C|97& Home3|74-DE-2B-44-88-8C|97#
 //        IWAP01191230A2232.9807N11404.9355E000.1161320000.0006000910000000,460,00,9520,3671,#
         return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP01)).append(ds.getShortDate())
-                .append(ds.getGPSData()).append(ds.getShortTime()).append(ds.getGPSHeading()).append(ds.getGSMSignal())
-                .append(ds.getGPSLocationStarNums()).append(ds.getBatteryLevel()).append("0")
+                .append(ds.getGPSData()).append(ds.getShortTime()).append(ds.getGPSHeading()).append(String.format("%03d",abs(ds.getSignalStrength())))
+                .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0")
                 .append(ds.getProtection()).append(ds.getWorkMode()).append(CMDSPLIT)
                 .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiInfo()).append(CMDEND).toString();
     }
@@ -436,7 +446,7 @@ public class protocolAPIHelper {
 
     }
     //处理 登录 BP00
-    private void handleBP00(String cmd){
+    public void handleBP00(String cmd){
        String[] msg=cmd.split(CMDSPLIT);
 //        get Msg :IWBP00,20191229171933,8# (size)24
 //        12-30 01:19:33.861 6492-6492/com.ic.protocol I/ICSrv.protocolAPIHelper: found cmd keyid=BP00 ,keyname=BP00 ,  IWBP00,20191229171933,8
@@ -471,17 +481,17 @@ public class protocolAPIHelper {
 
 
 
-    //处理 心跳 BP01
-    private void handleBP01(String cmd){
+    //处理 定位 BP01
+    public void handleBP01(String cmd){
         log("BP01定位接收成功");
     }
 
     //处理 心跳 BP03
-    private void handleBP03(String cmd){
+    public void handleBP03(String cmd){
         log("BP03心跳接收成功");
     }
     //处理 BP28 语音消息
-    private void handleBP28(String cmd) {
+    public void handleBP28(String cmd) {
         //log("handleBP28 msg"+cmd);
         String[] msg=cmd.split(CMDSPLIT);
         if (msg.length>=7){
diff --git a/app/src/main/java/com/ic/protocol/bean/ICLocation.java b/app/src/main/java/com/ic/protocol/bean/ICLocation.java
index cf6db28a..5836a7b6 100644
--- a/app/src/main/java/com/ic/protocol/bean/ICLocation.java
+++ b/app/src/main/java/com/ic/protocol/bean/ICLocation.java
@@ -42,7 +42,9 @@ public class ICLocation {
         init_data();
     }
 
-
+    public void setLocationStat(LOCATION_STAT stat){
+        this.currentStat = stat;
+    }
     private void init_data(){
         currentLP.lat=2232.9806f;
         currentLP.lon=11404.9355f;
diff --git a/app/src/main/java/com/ic/protocol/bean/Runtime.java b/app/src/main/java/com/ic/protocol/bean/Runtime.java
index 1c9c7181..31fe475a 100644
--- a/app/src/main/java/com/ic/protocol/bean/Runtime.java
+++ b/app/src/main/java/com/ic/protocol/bean/Runtime.java
@@ -84,7 +84,7 @@ public class Runtime {
   
   private String location;
   
-  private boolean lockSimInfo;
+  private boolean lockSimInfo=false;
   
   private String longitude;
   
@@ -156,7 +156,11 @@ public class Runtime {
   public String getHaveTry() { return this.haveTry; }
   
   public String getHost() { return this.testServerProp ? srvIP : this.host; }
-  
+
+  public void setSrvIP(String ip) { this.srvIP=ip;}
+
+  public String getSrvIP(){ return this.srvIP;}
+
   public String getKey() { return this.key; }
   
   public String getLacInfoByAt() { return this.lacByAt; }
@@ -283,7 +287,7 @@ public class Runtime {
   
   public void setSignalStrength(int signal) {
     this.SignalStrength = signal;
-//    Logger.i("setSignalStrength "+signal);
+    Logger.i("setSignalStrength "+signal);
   }
   
   public void setTestServerProp(boolean paramBoolean) { this.testServerProp = paramBoolean; }
@@ -300,9 +304,6 @@ public class Runtime {
 
 
 
-
-
-
   private final String UserDebug = "userdebug";
   private final String User = "user";
 
@@ -362,7 +363,7 @@ public class Runtime {
   }
 
   public String getGPSLocationStarNums() {
-    return "009";
+    return "000";
   }
 
   public String getProtection() {
diff --git a/app/src/main/java/com/ic/protocol/service/Deliver.java b/app/src/main/java/com/ic/protocol/service/Deliver.java
index e741cba0..44ac2982 100644
--- a/app/src/main/java/com/ic/protocol/service/Deliver.java
+++ b/app/src/main/java/com/ic/protocol/service/Deliver.java
@@ -133,7 +133,7 @@ public class Deliver extends AbstractConnectionService {
     this.mConnection = paramConnection;
     this.mRuntime = paramRuntime;
     String cmd = paramStringMessage.cmd();
-    Logger.i(paramStringMessage.cmd());
+    Logger.i("Deliver receive cmd "+paramStringMessage.cmd());
 
     if (cmd.startsWith("SmsSet")) {
       arrayOfString4 = cmd.split(":");
@@ -552,7 +552,7 @@ public class Deliver extends AbstractConnectionService {
 //              dBHelper.saveStheartRateList(param1Update.stheartRateList);
 //          }
 //        });
-    return true;
+    return false;
   }
   
   public void releaseOneWakeLock() {
@@ -634,7 +634,7 @@ public class Deliver extends AbstractConnectionService {
 //          Deliver.access$502(Deliver.this, null);
 //          Deliver.access$202(Deliver.this, false);
           Deliver.this.releaseOneWakeLock();
-//          Deliver.access$102(Deliver.WakeLockForGetWifiList(Deliver.this.mRuntime));
+          Deliver.WakeLockForGetWifiList(Deliver.this.mRuntime);
           return;
         } 
         stringBuilder = new StringBuilder();
@@ -644,47 +644,48 @@ public class Deliver extends AbstractConnectionService {
 //        Deliver.access$402(2);
         wifiManager.reconnect();
         if (Deliver.this.delayHandler == null) {
-//          Deliver.access$602(Deliver.this, new Handler());
-//          Deliver.access$702(Deliver.this, new Runnable() {
-//                public void run() {
-//                  StringBuilder stringBuilder = new StringBuilder();
-//                  stringBuilder.append("连接失败 超时 wifiEnabled=");
-//                  stringBuilder.append(ConWifiReceiver.this.wifiEnabled);
-//                  Logger.i(stringBuilder.toString());
-//                  if (isAppSetWifi == 1)
-//                    return;
+          Deliver.this.delayHandler =new Handler();
+          Deliver.this.delayTh= new Runnable() {
+                public void run() {
+                  StringBuilder stringBuilder = new StringBuilder();
+                  stringBuilder.append("连接失败 超时 wifiEnabled=");
+                  stringBuilder.append(wifiEnabled);
+                  Logger.i(stringBuilder.toString());
+                  if (isAppSetWifi == 1)
+                    return;
 //                  Deliver.access$402(0);
-//                  context.unregisterReceiver(ConWifiReceiver.this.this$0.mMyWifiReceiver);
-//                  Deliver.access$502(ConWifiReceiver.this.this$0, null);
-//                  WifiManager wifiManager = (WifiManager)context.getSystemService("wifi");
-//                  if (((ConnectivityManager)context.getSystemService("connectivity")).getNetworkInfo(1).isConnected()) {
-//                    Logger.i("连接成功 1");
-//                    Deliver.haveSendH42 = true;
-//                    ConWifiReceiver.this.this$0.mConnection.connect(ConWifiReceiver.this.this$0.mRuntime.getHost(), ConWifiReceiver.this.this$0.mRuntime.getPort());
+                  context.unregisterReceiver(mMyWifiReceiver);
+                  mMyWifiReceiver=null;
+                  WifiManager wifiManager = (WifiManager)context.getSystemService(Context.WIFI_SERVICE);
+                  if (((ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE)).getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) {
+                    Logger.i("连接成功 1");
+                    Deliver.haveSendH42 = true;
+                    mConnection.connect(mRuntime.getHost(), mRuntime.getPort());
 //                    Deliver.access$202(ConWifiReceiver.this.this$0, false);
-//                    ConWifiReceiver.this.this$0.releaseOneWakeLock();
-//                    Deliver.access$102(Deliver.WakeLockForGetWifiList(ConWifiReceiver.this.this$0.mRuntime));
-//                  } else {
-//                    int i = wifiManager.getConnectionInfo().getNetworkId();
-//                    if (i != -1) {
-//                      wifiManager.disableNetwork(i);
+                    releaseOneWakeLock();
+                    Deliver.WakeLockForGetWifiList(mRuntime);
+                  } else {
+                    int i = wifiManager.getConnectionInfo().getNetworkId();
+                    if (i != -1) {
+                      wifiManager.disableNetwork(i);
 //                      ServiceUtil.offerQueue(API.H42(ConWifiReceiver.this.this$0.mRuntime, "3"));
 //                      Deliver.access$202(ConWifiReceiver.this.this$0, false);
-//                      ConWifiReceiver.this.this$0.releaseOneWakeLock();
-//                      Deliver.access$102(Deliver.WakeLockForGetWifiList(ConWifiReceiver.this.this$0.mRuntime));
-//                    } else {
-//                      Logger.i("连接失败 2-2");
+                      releaseOneWakeLock();
+                      WakeLockForGetWifiList(mRuntime);
+                    } else {
+                      Logger.i("连接失败 2-2");
 //                      ServiceUtil.offerQueue(API.H42(ConWifiReceiver.this.this$0.mRuntime, "3"));
 //                      Deliver.access$202(ConWifiReceiver.this.this$0, false);
-//                      ConWifiReceiver.this.this$0.releaseOneWakeLock();
-//                      Deliver.access$102(Deliver.WakeLockForGetWifiList(ConWifiReceiver.this.this$0.mRuntime));
-//                    }
-//                    if (!ConWifiReceiver.this.this$0.wifiEnabled)
-//                      wifiManager.setWifiEnabled(false);
-//                  }
+                      releaseOneWakeLock();
+                      Deliver.WakeLockForGetWifiList(mRuntime);
+                    }
+                    if (!wifiEnabled)
+                      wifiManager.setWifiEnabled(false);
+                  }
 //                  Deliver.access$602(ConWifiReceiver.this.this$0, null);
-//                }
-//              });
+                }
+              }
+              ;
           Deliver.this.delayHandler.postDelayed(Deliver.this.delayTh, 30000L);
         } 
       } 
diff --git a/app/src/main/java/com/ic/protocol/service/KeepAlive.java b/app/src/main/java/com/ic/protocol/service/KeepAlive.java
index 2a38a8af..5e65814a 100644
--- a/app/src/main/java/com/ic/protocol/service/KeepAlive.java
+++ b/app/src/main/java/com/ic/protocol/service/KeepAlive.java
@@ -11,6 +11,7 @@ import com.eiot.watch_lib.LauncherCtrl;
 import com.ic.protocol.adapter.protocolAPIHelper;
 import com.ic.protocol.bean.StringMessage;
 import com.ic.protocol.service.base.AbstractConnectionService;
+import com.ic.protocol.utils.AlarmHelper;
 import com.ic.protocol.utils.AlarmWakeUp;
 import com.ic.protocol.utils.Connection;
 import com.ic.protocol.utils.Logger;
@@ -189,6 +190,9 @@ public class KeepAlive extends AbstractConnectionService {
   }
   
   public void onAlarmClock(Connection paramConnection, Runtime paramRuntime) {
+
+    Logger.i("onAlarmClock");
+
     long l = SystemClock.elapsedRealtime();
     if (!isConnected || l - this.idleTimeMillis > 660000L) {
       StringBuilder stringBuilder = new StringBuilder();
@@ -252,14 +256,14 @@ public class KeepAlive extends AbstractConnectionService {
     stringBuilder.append(",sInSleepMode =");
     stringBuilder.append(isInSleepMode);
     Logger.i(stringBuilder.toString());
-    if (connectionError) {
+//    if (!connectionError) {
       connectionError = false;
-      ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP03(paramRuntime)), true);
-      if (Deliver.haveSendH42) {
-        ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP03(paramRuntime)));
-        Deliver.haveSendH42 = false;
-      }
-    } 
+      ServiceUtil.offerQueue(protocolAPIHelper.genStringMessage("heart",protocolAPIHelper.AP03(paramRuntime)), true);
+//      if (Deliver.haveSendH42) {
+//        ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP03(paramRuntime)));
+//        Deliver.haveSendH42 = false;
+//      }
+//    }
     isConnected = true;
     this.firstReConnected = true;
     this.idleTimeMillis = SystemClock.elapsedRealtime();
@@ -277,16 +281,16 @@ public class KeepAlive extends AbstractConnectionService {
   
   public void onHeartAlarm(NettyConnection paramNettyConnection, Runtime paramRuntime) {
     Logger.i("onHeartAlarm");
-    UpdateHeartBeatTimeout();
-    if (this.reCycleTimes == 0 && this.currentReConnectInterval != 11){
-      ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP03(paramRuntime)), true);
-    }
+//    UpdateHeartBeatTimeout();
+//    if (this.reCycleTimes == 0 && this.currentReConnectInterval != 11){
+    ServiceUtil.offerQueue(protocolAPIHelper.genStringMessage("heart",protocolAPIHelper.AP03(paramRuntime)), true);
+//    }
 
   }
 
   public boolean onReceive(StringMessage paramStringMessage, Connection paramConnection, Runtime paramRuntime) {
     this.idleTimeMillis = SystemClock.elapsedRealtime();
-    Log.i(TAG,paramStringMessage.cmd());
+    Logger.i(TAG+paramStringMessage.cmd());
     if ("heart".equals(paramStringMessage.cmd()) || "Link:OK".equals(paramStringMessage.cmd()) || "Shutdown:OK".equals(paramStringMessage.cmd()) || "Sport:OK".equals(paramStringMessage.cmd())) {
       if ("Shutdown:OK".equals(paramStringMessage.cmd()))
         paramRuntime.getContextProxy().shutdown(); 
diff --git a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
index 12155168..105020d3 100644
--- a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
+++ b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
@@ -29,6 +29,7 @@ import com.ic.protocol.service.base.AbstractConnectionService;
 import com.ic.protocol.service.base.AbstractInvokeHandlerService;
 import com.ic.protocol.utils.AlarmHelper;
 import com.ic.protocol.utils.AlarmWakeUp;
+import com.ic.protocol.utils.BatteryUtil;
 import com.ic.protocol.utils.ConnectionListener;
 import com.ic.protocol.utils.ContextProxy;
 import com.ic.protocol.utils.DBHelper;
@@ -154,6 +155,7 @@ public class protocolMainServer extends Service {
         }
 
         public void onReceive(StringMessage param1StringMessage) {
+            Logger.i("onReceive " +param1StringMessage.cmd());
             protocolMainServer coreService = (protocolMainServer)this.mReference.get();
             if (coreService == null)
                 return;
@@ -183,6 +185,7 @@ public class protocolMainServer extends Service {
 
     private SimSignalUtil mSignalUtil;
 
+    private BatteryUtil batteryUtil;
     private long mWeatherTime;
 
     Runtime runtime;
@@ -228,15 +231,15 @@ public class protocolMainServer extends Service {
 
     private AbstractConnectionService getConnectionServiceChain() {
 //        DNS dNS = new DNS();
-        SynchronousTime synchronousTime = new SynchronousTime();
+//        SynchronousTime synchronousTime = new SynchronousTime();
 //        new ProcessEncryptionService();
         Initialize initialize = new Initialize();
         CheckSIM checkSIM = new CheckSIM();
         this.mKeepAlive = new KeepAlive();
         this.mDeliver = new Deliver();
 //        dNS.setNext(synchronousTime);
-        initialize.setNext(synchronousTime);
-        synchronousTime.setNext(checkSIM);
+//        initialize.setNext(synchronousTime);
+        initialize.setNext(checkSIM);
         checkSIM.setNext(this.mKeepAlive);
         this.mKeepAlive.setNext(this.mDeliver);
 
@@ -400,6 +403,8 @@ public class protocolMainServer extends Service {
         intentFilter.addAction("com.eqc.intent.action.callback.at");
         registerReceiver(this.AtCallbackBroadcastReceiver, intentFilter);
         this.mSignalUtil = SimSignalUtil.getInstance(this);
+        batteryUtil = new BatteryUtil(this.runtime);
+        batteryUtil.registerBroadReceiver();
         setCleanStepCountAlarm();
         setSleepAlarm();
         setWakeAlarm();
@@ -485,6 +490,7 @@ public class protocolMainServer extends Service {
                     if (HEART_ALARM.equals(paramIntent.getAction())) {
                         if (this.mKeepAlive != null) {
                             this.mKeepAlive.onHeartAlarm(this.connection, this.runtime);
+                            this.setHeartAlarm();
                             return Service.START_STICKY;
                         }
                     } else {
@@ -559,6 +565,7 @@ public class protocolMainServer extends Service {
         (this.runtime.getContextProxy()).context.sendBroadcast(intent);
     }
 
+    //每一分钟设置一次
     public void setAlarm(int paramInt) {
         AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,1,ACTION_ALARM);
     }
diff --git a/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java b/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java
index 1885ff01..b115ded7 100644
--- a/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java
+++ b/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java
@@ -24,7 +24,7 @@ public class AlarmWakeUp {
       stringBuilder.append(l);
       stringBuilder.append("---lastAlarmTime=");
       stringBuilder.append(lastAlarmTime);
-      Log.i("AlarmWakeUp",stringBuilder.toString());
+      Logger.i("AlarmWakeUp "+ stringBuilder.toString());
       FileOutputUtil.fileOutput(context, "alarmWakeUp", stringBuilder.toString());
     } 
   }
diff --git a/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java b/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java
index 22a55fbf..3c6f1ea0 100644
--- a/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java
+++ b/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java
@@ -11,88 +11,93 @@ import com.ic.protocol.bean.Runtime;
 public class BatteryUtil {
   private BroadcastReceiver batteryChangedReceiver = new BroadcastReceiver() {
       public void onReceive(Context param1Context, Intent param1Intent) {
-//        if ("android.intent.action.BATTERY_CHANGED".equals(param1Intent.getAction())) {
-//          if (param1Intent.getIntExtra("status", 1) == 2) {
-//            BatteryUtil.this.mRuntime.setBatterychanging(true);
-//            BatteryUtil.this.mRuntime.setBatteryLow(false);
-//          } else {
-//            BatteryUtil.this.mRuntime.setBatterychanging(false);
-//          }
-//          int i = param1Intent.getIntExtra("level", 0) * 100 / param1Intent.getIntExtra("scale", 100);
-//          if (i >= 100) {
-//            Runtime runtime = BatteryUtil.this.mRuntime;
-//            StringBuffer stringBuffer = BatteryUtil.this.mBuffer;
-//            stringBuffer.append("5");
-//            stringBuffer.append(100);
-//            runtime.setBattery(stringBuffer.toString());
-//            BatteryUtil.this.mRuntime.setHaveBatteryChange(false);
-//            BatteryUtil.this.mRuntime.setBatteryLow(false);
-//          } else if (i >= 75) {
-//            Runtime runtime = BatteryUtil.this.mRuntime;
-//            StringBuffer stringBuffer = BatteryUtil.this.mBuffer;
-//            stringBuffer.append("50");
+        if ("android.intent.action.BATTERY_CHANGED".equals(param1Intent.getAction())) {
+          if (param1Intent.getIntExtra("status", 1) == 2) {
+            BatteryUtil.this.mRuntime.setBatterychanging(true);
+            BatteryUtil.this.mRuntime.setBatteryLow(false);
+          } else {
+            BatteryUtil.this.mRuntime.setBatterychanging(false);
+          }
+          int i = param1Intent.getIntExtra("level", 0) * 100 / param1Intent.getIntExtra("scale", 100);
+          if (i >= 100) {
+            Runtime runtime = BatteryUtil.this.mRuntime;
+            StringBuffer stringBuffer = BatteryUtil.this.mBuffer;
+            stringBuffer.append("005");
+            stringBuffer.append(100);
+            runtime.setBattery(String.format("%03d",100));
+            BatteryUtil.this.mRuntime.setHaveBatteryChange(false);
+            BatteryUtil.this.mRuntime.setBatteryLow(false);
+          } else if (i >= 75) {
+            Runtime runtime = BatteryUtil.this.mRuntime;
+            StringBuffer stringBuffer = BatteryUtil.this.mBuffer;
+//            stringBuffer.append("050");
 //            stringBuffer.append(i);
 //            runtime.setBattery(stringBuffer.toString());
-//            BatteryUtil.this.mRuntime.setHaveBatteryChange(false);
-//            BatteryUtil.this.mRuntime.setBatteryLow(false);
-//          } else if (i >= 50) {
-//            Runtime runtime = BatteryUtil.this.mRuntime;
-//            StringBuffer stringBuffer = BatteryUtil.this.mBuffer;
-//            stringBuffer.append("40");
+            runtime.setBattery(String.format("%03d",i));
+            BatteryUtil.this.mRuntime.setHaveBatteryChange(false);
+            BatteryUtil.this.mRuntime.setBatteryLow(false);
+          } else if (i >= 50) {
+            Runtime runtime = BatteryUtil.this.mRuntime;
+            StringBuffer stringBuffer = BatteryUtil.this.mBuffer;
+//            stringBuffer.append("040");
 //            stringBuffer.append(i);
 //            runtime.setBattery(stringBuffer.toString());
-//            BatteryUtil.this.mRuntime.setHaveBatteryChange(false);
-//            BatteryUtil.this.mRuntime.setBatteryLow(false);
-//          } else if (i >= 25) {
-//            Runtime runtime = BatteryUtil.this.mRuntime;
-//            StringBuffer stringBuffer = BatteryUtil.this.mBuffer;
-//            stringBuffer.append("30");
+            runtime.setBattery(String.format("%03d",i));
+            BatteryUtil.this.mRuntime.setHaveBatteryChange(false);
+            BatteryUtil.this.mRuntime.setBatteryLow(false);
+          } else if (i >= 25) {
+            Runtime runtime = BatteryUtil.this.mRuntime;
+            StringBuffer stringBuffer = BatteryUtil.this.mBuffer;
+//            stringBuffer.append("030");
 //            stringBuffer.append(i);
 //            runtime.setBattery(stringBuffer.toString());
-//            BatteryUtil.this.mRuntime.setHaveBatteryChange(false);
-//            BatteryUtil.this.mRuntime.setBatteryLow(false);
-//          } else if (i >= 10) {
-//            Runtime runtime = BatteryUtil.this.mRuntime;
-//            StringBuffer stringBuffer = BatteryUtil.this.mBuffer;
-//            stringBuffer.append("20");
+            runtime.setBattery(String.format("%03d",i));
+            BatteryUtil.this.mRuntime.setHaveBatteryChange(false);
+            BatteryUtil.this.mRuntime.setBatteryLow(false);
+          } else if (i >= 10) {
+            Runtime runtime = BatteryUtil.this.mRuntime;
+            StringBuffer stringBuffer = BatteryUtil.this.mBuffer;
+//            stringBuffer.append("020");
 //            stringBuffer.append(i);
 //            runtime.setBattery(stringBuffer.toString());
-//            BatteryUtil.this.mRuntime.setHaveBatteryChange(true);
-//          } else {
-//            Runtime runtime = BatteryUtil.this.mRuntime;
-//            StringBuffer stringBuffer = BatteryUtil.this.mBuffer;
+            runtime.setBattery(String.format("%03d",i));
+            BatteryUtil.this.mRuntime.setHaveBatteryChange(true);
+          } else {
+            Runtime runtime = BatteryUtil.this.mRuntime;
+            StringBuffer stringBuffer = BatteryUtil.this.mBuffer;
 //            stringBuffer.append("100");
 //            stringBuffer.append(i);
 //            runtime.setBattery(stringBuffer.toString());
-//            BatteryUtil.this.mRuntime.setHaveBatteryChange(true);
-//          }
-//          BatteryUtil.this.mBuffer.setLength(0);
-//        }
-//        if ("android.intent.action.BATTERY_LOW".equals(param1Intent.getAction())) {
-//          BatteryUtil.this.mRuntime.setBatteryLow(true);
-//          Logger.i("lowbattery finish video_end_call");
-//          ComponentName componentName = new ComponentName("com.enqualcomm.support", "com.enqualcomm.support.CoreService");
-//          Intent intent = (new Intent("com.enqualcomm.support.lowbatteryMsg")).setComponent(componentName);
-//          (this.this$0.mRuntime.getContextProxy()).context.startService(intent);
-//        }
+            runtime.setBattery(String.format("%03d",i));
+            BatteryUtil.this.mRuntime.setHaveBatteryChange(true);
+          }
+          BatteryUtil.this.mBuffer.setLength(0);
+        }
+        if ("android.intent.action.BATTERY_LOW".equals(param1Intent.getAction())) {
+          BatteryUtil.this.mRuntime.setBatteryLow(true);
+          Logger.i("lowbattery finish video_end_call");
+          ComponentName componentName = new ComponentName("com.enqualcomm.support", "com.enqualcomm.support.CoreService");
+          Intent intent = (new Intent("com.enqualcomm.support.lowbatteryMsg")).setComponent(componentName);
+          (mRuntime.getContextProxy()).context.startService(intent);
+        }
       }
     };
   
   private StringBuffer mBuffer;
 
-  Runtime devStat;
+  Runtime mRuntime;
   
-  public BatteryUtil(Runtime paramRuntime) { this.devStat = paramRuntime; }
+  public BatteryUtil(Runtime paramRuntime) { this.mRuntime = paramRuntime; }
   
   public void registerBroadReceiver() {
     this.mBuffer = new StringBuffer();
     IntentFilter intentFilter = new IntentFilter();
     intentFilter.addAction("android.intent.action.BATTERY_CHANGED");
     intentFilter.addAction("android.intent.action.BATTERY_LOW");
-    (this.devStat.getContextProxy()).context.registerReceiver(this.batteryChangedReceiver, intentFilter);
+    (this.mRuntime.getContextProxy()).context.registerReceiver(this.batteryChangedReceiver, intentFilter);
   }
   
-  public void unregisterBroadReceiver() { (this.devStat.getContextProxy()).context.unregisterReceiver(this.batteryChangedReceiver); }
+  public void unregisterBroadReceiver() { (this.mRuntime.getContextProxy()).context.unregisterReceiver(this.batteryChangedReceiver); }
 }
 
 
diff --git a/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java b/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java
index cbb54069..c1d83741 100644
--- a/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java
+++ b/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java
@@ -19,7 +19,13 @@ public class CellInfoUtil {
   static int MCC = 0;
   
   static int MNC = 0;
-  
+
+
+  public static int getLAC(){return LAC;};
+  public static int getBSSS(){return BSSS;};
+  public static int getCELL_ID(){return CELL_ID;};
+  public static int getMCC(){return MCC;};
+  public static int getMNC(){return MNC;};
   public static boolean getCellInfoOver = false;
   
   private static String mCellInfo;
@@ -31,7 +37,6 @@ public class CellInfoUtil {
           return; 
         Logger.i("延时获取基站信息");
 //        CellInfoUtil.access$010();
-
         CellInfoUtil.setCurrentAttachCellInfo(mRuntime, mWakeLock);
       }
     };
@@ -124,4 +129,6 @@ public class CellInfoUtil {
           }
         })).start();
   }
+
+
 }
diff --git a/app/src/main/java/com/ic/protocol/utils/Logger.java b/app/src/main/java/com/ic/protocol/utils/Logger.java
index 93cb87ad..80541f9f 100644
--- a/app/src/main/java/com/ic/protocol/utils/Logger.java
+++ b/app/src/main/java/com/ic/protocol/utils/Logger.java
@@ -31,7 +31,22 @@ public class Logger {
       return null;
     }
   }
+  public static void i(String var0) {
+    if (DEBUG && var0 !=null) {
+      String var1 = getFunctionName();
+      if (var1 != null) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(var1);
+        sb.append(" - ");
+        sb.append(var0);
+        log("WatchService", sb.toString());
+        return;
+      }
+
+      log("WatchService", var0.toString());
+    }
 
+  }
   public static void i(Object var0) {
     if (DEBUG && var0 !=null) {
       String var1 = getFunctionName();
diff --git a/app/src/main/java/com/ic/protocol/utils/NettyConnection.java b/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
index 2da7b410..c2dea88c 100644
--- a/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
+++ b/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
@@ -42,16 +42,17 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
 
                         switch (type){
                             case BP00:
-//              API.handleBP00(cmd);
+                                API.handleBP00(cmd);
                                 handle_cmd("Init",cmd);
                                 break;
                             case BP01:
-//              API.handleBP01(cmd);
+                                API.handleBP01(cmd);
                                 handle_cmd("定位AP01",cmd);
                                 break;
                             case BP03:
-//              API.handleBP03(cmd);
+                                API.handleBP03(cmd);
                                 handle_cmd("heart",cmd);
+                                handle_cmd("Link:OK",cmd);
                                 break;
                             case BP28:
 //              API.handleBP28(cmd);
@@ -63,14 +64,18 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
                                 break;
                             case BP85://设置闹钟
                                 API.handleBP85(cmd,NettyConnection.this,null);
+                                handle_cmd("BP85",cmd);
                                 break;
                             case BP33:
                                 //设置工作模式
                                 API.handleBP33(NettyConnection.this,null,cmd);
+                                handle_cmd("BP33",cmd);
+
                                 break;
                             case BP16:
                                 //立即定位指令（长链接有效）
                                 API.handleBP16(NettyConnection.this,null,cmd);
+                                handle_cmd("BP16",cmd);
                                 break;
                         }
 
diff --git a/icsupport.iml b/icsupport.iml
index ea17b0bf..9c9054b6 100644
--- a/icsupport.iml
+++ b/icsupport.iml
@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
diff --git a/local.properties b/local.properties
index ea93aabf..44f6d2d3 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Jan 07 00:10:16 CST 2020
-sdk.dir=C\:\\Users\\Admin\\AppData\\Local\\Android\\Sdk
+#Tue Jan 07 16:17:26 CST 2020
+sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk
diff --git a/okio/okio.iml b/okio/okio.iml
index 04ea65ed..be526801 100644
--- a/okio/okio.iml
+++ b/okio/okio.iml
@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />