From: snickersun <snickersun@qq.com>
Date: Thu, 9 Jan 2020 03:01:42 +0000 (+0800)
Subject: ff
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=0d38168765764e8849e4a2dd9435e74238e48b7a;p=icsupport.git

ff
---

diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
index 7bc8b2a5..cbf75be0 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 7ca20c6d..06770aac 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 b8111880..b3b20a9c 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 7999ded3..31040f21 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 900b78c9..4e069773 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 aeb84e4c..e9caf051 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 3629dfcb..539ba533 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 29689075..228a51ef 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 f57e5826..e1036d60 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 1f99b15a..ef7cb6a1 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 4cfea5a4..66c73d91 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6fd9e2bb..6f32454d 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="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" 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 543f1833..6752a982 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,7 +9,6 @@
     </shared>
   </component>
   <component name="AndroidLogFilters">
-    <option name="TOOL_WINDOW_CUSTOM_FILTER" value="A" />
     <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
   </component>
   <component name="ChangeListManager">
@@ -18,19 +17,21 @@
       <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/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/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" 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/src/main/java/com/ic/protocol/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/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/Initialize.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.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/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/Config.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/Config.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/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/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/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/NettyConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RxSocket.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RxSocket.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -41,7 +42,7 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="2.7_QVGA_API_19" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="867155030002145" />
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
       <ProjectState />
@@ -60,47 +61,40 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <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/adapter/LBSHelper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="412">
-              <caret line="67" column="21" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
-              <folding>
-                <element signature="e#1972#2091#0" expanded="true" />
-                <element signature="e#2090#2091#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="-4630">
+              <caret line="79" column="21" selection-start-line="79" selection-start-column="21" selection-end-line="79" selection-end-column="21" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.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="283">
-              <caret line="250" column="43" selection-start-line="250" selection-start-column="26" selection-end-line="250" selection-end-column="43" />
+            <state relative-caret-position="355">
+              <caret line="71" selection-start-line="71" selection-end-line="71" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
-          <provider selected="true" editor-type-id="android-designer2" />
-          <provider editor-type-id="text-editor" />
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <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="496">
-              <caret line="47" selection-start-line="47" selection-end-line="47" />
+            <state relative-caret-position="209">
+              <caret line="38" column="23" selection-start-line="38" selection-start-column="23" selection-end-line="38" selection-end-column="23" />
+              <folding>
+                <element signature="imports" 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/service/protocolMainServer.java">
+      <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="74">
-              <caret line="191" column="16" selection-start-line="191" selection-start-column="16" selection-end-line="191" selection-end-column="16" />
+            <state relative-caret-position="-1861">
+              <caret line="85" column="35" selection-start-line="85" selection-start-column="16" selection-end-line="85" selection-end-column="35" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -108,47 +102,69 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/os/Handler.class">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="188">
-              <caret line="107" column="2" lean-forward="true" selection-start-line="107" selection-start-column="2" selection-end-line="107" selection-end-column="2" />
+            <state relative-caret-position="197">
+              <caret line="101" selection-start-line="101" selection-end-line="101" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.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="131">
-              <caret line="94" column="34" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="34" />
+            <state relative-caret-position="-18">
+              <caret line="648" column="5" lean-forward="true" selection-start-line="648" selection-start-column="5" selection-end-line="648" selection-end-column="5" />
+              <folding>
+                <element signature="imports" 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/service/Initialize.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="150">
-              <caret line="59" column="20" lean-forward="true" selection-start-line="59" selection-start-column="20" selection-end-line="59" selection-end-column="20" />
+            <state relative-caret-position="2518">
+              <caret line="358" column="54" lean-forward="true" selection-start-line="358" selection-start-column="54" selection-end-line="358" selection-end-column="54" />
+              <folding>
+                <element signature="e#18169#18170#0" expanded="true" />
+                <element signature="e#18202#18203#0" expanded="true" />
+                <element signature="e#18260#18261#0" expanded="true" />
+                <element signature="e#18293#18294#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/service/base/AbstractConnectionService.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="94">
-              <caret line="26" column="24" lean-forward="true" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
+            <state relative-caret-position="432">
+              <caret line="77" column="75" selection-start-line="77" selection-start-column="59" selection-end-line="77" selection-end-column="75" />
             </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/MySqlitOpenHelper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="436">
-              <caret line="108" column="3" selection-start-line="108" selection-start-column="3" selection-end-line="108" selection-end-column="3" />
+            <state relative-caret-position="95">
+              <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+            </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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="152">
+              <caret line="326" column="19" selection-start-line="326" selection-start-column="9" selection-end-line="326" selection-end-column="19" />
+              <folding>
+                <element signature="e#8809#8810#0" expanded="true" />
+                <element signature="e#8830#8831#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -164,36 +180,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>runt</find>
-      <find>AP01</find>
-      <find>setIMEI</find>
-      <find>867155030002145</find>
-      <find>runtime</find>
-      <find>setoption</find>
-      <find>Socket</find>
-      <find>socketChannel</find>
-      <find>setCdma</find>
-      <find>lbs</find>
-      <find>receive</find>
-      <find>startLocationProcess</find>
-      <find>CellInfo</find>
-      <find>mCellinfo</find>
-      <find>Cellinfoutil</find>
-      <find>waitAndSendLocation</find>
-      <find>getCdm</find>
-      <find>close</find>
-      <find>disconnect</find>
-      <find>socketStatus</find>
-      <find>preCellInfo</find>
-      <find>battery</find>
       <find>CurrentCellInfo</find>
       <find>RxSocket</find>
       <find>\\r</find>
       <find>keep</find>
       <find>onopen</find>
       <find>initial</find>
-      <find>onClose</find>
       <find>delive</find>
+      <find>FileOutputUtil</find>
+      <find>getExternalCacheDir</find>
+      <find>mCallStateIsIdle</find>
+      <find>BATTERY</find>
+      <find>onCreate</find>
+      <find>onClose</find>
+      <find>HEART_ALARM alarmCycle</find>
+      <find>onDes</find>
+      <find>setHeartAlarm</find>
+      <find>onStartCommand</find>
+      <find>睡眠</find>
+      <find>sleepAlarm</find>
+      <find>SharPreferenceUtil</find>
+      <find>triggerSendThread</find>
+      <find>workmo</find>
+      <find>Timer</find>
+      <find>AP85</find>
+      <find>timeout</find>
+      <find>trig</find>
+      <find>trigger</find>
+      <find>ResartHeartAlarm</find>
+      <find>sw</find>
+      <find>mythread</find>
     </findStrings>
     <replaceStrings>
       <replace>stop</replace>
@@ -225,31 +241,32 @@
         <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/Logger.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/AndroidManifest.xml" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ContextProxy.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/UpLoadDataPoints.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Util.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/utils/CellInfoUtil.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/LocationClient.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/RxSocket.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/bean/Runtime.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java" />
         <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
-        <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/service/KeepAlive.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/utils/BatteryUtil.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/Config.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/adapter/protocolAPIHelper.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/LocationClient.java" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="670" />
     <option name="y" value="38" />
     <option name="width" value="964" />
@@ -260,9 +277,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="ProjectPane" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView">
         <subPane>
           <expand>
@@ -309,17 +325,6 @@
               <item name="protocol" type="cbb59c9e:AndroidPsiDirectoryNode" />
               <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="res" type="d4f16f75:AndroidResFolderNode" />
-            </path>
-            <path>
-              <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="res" type="d4f16f75:AndroidResFolderNode" />
-              <item name="layout" type="ddeffd01:AndroidResFolderTypeNode" />
-            </path>
             <path>
               <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
               <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
@@ -328,6 +333,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -448,10 +454,11 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1858" height="1096" extended-state="6" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info id="Captures" order="0" sideWeight="0.21962617" side_tool="true" visible="true" weight="0.26028922" />
-      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.7803738" visible="true" weight="0.26028922" />
+      <window_info id="Captures" order="0" sideWeight="0.22176592" side_tool="true" visible="true" weight="0.26012793" />
+      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.77823406" visible="true" weight="0.26012793" />
       <window_info id="Structure" order="2" sideWeight="0.21818182" side_tool="true" weight="0.26028922" />
       <window_info id="Favorites" order="3" sideWeight="0.21818182" side_tool="true" weight="0.26028922" />
       <window_info id="Build Variants" order="4" sideWeight="0.21818182" side_tool="true" weight="0.26028922" />
@@ -460,14 +467,14 @@
       <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" weight="0.32952183" />
-      <window_info active="true" anchor="bottom" auto_hide="true" x="96" y="344" width="1798" height="456" id="Logcat" order="1" sideWeight="0.63570637" visible="true" weight="0.33264032" />
-      <window_info anchor="bottom" id="TODO" order="2" weight="0.32952183" />
-      <window_info anchor="bottom" id="Find" order="3" sideWeight="0.48164627" weight="0.47193348" />
-      <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49499443" weight="0.32848233" />
+      <window_info anchor="bottom" auto_hide="true" x="96" y="344" width="1798" height="456" id="Logcat" order="1" sideWeight="0.63570637" weight="0.52603036" />
+      <window_info anchor="bottom" id="TODO" order="2" weight="0.3286334" />
+      <window_info active="true" anchor="bottom" id="Find" order="3" sideWeight="0.48164627" visible="true" weight="0.47180045" />
+      <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49499443" weight="0.3275488" />
       <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.21101871" />
-      <window_info anchor="bottom" id="Debug" order="8" sideWeight="0.4938821" weight="0.32848233" />
+      <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49276975" weight="0.21041214" />
+      <window_info anchor="bottom" id="Debug" order="8" sideWeight="0.4938821" weight="0.3275488" />
       <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" />
@@ -594,74 +601,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <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="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="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/os/PowerManager.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="233">
-          <caret line="96" column="23" selection-start-line="96" selection-start-column="23" selection-end-line="96" selection-end-column="23" />
-          <folding>
-            <element signature="e#2767#2768#0" expanded="true" />
-            <element signature="e#2826#2827#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/PendingIntent.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
-        </state>
-      </provider>
-    </entry>
-    <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="1767">
-          <caret line="104" column="35" lean-forward="true" selection-start-line="104" selection-start-column="35" selection-end-line="104" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/Constants.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="196">
-          <caret line="89" column="75" selection-start-line="89" selection-start-column="75" selection-end-line="89" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/Service.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <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="224">
-          <caret line="134" column="73" selection-start-line="134" selection-start-column="73" selection-end-line="134" selection-end-column="73" />
-        </state>
-      </provider>
-    </entry>
-    <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="13" column="38" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build.gradle">
-      <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>
-      </provider>
-    </entry>
     <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/Context.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="159">
@@ -715,13 +654,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/Config.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="149" column="20" selection-start-line="149" selection-start-column="20" selection-end-line="149" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/SharPreferenceUtil.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="76">
@@ -757,34 +689,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Util.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="54" column="47" selection-start-line="54" selection-start-column="47" selection-end-line="54" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
-    <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="197">
-          <caret line="77" selection-start-line="77" selection-end-line="77" />
-          <folding>
-            <element signature="e#1252#1253#0" expanded="true" />
-            <element signature="e#1291#1292#0" expanded="true" />
-            <element signature="e#1733#1734#0" expanded="true" />
-            <element signature="e#3018#3019#0" expanded="true" />
-            <element signature="e#3044#3045#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="81" column="16" lean-forward="true" selection-start-line="81" selection-start-column="16" selection-end-line="81" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/71856ddd748344c89a323fa69958dc46/TestModules-v1.0.16/jars/classes.jar!/chestnut/utils/PhoneUtils.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="178">
@@ -820,184 +724,277 @@
         </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/RxSocket.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-402">
-          <caret line="72" column="70" lean-forward="true" selection-start-line="72" selection-start-column="70" selection-end-line="72" selection-end-column="70" />
+        <state relative-caret-position="564">
+          <caret line="380" column="8" selection-start-line="380" selection-start-column="8" selection-end-line="380" selection-end-column="8" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.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="151">
-          <caret line="234" column="68" selection-start-line="234" selection-start-column="68" selection-end-line="234" selection-end-column="68" />
+        <state relative-caret-position="323">
+          <caret line="32" column="16" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/BatteryUtil.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="151">
-          <caret line="26" column="26" selection-start-line="26" selection-start-column="26" selection-end-line="26" selection-end-column="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="436">
+          <caret line="108" column="3" selection-start-line="108" selection-start-column="3" selection-end-line="108" selection-end-column="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RxSocket.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
+      <provider editor-type-id="text-editor" />
+      <provider selected="true" editor-type-id="android-designer2" />
+    </entry>
+    <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="564">
-          <caret line="380" column="8" selection-start-line="380" selection-start-column="8" selection-end-line="380" selection-end-column="8" />
+        <state relative-caret-position="412">
+          <caret line="67" column="21" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#1972#2091#0" expanded="true" />
+            <element signature="e#2090#2091#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/ConnectionService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="891">
-          <caret line="265" column="27" selection-start-line="265" selection-start-column="27" selection-end-line="265" selection-end-column="27" />
+        <state relative-caret-position="95">
+          <caret line="7" column="10" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
         </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/service/Initialize.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="58" column="45" selection-start-line="58" selection-start-column="45" selection-end-line="58" selection-end-column="45" />
-          <folding>
-            <element signature="e#9387#9388#0" expanded="true" />
-            <element signature="e#9408#9409#0" expanded="true" />
-            <element signature="e#9441#9442#0" expanded="true" />
-            <element signature="e#9462#9463#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="150">
+          <caret line="59" column="20" lean-forward="true" selection-start-line="59" selection-start-column="20" selection-end-line="59" selection-end-column="20" />
         </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/service/CheckSIM.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="94" column="34" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <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="4750">
+          <caret line="273" column="7" selection-start-line="273" selection-start-column="7" selection-end-line="273" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="513">
+          <caret line="32" column="54" selection-start-line="32" selection-start-column="54" selection-end-line="32" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <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="10564">
+          <caret line="590" column="48" selection-start-line="590" selection-start-column="48" selection-end-line="590" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ICContentProvider.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-95">
+          <caret line="29" column="45" lean-forward="true" selection-start-line="29" selection-start-column="45" selection-end-line="29" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ICApplication.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <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/Util.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="80">
+          <caret line="54" column="47" selection-start-line="54" selection-start-column="47" selection-end-line="54" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <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="-437">
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <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="-182">
+          <caret line="27" column="29" lean-forward="true" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/Constants.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1691">
+          <caret line="89" column="75" selection-start-line="89" selection-start-column="75" selection-end-line="89" selection-end-column="75" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/FileOutputUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-541">
+          <caret line="25" column="47" lean-forward="true" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <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="397">
-          <caret line="105" column="14" selection-start-line="105" selection-start-column="14" selection-end-line="105" selection-end-column="14" />
+        <state relative-caret-position="130">
+          <caret line="13" column="61" lean-forward="true" selection-start-line="13" selection-start-column="61" selection-end-line="13" selection-end-column="61" />
           <folding>
-            <element signature="e#3633#3634#0" expanded="true" />
-            <element signature="e#3668#3669#0" expanded="true" />
-            <element signature="e#5331#5332#0" expanded="true" />
-            <element signature="e#5360#5361#0" expanded="true" />
-            <element signature="e#5411#5412#0" expanded="true" />
-            <element signature="e#5449#5450#0" expanded="true" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#331#4161#0" expanded="true" />
+            <element signature="e#4160#4161#0" expanded="true" />
           </folding>
         </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/bean/Runtime.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="321">
-          <caret line="326" column="28" selection-start-line="326" selection-start-column="28" selection-end-line="326" selection-end-column="28" />
+        <state relative-caret-position="152">
+          <caret line="326" column="19" selection-start-line="326" selection-start-column="9" selection-end-line="326" selection-end-column="19" />
           <folding>
-            <element signature="e#8222#8223#0" expanded="true" />
-            <element signature="e#8284#8285#0" expanded="true" />
-            <element signature="e#8802#8803#0" expanded="true" />
-            <element signature="e#8845#8846#0" expanded="true" />
+            <element signature="e#8809#8810#0" expanded="true" />
+            <element signature="e#8830#8831#0" expanded="true" />
           </folding>
         </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!/java/lang/Enum.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="663">
-          <caret line="146" column="21" selection-start-line="146" selection-start-column="21" selection-end-line="146" selection-end-column="21" />
+        <state relative-caret-position="152">
+          <caret line="30" column="21" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="21" />
           <folding>
-            <element signature="e#201#202#0" expanded="true" />
-            <element signature="e#252#253#0" expanded="true" />
+            <element signature="e#727#728#0" expanded="true" />
+            <element signature="e#778#779#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/Service.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="496">
-          <caret line="47" selection-start-line="47" selection-end-line="47" />
+        <state relative-caret-position="152">
+          <caret line="46" column="15" selection-start-line="46" selection-start-column="15" selection-end-line="46" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/util/Timer.class">
+    <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="323">
-          <caret line="32" column="16" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" />
+        <state relative-caret-position="152">
+          <caret line="10" column="20" selection-start-line="10" selection-start-column="20" selection-end-line="10" selection-end-column="20" />
         </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/Config.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="108" column="3" selection-start-line="108" selection-start-column="3" selection-end-line="108" selection-end-column="3" />
+        <state relative-caret-position="152">
+          <caret line="149" column="37" selection-start-line="149" selection-start-column="37" selection-end-line="149" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
-      <provider selected="true" editor-type-id="android-designer2" />
-      <provider editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MySqlitOpenHelper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="95">
+          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/os/Handler.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="412">
-          <caret line="67" column="21" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
+        <state relative-caret-position="197">
+          <caret line="101" selection-start-line="101" selection-end-line="101" />
+        </state>
+      </provider>
+    </entry>
+    <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="191">
+          <caret line="27" column="24" lean-forward="true" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
           <folding>
-            <element signature="e#1972#2091#0" expanded="true" />
-            <element signature="e#2090#2091#0" expanded="true" />
+            <element signature="e#2239#2240#0" expanded="true" />
+            <element signature="e#2271#2272#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/ConnectionService.java">
+    <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="95">
-          <caret line="7" column="10" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
+        <state relative-caret-position="-4630">
+          <caret line="79" column="21" selection-start-line="79" selection-start-column="21" selection-end-line="79" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.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="94">
-          <caret line="26" column="24" lean-forward="true" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
+        <state relative-caret-position="2518">
+          <caret line="358" column="54" lean-forward="true" selection-start-line="358" selection-start-column="54" selection-end-line="358" selection-end-column="54" />
+          <folding>
+            <element signature="e#18169#18170#0" expanded="true" />
+            <element signature="e#18202#18203#0" expanded="true" />
+            <element signature="e#18260#18261#0" expanded="true" />
+            <element signature="e#18293#18294#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.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="283">
-          <caret line="250" column="43" selection-start-line="250" selection-start-column="26" selection-end-line="250" selection-end-column="43" />
+        <state relative-caret-position="355">
+          <caret line="71" selection-start-line="71" selection-end-line="71" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.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="150">
-          <caret line="59" column="20" lean-forward="true" selection-start-line="59" selection-start-column="20" selection-end-line="59" selection-end-column="20" />
+        <state relative-caret-position="432">
+          <caret line="77" column="75" selection-start-line="77" selection-start-column="59" selection-end-line="77" selection-end-column="75" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.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="131">
-          <caret line="94" column="34" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="34" />
+        <state relative-caret-position="-18">
+          <caret line="648" column="5" lean-forward="true" selection-start-line="648" selection-start-column="5" selection-end-line="648" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java">
+    <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="74">
-          <caret line="191" column="16" selection-start-line="191" selection-start-column="16" selection-end-line="191" selection-end-column="16" />
+        <state relative-caret-position="209">
+          <caret line="38" column="23" selection-start-line="38" selection-start-column="23" selection-end-line="38" selection-end-column="23" />
           <folding>
             <element signature="imports" 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/LocationClient.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="107" column="2" lean-forward="true" selection-start-line="107" selection-start-column="2" selection-end-line="107" selection-end-column="2" />
+        <state relative-caret-position="-1861">
+          <caret line="85" column="35" selection-start-line="85" selection-start-column="16" selection-end-line="85" selection-end-column="35" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/app/app.iml b/app/app.iml
index f9ea079a..95ac0dd5 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.\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: __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: 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/src/main/java/com/ic/protocol/Config.java b/app/src/main/java/com/ic/protocol/Config.java
index d9263743..5c534a69 100644
--- a/app/src/main/java/com/ic/protocol/Config.java
+++ b/app/src/main/java/com/ic/protocol/Config.java
@@ -147,7 +147,7 @@ public class Config {
   
   private static final int url_download = 1;
   
-  public static int value_setting = 0;
+  public static int value_setting = 1;
   
   private static final int video_jf = 1;
   
diff --git a/app/src/main/java/com/ic/protocol/LocationClient.java b/app/src/main/java/com/ic/protocol/LocationClient.java
index 974d1b80..3f7c44a7 100644
--- a/app/src/main/java/com/ic/protocol/LocationClient.java
+++ b/app/src/main/java/com/ic/protocol/LocationClient.java
@@ -110,8 +110,8 @@ public class LocationClient {
   Condition mCondition = this.mLock.newCondition();
   
   private LBSHelper mLbsHelper;
-  
 
+  private Timer mTimer=null;
   
   private int mPedometer2;
   
@@ -255,7 +255,7 @@ public class LocationClient {
       runtime.getLocationInstance().setLAC(CellInfoUtil.getLAC());
       runtime.preCellInfo = CellInfoUtil.getCellInfo();
       sendBatteryNotification();
-      startGpsLocate();
+//      startLocationProcess();
     }
   }
   
@@ -505,7 +505,10 @@ public class LocationClient {
 //    runtime1.setLocation(stringBuilder2.toString());
 //    resolveResult(0, paramInt1, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, paramDouble4, paramDouble5, paramInt5, this.mPedometer2, paramInt6);
   }
-  
+
+
+  private static int checktimes=0;
+  private static boolean timeout=false;
 //  public void EqcAlgorithmInterfaceMethod2() {
     public void startGpsLocate() {
 
@@ -514,12 +517,12 @@ public class LocationClient {
     Single.just(null).observeOn(AndroidSchedulers.mainThread()).subscribe(new Action1<Object>() {
           public void call(Object param1Object) { LocationClient.this.nmeaListener.startListen(); }
         });
-    Logger.i("开启GPS开启wifi扫描");
-    runtime.currentWifiInfo = "";
-    mHasWifiResult = false;
-    this.mLbsHelper.registerBroadReceiver();
-    this.mLbsHelper.getWifiInfo();
-    this.mLbsHelper.setOnWiFiInfoListener(new LBSHelper.OnWiFiInfoListener() {
+      Logger.i("开启GPS开启wifi扫描");
+      runtime.currentWifiInfo = "";
+      mHasWifiResult = false;
+      this.mLbsHelper.registerBroadReceiver();
+      this.mLbsHelper.getWifiInfo();
+      this.mLbsHelper.setOnWiFiInfoListener(new LBSHelper.OnWiFiInfoListener() {
           public void getWifiInfoCallBack(String param1String) {
 //            LocationClient.access$002(true);
             Logger.i("get wifi scan Callback " + param1String);
@@ -533,16 +536,19 @@ public class LocationClient {
         public void call(Object param1Object) { LocationClient.this.waitAndSendLocation(); }
       });
 
-      class MyTimerTask extends TimerTask {
-        public void run() {
-          //发送读取计步消息
-          LocationClient.this.mhandler.sendEmptyMessage(100);
-        }
-      };
-      MyTimerTask  mMyTimerTask = new MyTimerTask();
+      checktimes=0;
+      timeout=false;
       //延时2秒执行发送“读取定位”消息
-      new Timer().schedule(mMyTimerTask, 10000L);
+      if (mTimer==null) mTimer=new Timer();
+      mTimer.schedule(new MyTimerTask(), 0,1000L);
+
   }
+  class MyTimerTask extends TimerTask {
+    public void run() {
+      //发送读取计步消息
+      LocationClient.this.mhandler.sendEmptyMessage(100);
+    }
+  };
   Handler mhandler=new Handler(){
 
         public void handleMessage(Message msg) {
@@ -553,22 +559,43 @@ public class LocationClient {
         }
 
   };
+  boolean wifi_ok=false,gps_ok=false,lbs_ok=false,gps_nosignal=false;
+
   public void waitAndSendLocation(){
 
-         boolean wifi_ok=false,gps_ok=false,lbs_ok=false;
-        if (runtime.currentWifiInfo.length()>0  )wifi_ok =true;
+         checktimes++;
+         if (checktimes> 20) timeout=true;
+        wifi_ok=false;
+        gps_ok=false;
+        lbs_ok=false;
+        gps_nosignal=false;
+        if (runtime.currentWifiInfo.length()>0  ) wifi_ok =true;
         if (runtime.getLocationInstance().getLocationStat() == ICLocation.LOCATION_STAT.LOCATION_FIXED) gps_ok=true;
-        lbs_ok=(  runtime.getLocationInstance().isDataChanged()==false
+        if (runtime.getLocationInstance().getLocationStat() == ICLocation.LOCATION_STAT.LOCATION_GPS_TIEMOUT) gps_nosignal=true;
+      lbs_ok=(  runtime.getLocationInstance().isDataChanged()==false
             ||(runtime.getLocationInstance().getMNC().equals("0")
             && runtime.getLocationInstance().getMCC().equals("0")
             && runtime.getLocationInstance().getGSMStationCID() ==0
             &&  runtime.getLocationInstance().getLAC()==0)) ?false:true;
         Logger.i("getMNC "+runtime.getLocationInstance().getMNC()+" getMCC "+runtime.getLocationInstance().getMCC()+" getGSMStationCID " + runtime.getLocationInstance().getGSMStationCID()+ " getLAC "+runtime.getLocationInstance().getLAC()+" changed "+runtime.getLocationInstance().isDataChanged());
         Logger.i("lbs_ok "+lbs_ok+" waitAndSendLocation wifi_ok " + wifi_ok+ " gps_ok "+gps_ok);
-    if (lbs_ok ) {
-      Logger.i("offerQueue  "+protocolAPIHelper.AP01(runtime));
-      ServiceUtil.offerQueue(protocolAPIHelper.genStringMessage("AP01", protocolAPIHelper.AP01(runtime)));
-    }
+        if ((lbs_ok && timeout==true) ||(lbs_ok && gps_ok && wifi_ok )||(lbs_ok&&gps_nosignal&&wifi_ok)){
+
+          Logger.i("offerQueue  "+protocolAPIHelper.AP01(runtime));
+          ServiceUtil.offerQueue(protocolAPIHelper.genStringMessage("AP01", protocolAPIHelper.AP01(runtime)));
+          triggerSendThread();
+          if (mTimer!=null){
+            mTimer.cancel();
+            mTimer=null;
+          }
+        }else if (timeout==true){
+          Logger.i("timeout no location  ");
+
+          if (mTimer!=null){
+            mTimer.cancel();
+            mTimer=null;
+          }
+        }
   }
 
 //  public void EqcAlgorithmInterfaceMethod3() {
@@ -656,23 +683,32 @@ public void updateCellInfo() {
 
     //响应定位指令
     if ("StartLocate".equals(paramStringMessage.cmd())  ){
-      this.startLocationProcess();
+//      triggerSendThread();
+//      this.startLocationProcess();
     }
-    if (linkOK)
-      return;
+    if ("ResartHeartAlarm".equals(paramStringMessage.cmd())  ){
+//      triggerSendThread();
+//      this.startLocationProcess();
+//      protocolMainServer.getInstance().setHeartAlarm();
+    }
+
+//    if (linkOK)
+//      return;
     if (paramStringMessage.cmd().startsWith("AP") || paramStringMessage.cmd().startsWith("BP")) {
       //如果Link:OK 则触发（激活）等待信号的发送线程
-      this.mLock.lock();
-      try {
-        linkOK = true;
-        this.mCondition.signal();
-        return;
-      } finally {
-        this.mLock.unlock();
-      } 
+      triggerSendThread();
     } 
   }
-  
+  public void triggerSendThread(){
+//    this.mLock.lock();
+//    try {
+//      linkOK = true;
+////      this.mCondition.signal();
+//      return;
+//    } finally {
+//      this.mLock.unlock();
+//    }
+  }
   public void resolveResult(int paramInt1, int paramInt2, int paramInt3, double paramDouble1, double paramDouble2, double paramDouble3, float paramFloat1, float paramFloat2, int paramInt4, float paramFloat3, long paramLong1, long paramLong2, double paramDouble4, double paramDouble5, int paramInt5, long paramLong3, int paramInt6) {
     int i = SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LACATION_CYCLE, 3);
     String str1 = runtime.getLatitude();
@@ -730,7 +766,7 @@ public void updateCellInfo() {
       performExecute(paramInt1, i, 11, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
     }
   }
-  
+
   public void start() {
     this.mSignalUtil = SimSignalUtil.getInstance((runtime.getContextProxy()).context);
     // 开启计步
@@ -741,17 +777,18 @@ public void updateCellInfo() {
 
     //获取LBS定位服务
     this.mLbsHelper = runtime.getLbsHelper();
-
     //初始化设定当前工作模式及循环频率
     if (SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, "value_setting_ver", 0) == Config.value_setting) {
-      runtime.getLocationInstance().setWorkingMod(SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LACATION_MODE, 2));
-      runtime.getLocationInstance().setLocation_cycle(SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LACATION_CYCLE, 3));
+      //如果value_setting_ver = Config.value_setting 表示采用已经保存的模式
+      runtime.getLocationInstance().setWorkingMod(SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LACATION_MODE, ICLocation.NORMAL_MOD));
+      runtime.getLocationInstance().setLocation_cycle(SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LACATION_CYCLE, 15));
     } else {
+      //否则设置一个默认值
       SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, "value_setting_ver", Config.value_setting);
-      SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, LACATION_MODE, 2);
-      SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, LACATION_CYCLE, 3);
-      runtime.getLocationInstance().setWorkingMod(2);
-      runtime.getLocationInstance().setLocation_cycle(3);
+      SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, LACATION_MODE, ICLocation.NORMAL_MOD);
+      SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, LACATION_CYCLE, 15);
+      runtime.getLocationInstance().setWorkingMod(ICLocation.NORMAL_MOD);
+      runtime.getLocationInstance().setLocation_cycle(15);
     }
     StringBuilder stringBuilder = new StringBuilder();
     stringBuilder.append("value_setting=");
@@ -785,15 +822,15 @@ public void updateCellInfo() {
   }
   
   static class MyThread2 extends Thread {
-    Condition condition;
-    
-    boolean isResent = false;
-    
-    ReentrantLock lock;
+//    Condition condition;
+//
+//    boolean isResent = false;
+//
+//    ReentrantLock lock;
     
     public MyThread2(Condition param1Condition, ReentrantLock param1ReentrantLock) {
-      this.condition = param1Condition;
-      this.lock = param1ReentrantLock;
+//      this.condition = param1Condition;
+//      this.lock = param1ReentrantLock;
     }
     
     public void run() {
@@ -806,7 +843,7 @@ public void updateCellInfo() {
         try {
           Logger.i("Sending Thread Queue Take ");
 
-          StringMessage stringMessage1 = (StringMessage)LocationClient.queue.takeFirst();
+          StringMessage stringMessage1 = (StringMessage)LocationClient.queue.take();
           try {
 
             if (runtime.getSignalStrength() + 110 < LocationClient.getMinSignalStrength(SimSignalUtil.getInstance((runtime.getContextProxy()).context).getNetworkType())) {
@@ -829,30 +866,30 @@ public void updateCellInfo() {
 
               connection.send(stringMessage);
 
-              this.lock.lock();
-              LocationClient.linkOK=false;
-              try {
+//              this.lock.lock();
+//              LocationClient.linkOK=false;
+//              try {
 //                if (KeepAlive.isConnected) {
 //                  //如果 服务器连接状态，等30秒
 //                  Logger.i("KeepAlive.isConnected "+KeepAlive.isConnected+" delay 30000ms");
 //                  this.condition.await(30000L, TimeUnit.MILLISECONDS);
 //                } else {
 //                  //如果服务器断开，等5秒 以便连接后尽快响应
-//                  Logger.i("KeepAlive.isConnected "+KeepAlive.isConnected+" delay 5000ms");
-//                  this.condition.await(5000L, TimeUnit.MILLISECONDS);
+                  Logger.i("KeepAlive.isConnected "+KeepAlive.isConnected+ "  , connection isconnected "+connection.isServerConnected()+" delay 1000ms");
+                  Thread.sleep(1000);
+//                  this.condition.await(1000L, TimeUnit.MILLISECONDS);
 //                }
-                if (linkOK) {
-                  if (stringMessage.all() != null && stringMessage.all()[0].equals("AP16")) {
-                    this.isResent = false;
-                    Logger.i( " AP16 need wait for wifi scan list");
-                    Deliver.releaseWakeLockForGetWifiList();
-                  }
-                  this.lock.unlock();
-                  continue;
-                }
-              } finally {
-                this.lock.unlock();
-              }
+//                if (linkOK) {
+//                  if (stringMessage.all() != null && stringMessage.all()[0].equals("AP16")) {
+//                    this.isResent = false;
+//                    Logger.i( " AP16 need wait for wifi scan list");
+//                    Deliver.releaseWakeLockForGetWifiList();
+//                  }
+
+//
+//              } finally {
+//                this.lock.unlock();
+//              }
             }
           } catch (Exception e) {
             e.printStackTrace();
diff --git a/app/src/main/java/com/ic/protocol/NMEAListener.java b/app/src/main/java/com/ic/protocol/NMEAListener.java
index e65f2d18..e391e93d 100644
--- a/app/src/main/java/com/ic/protocol/NMEAListener.java
+++ b/app/src/main/java/com/ic/protocol/NMEAListener.java
@@ -17,6 +17,7 @@ import android.widget.TextView;
 
 import com.ic.protocol.bean.ICLocation;
 import com.ic.protocol.bean.Runtime;
+import com.ic.protocol.utils.FileOutputUtil;
 import com.ic.protocol.utils.Logger;
 
 import java.text.DecimalFormat;
@@ -35,7 +36,7 @@ public class NMEAListener implements NmeaListener, LocationListener {
   private double longitude;
   private double latitude;
 
-  private int SearchTimeout = 120;
+  private int SearchTimeout = 400;
   private int noSignalCount=0;
   private int searchCout=0;
   GPS_CURRENT_STATUS gpsMode;
@@ -69,14 +70,6 @@ public class NMEAListener implements NmeaListener, LocationListener {
       switch (event){
         case  GpsStatus.GPS_EVENT_SATELLITE_STATUS:
 
-//            if (max3Satellite.size() > 0  && max3Satellite.get(0).getSnr()>=30) {
-            //GPS 5秒钟搜不到足够多的星，认为不能定位，取消搜星
-            if(noSignalCount > 5){
-                gpsMode=GPS_CURRENT_STATUS.GPS_NOTFIXED;
-                runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_GPS_FAILED);
-                stop();
-
-            }
 
 
           break;
@@ -181,22 +174,24 @@ public class NMEAListener implements NmeaListener, LocationListener {
         sb2.append(", ");
       }
       sb2.append(" ]");
-      if (numSatelliteList.size()< 3){
+      if (numSatelliteList.size()< 1){
         noSignalCount++;
       }
     }
 
     if (searchCout>SearchTimeout){
       sb2.append(" 搜索"+searchCout+"次，超过"+SearchTimeout+"限制退出GPS定位");
+      FileOutputUtil.fileOutput(this.runtime.getContextProxy().context,"GPS",sb2.toString());
       gpsMode=GPS_CURRENT_STATUS.GPS_TIMEOUT;
-      runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_GPS_FAILED);
+      runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_GPS_TIEMOUT);
 
       stop();
     }
     if (noSignalCount> 5){
       sb2.append(" 搜索"+searchCout+"次，超过"+noSignalCount+"次没有收到星，退出GPS定位");
+      FileOutputUtil.fileOutput(this.runtime.getContextProxy().context,"GPS",sb2.toString());
       gpsMode=GPS_CURRENT_STATUS.GPS_NOSINGAL;
-      runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_GPS_FAILED);
+      runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_GPS_TIEMOUT);
 
       stop();
     }
@@ -210,13 +205,14 @@ public class NMEAListener implements NmeaListener, LocationListener {
   private void stop(){
 
     // 经纬度 保留6位小数点
-    DecimalFormat df = new DecimalFormat("#.000000");
-    String strLatitude = df.format(latitude);
-    String strLongitude = df.format(longitude);
-    runtime.setLatitude(strLatitude);
-    runtime.setLongitude(strLongitude);
-
-    Logger.i("Location " +runtime.getLocationInstance().getLocationStat().name());
+//    DecimalFormat df = new DecimalFormat("#.000000");
+//    String strLatitude = df.format(latitude);
+//    String strLongitude = df.format(longitude);
+//    runtime.setLatitude(strLatitude);
+//    runtime.setLongitude(strLongitude);
+//
+//    Logger.i("Location " +runtime.getLocationInstance().getLocationStat().name());
+    //发送停止消息
     NMEAListener.this.temHandler.sendMessage(new Message());
   }
 
@@ -274,6 +270,8 @@ public class NMEAListener implements NmeaListener, LocationListener {
 
 //        Logger.i("satelliteInfo:"+);
         Logger.i( sb.toString());
+
+        FileOutputUtil.fileOutput(this.runtime.getContextProxy().context,"GPS",sb.toString());
         runtime.getLocationInstance().setLocation(location.getLatitude(),location.getLongitude(),location.getSpeed(),0,status.getMaxSatellites());
 
       }
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 d698d043..ae3be19f 100644
--- a/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
@@ -2,14 +2,19 @@ package com.ic.protocol.adapter;
 
 import android.util.Log;
 
+import com.ic.protocol.Config;
+import com.ic.protocol.bean.ICLocation;
 import com.ic.protocol.bean.Runtime;
 import com.ic.protocol.bean.StringMessage;
 import com.ic.protocol.utils.Connection;
 import com.ic.protocol.utils.Logger;
 import com.ic.protocol.utils.ServiceUtil;
+import com.ic.protocol.utils.SharPreferenceUtil;
 
 import java.util.HashMap;
 
+import static com.ic.protocol.LocationClient.LACATION_CYCLE;
+import static com.ic.protocol.LocationClient.LACATION_MODE;
 import static java.lang.Math.abs;
 
 public class protocolAPIHelper {
@@ -272,6 +277,7 @@ public class protocolAPIHelper {
 //设置闹钟
     public void handleBP85(String cmd , Connection connection,Runtime runtime){
 //        IWBP85,867155030001063,155312,1,1,0235,12,1,1
+//        IWBP85,867155030002145,945166,1,0,
 //        IWBP85,353456789012345,080835,1,3, 0900,135,1,1@0900 ,135,1,2@0900 ,135,1,3#
 //353456789012345:IMEI号，设备唯一ID
 //080835 :指令流水号
@@ -320,6 +326,11 @@ public class protocolAPIHelper {
                                 .toString()
                         );
 
+                    }else if (cmdarglist.length == 5) {
+                        imei=cmdarglist[1];
+                        cmdindex=cmdarglist[2];
+                        all_alarmswitch=Integer.valueOf(cmdarglist[3]);
+                        alarmcount=Integer.valueOf(cmdarglist[4]);
                     }else{
                         log("data len is too small!");
                     }
@@ -342,9 +353,11 @@ public class protocolAPIHelper {
                 }
             }
         }
+//IWBP85,867155030002145,410385,1,0,#
 
-
-        String replycmd = cmd.replace(new StringBuilder("IWBP85,").append(imei).append(",").toString(),"");
+        String replacement=new StringBuilder("IWBP85,").append(imei).append(",").toString();
+        String replycmd = cmd.replace(replacement,"");
+        Logger.i("gen reply "+replacement+" "+replycmd);
         ServiceUtil.offerQueue(genStringMessage("AP85",AP85(runtime,replycmd)));
     }
 
@@ -374,7 +387,31 @@ public class protocolAPIHelper {
 
 
             log("work mode "+cmdlist[3]);
-            ServiceUtil.offerQueue(genStringMessage("AP33",AP33(cmdlist[2],Integer.valueOf(cmdlist[3]))));
+            int mod=Integer.valueOf(cmdlist[3]);
+            int Cycle=15;
+            switch(mod){
+                case ICLocation.NORMAL_MOD:
+                    Cycle=15;
+                    break;
+                case ICLocation.LOWPOWER_MOD:
+                    Cycle=60;
+                    break;
+                case ICLocation.EMERGNECY_MOD:
+                    Cycle=1;
+                    break;
+            }
+
+            String msg=AP33(cmdlist[2],mod);
+            //设定当前工作模式及循环频率
+            ServiceUtil.offerQueue(genStringMessage("AP33",msg));
+            log("reply msg "+msg);
+            SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, "value_setting_ver", Config.value_setting);
+            SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, LACATION_MODE, mod);
+            SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, LACATION_CYCLE, Cycle);
+            runtime.getLocationInstance().setWorkingMod(mod);
+            runtime.getLocationInstance().setLocation_cycle(Cycle);
+
+
         }
 
     }
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 a20004cf..ef9f8587 100644
--- a/app/src/main/java/com/ic/protocol/bean/ICLocation.java
+++ b/app/src/main/java/com/ic/protocol/bean/ICLocation.java
@@ -23,15 +23,16 @@ public class ICLocation {
         LOCATION_FIXED,
         LOCATION_SEARCHING,
         LOCATION_GPS_FAILED,
+        LOCATION_GPS_TIEMOUT,
         LOCATION_WIFI_FAILED,
         LOCATION_CLOSED,
     }
 
-    public enum WORKING_MOD{
-        NORMAL_MOD,     //location rate 1 time per 15 minutes
-        LOWPOWER_MOD,   // location rate 1 time per hour
-        EMERGNECY_MOD, //location rate 1 time per minutes
-    }
+
+    public static final int NORMAL_MOD=1;     //location rate 1 time per 15 minutes
+    public static final int LOWPOWER_MOD=2;   // location rate 1 time per hour
+    public static final int EMERGNECY_MOD=3; //location rate 1 time per minutes
+
 
     private int mworkingMod;
     private int location_cycle;
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 09af3bc1..921d3e09 100644
--- a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
+++ b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
@@ -23,6 +23,7 @@ import com.ic.protocol.LocationClient;
 import com.ic.protocol.adapter.LBSHelper;
 import com.ic.protocol.adapter.protocolAPIHelper;
 import com.ic.protocol.bean.Config;
+import com.ic.protocol.bean.ICLocation;
 import com.ic.protocol.bean.Runtime;
 import com.ic.protocol.bean.StringMessage;
 import com.ic.protocol.service.base.AbstractConnectionService;
@@ -63,6 +64,8 @@ import static com.ic.protocol.Constants.HEART_ALARM;
 import static com.ic.protocol.Constants.SLEEP_ALARM;
 import static com.ic.protocol.Constants.WAKE_ALARM;
 import static com.ic.protocol.Constants.WEATHER_ALARM;
+import static com.ic.protocol.bean.ICLocation.*;
+
 
 public class protocolMainServer extends Service {
 
@@ -265,7 +268,7 @@ public class protocolMainServer extends Service {
     private void getDBFile() {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append(getExternalCacheDir());
-        stringBuilder.append("contacts.db");
+        stringBuilder.append("/contacts.db");
         FileOutputUtil.copyFolder("/data/data/com.ic.protocol/databases", stringBuilder.toString());
     }
 
@@ -316,8 +319,8 @@ public class protocolMainServer extends Service {
 
         Logger.i(stringBuilder.toString());
 
-//        alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + (1 * 60 * 1000), pendingIntent);
-        alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP,l,  (1000* 60 * 1000), pendingIntent);
+        alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + (1 * 60 * 1000), pendingIntent);
+//        alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP,l,  (1000* 60 * 1000), pendingIntent);
 
     }
 
@@ -462,6 +465,7 @@ public class protocolMainServer extends Service {
                     Util.turnOffWifiForSleep((this.runtime.getContextProxy()).context, this.runtime);
                 }
                 setAlarm(alarmCycle);
+                FileOutputUtil.fileOutput(this, "alarmCycle", "ALARM alarmCycle");
 
                 //发送心跳间隔广播给其他应用
                 this.runtime.getContextProxy().sendBroadcast(ACTION_EQC_ALARM, this.runtime);
@@ -489,7 +493,7 @@ public class protocolMainServer extends Service {
                         is_in_sleep_mode = true;
                         if (this.mKeepAlive != null)
                             this.mKeepAlive.setSleepMode(true);
-                        this.connection.close();
+//                        this.connection.close();
                         return Service.START_STICKY;
                     }
                 } else {
@@ -502,13 +506,14 @@ public class protocolMainServer extends Service {
                             wakeUpFromSleep();
                         }
                         is_allowed_in_sleep_mode = 1;
-//                        setWakeAlarm();
+                        setWakeAlarm();
                         return Service.START_STICKY;
                     }
                     if (HEART_ALARM.equals(paramIntent.getAction())) {
                         if (this.mKeepAlive != null) {
                             this.mKeepAlive.onHeartAlarm(this.connection, this.runtime);
-                            this.setHeartAlarm();
+                            setHeartAlarm();
+                            FileOutputUtil.fileOutput(this, "alarmCycle", "HEART_ALARM alarmCycle");
                             return Service.START_STICKY;
                         }
                     } else {
@@ -538,35 +543,35 @@ public class protocolMainServer extends Service {
                             return Service.START_STICKY;
                         }
 
-                        if (Constants.ACTION_PASS_DATA_TO_CM_SERVICES.equals(paramIntent.getAction())) {
-                            deliverDataToCmApp(paramIntent.getIntExtra("cmdId", 0), paramIntent.getStringExtra("cmdJsonData"));
-                            return Service.START_STICKY;
-                        }
-                        if ("com.enqualcomm.support.MONITOR_EXIT".equals(paramIntent.getAction())) {
-                            deliverDataToCmApp(203, null);
-                            return Service.START_STICKY;
-                        }
-                        if ("cmcm.call.eiot.into.powersave".equals(paramIntent.getAction())) {
-                            if (cmcm_call_eiot_into_powersave_mode() == 1) {
-                                Logger.i("3 into powersave return");
-                                return Service.START_STICKY;
-                            }
-                            if (cmcm_call_eiot_into_powersave_mode() == 2) {
-                                Logger.i("1 out powersave");
-                                wakeUpFromSleep();
-                                return Service.START_STICKY;
-                            }
-                        } else {
-                            if (cmcm_call_eiot_into_powersave_mode() == 1) {
-                                Logger.i("4 into powersave return");
-                                return Service.START_STICKY;
-                            }
-                            if (cmcm_call_eiot_into_powersave_mode() == 2) {
-                                Logger.i("2 out powersave");
-                                wakeUpFromSleep();
-                            }
-                            this.invokeHandlerServiceChain.processUserRequest(paramIntent, this.connection, this.runtime);
-                        }
+//                        if (Constants.ACTION_PASS_DATA_TO_CM_SERVICES.equals(paramIntent.getAction())) {
+//                            deliverDataToCmApp(paramIntent.getIntExtra("cmdId", 0), paramIntent.getStringExtra("cmdJsonData"));
+//                            return Service.START_STICKY;
+//                        }
+//                        if ("com.enqualcomm.support.MONITOR_EXIT".equals(paramIntent.getAction())) {
+//                            deliverDataToCmApp(203, null);
+//                            return Service.START_STICKY;
+//                        }
+//                        if ("cmcm.call.eiot.into.powersave".equals(paramIntent.getAction())) {
+//                            if (cmcm_call_eiot_into_powersave_mode() == 1) {
+//                                Logger.i("3 into powersave return");
+//                                return Service.START_STICKY;
+//                            }
+//                            if (cmcm_call_eiot_into_powersave_mode() == 2) {
+//                                Logger.i("1 out powersave");
+//                                wakeUpFromSleep();
+//                                return Service.START_STICKY;
+//                            }
+//                        } else {
+//                            if (cmcm_call_eiot_into_powersave_mode() == 1) {
+//                                Logger.i("4 into powersave return");
+//                                return Service.START_STICKY;
+//                            }
+//                            if (cmcm_call_eiot_into_powersave_mode() == 2) {
+//                                Logger.i("2 out powersave");
+//                                wakeUpFromSleep();
+//                            }
+//                            this.invokeHandlerServiceChain.processUserRequest(paramIntent, this.connection, this.runtime);
+//                        }
                     }
                 }
             }
@@ -590,7 +595,19 @@ public class protocolMainServer extends Service {
     }
 
     public void setHeartAlarm() {
-       AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,1, HEART_ALARM);
+        switch(runtime.getLocationInstance().getWorkingMod()){
+            case EMERGNECY_MOD:
+                AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,1, HEART_ALARM);
+                break;
+            case NORMAL_MOD:
+                AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,15, HEART_ALARM);
+                break;
+            case LOWPOWER_MOD:
+                AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,60, HEART_ALARM);
+                break;
+        }
+
+
     }
 
     public void setUpLocationDataAlarm(long paramLong) {
@@ -663,22 +680,22 @@ public class protocolMainServer extends Service {
 
         log("开始监听网络协议状态");
 
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(Intent.ACTION_BATTERY_LOW);       // 低电量提示
-        intentFilter.addAction(Intent.ACTION_BATTERY_CHANGED);   // 低电量变化
-        intentFilter.addAction(Intent.ACTION_MANAGE_NETWORK_USAGE);
-        try {
-            registerReceiver(mIntentReceiver, intentFilter);
-        } catch (Exception ignored) {
-        }
+//        IntentFilter intentFilter = new IntentFilter();
+//        intentFilter.addAction(Intent.ACTION_BATTERY_LOW);       // 低电量提示
+//        intentFilter.addAction(Intent.ACTION_BATTERY_CHANGED);   // 低电量变化
+//        intentFilter.addAction(Intent.ACTION_MANAGE_NETWORK_USAGE);
+//        try {
+////            registerReceiver(mIntentReceiver, intentFilter);
+//        } catch (Exception ignored) {
+//        }
 
 
-        telManager = (TelephonyManager) getApplicationContext().getSystemService(Service.TELEPHONY_SERVICE);
-        assert telManager != null;
+//        telManager = (TelephonyManager) getApplicationContext().getSystemService(Service.TELEPHONY_SERVICE);
+//        assert telManager != null;
 //        telManager.listen(mCallStateListener, PhoneStateListener.LISTEN_CALL_STATE);
 
 
-        init_protocols();
+//        init_protocols();
 
 //        startTimer();
         mProtocolServer=this;
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 3c6f1ea0..baf63a3a 100644
--- a/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java
+++ b/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java
@@ -19,6 +19,8 @@ public class BatteryUtil {
             BatteryUtil.this.mRuntime.setBatterychanging(false);
           }
           int i = param1Intent.getIntExtra("level", 0) * 100 / param1Intent.getIntExtra("scale", 100);
+
+          FileOutputUtil.fileOutput(param1Context,"Battery","BatteryLevel "+i);
           if (i >= 100) {
             Runtime runtime = BatteryUtil.this.mRuntime;
             StringBuffer stringBuffer = BatteryUtil.this.mBuffer;
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 7a3c29ff..7b140af2 100644
--- a/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
+++ b/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
@@ -75,6 +75,7 @@ public class NettyConnection implements Connection {
                                 //设置工作模式
                                 API.handleBP33(NettyConnection.this,null,cmd);
                                 DeliverCMDMessageToSystem("AP33",cmd);//通知下面线程状态变化
+                                DeliverCMDMessageToSystem("ResartHeartAlarm",cmd);//通知下面线程状态变化
 
                                 break;
                             case BP16:
diff --git a/local.properties b/local.properties
index 5b14f417..22101584 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.
-#Wed Jan 08 11:59:39 CST 2020
-sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk
+#Thu Jan 09 07:29:56 CST 2020
+sdk.dir=C\:\\Users\\Admin\\AppData\\Local\\Android\\Sdk