KeepAlive 还是不能恢复，系统深睡网络就会断线

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

diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock
index 63276a9..7ca20c6 100644 (file)
Binary files a/.gradle/5.4.1/executionHistory/executionHistory.lock and b/.gradle/5.4.1/executionHistory/executionHistory.lock differ

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

diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
index 57ebfec..7999ded 100644 (file)
Binary files a/.gradle/5.4.1/fileHashes/fileHashes.lock and b/.gradle/5.4.1/fileHashes/fileHashes.lock differ

diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin
index 4b5524c..aeb84e4 100644 (file)
Binary files a/.gradle/5.4.1/javaCompile/classAnalysis.bin and b/.gradle/5.4.1/javaCompile/classAnalysis.bin differ

diff --git a/.gradle/5.4.1/javaCompile/javaCompile.lock b/.gradle/5.4.1/javaCompile/javaCompile.lock
index 0930d53..3629dfc 100644 (file)
Binary files a/.gradle/5.4.1/javaCompile/javaCompile.lock and b/.gradle/5.4.1/javaCompile/javaCompile.lock differ

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 00ae716..f57e582 100644 (file)
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dafd761..543f183 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,14 @@
 <project version="4">
   <component name="AndroidLayouts">
     <shared>
-      <config />
+      <config>
+        <device id="wear_square" />
+        <target>android-19</target>
+      </config>
     </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">
@@ -14,33 +18,19 @@
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/debug/output.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/debug/output.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/ICLocation.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/ICLocation.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/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/Deliver.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/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/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/ContextProxy.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ContextProxy.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/java/com/ic/protocol/utils/Util.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Util.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" 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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -51,7 +41,7 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="867155030002145" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="2.7_QVGA_API_19" />
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
       <ProjectState />
@@ -70,46 +60,47 @@
   <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/service/protocolMainServer.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="151">
-              <caret line="324" column="28" selection-start-line="324" selection-start-column="28" selection-end-line="324" selection-end-column="28" />
+            <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>
       </file>
       <file pinned="false" current-in-tab="false">
-        <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/service/KeepAlive.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" />
-              <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" />
-              </folding>
+            <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>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java">
+        <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="190">
-              <caret line="109" column="17" selection-start-line="109" selection-start-column="17" selection-end-line="109" selection-end-column="17" />
+            <state relative-caret-position="496">
+              <caret line="47" selection-start-line="47" selection-end-line="47" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RxSocket.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="378">
-              <caret line="301" column="68" selection-start-line="301" selection-start-column="68" selection-end-line="301" selection-end-column="68" />
+            <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" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -117,56 +108,47 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GSensorListener.java">
+      <file pinned="false" current-in-tab="true">
+        <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="94">
-              <caret line="90" column="8" selection-start-line="90" selection-start-column="8" selection-end-line="90" selection-end-column="8" />
+            <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>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.java">
           <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="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>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java">
+      <file pinned="false" current-in-tab="false">
+        <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="169">
-              <caret line="254" column="46" selection-start-line="254" selection-start-column="46" selection-end-line="254" selection-end-column="46" />
+            <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>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="131">
-              <caret line="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
-              <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="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>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <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>
@@ -182,14 +164,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>location</find>
-      <find>onReceive</find>
-      <find>handle_cmd</find>
-      <find>stop</find>
-      <find>runtime.getLocationInstance()</find>
-      <find>timetofix</find>
-      <find>getHost</find>
-      <find>gethost</find>
       <find>runt</find>
       <find>AP01</find>
       <find>setIMEI</find>
@@ -198,20 +172,28 @@
       <find>setoption</find>
       <find>Socket</find>
       <find>socketChannel</find>
-      <find>onClose</find>
       <find>setCdma</find>
       <find>lbs</find>
       <find>receive</find>
       <find>startLocationProcess</find>
       <find>CellInfo</find>
       <find>mCellinfo</find>
-      <find>CurrentCellInfo</find>
       <find>Cellinfoutil</find>
-      <find>close</find>
       <find>waitAndSendLocation</find>
       <find>getCdm</find>
-      <find>battery</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>
     </findStrings>
     <replaceStrings>
       <replace>stop</replace>
@@ -221,7 +203,7 @@
     </replaceStrings>
   </component>
   <component name="GenerateSignedApkSettings">
-    <option name="KEY_STORE_PATH" value="D:\Snicker\icsupport\app\EQC_G5.jks" />
+    <option name="KEY_STORE_PATH" value="D:\workspace\icsupport\app\EQC_G5.jks" />
     <option name="KEY_ALIAS" value="watch_g5" />
     <option name="REMEMBER_PASSWORDS" value="true" />
     <option name="BUILD_TARGET_KEY" value="apk" />
@@ -239,7 +221,6 @@
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RunCMD.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ExeCommand.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/StepCounterInterface.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GPSListener.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Logger.java" />
@@ -247,28 +228,30 @@
         <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/KeepAlive.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/UpLoadDataPoints.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/ServiceUtil.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/utils/RxSocket.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/bean/Runtime.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" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="620" />
-    <option name="y" value="198" />
+    <option name="x" value="670" />
+    <option name="y" value="38" />
     <option name="width" value="964" />
     <option name="height" value="784" />
   </component>
@@ -326,6 +309,17 @@
               <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" />
@@ -456,8 +450,8 @@
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1858" height="1096" extended-state="6" />
     <layout>
-      <window_info id="Captures" order="0" sideWeight="0.22002634" side_tool="true" visible="true" weight="0.26028922" />
-      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.7799736" visible="true" weight="0.26028922" />
+      <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="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" />
@@ -466,13 +460,13 @@
       <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 anchor="bottom" auto_hide="true" x="96" y="344" width="1798" height="456" id="Logcat" order="1" sideWeight="0.63570637" weight="0.6496881" />
+      <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" 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 active="true" anchor="bottom" id="Build" order="7" sideWeight="0.49276975" visible="true" weight="0.21101871" />
+      <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="Android Profiler" order="9" />
       <window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
@@ -523,12 +517,6 @@
           <properties />
           <option name="timeStamp" value="17" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java</url>
-          <line>250</line>
-          <properties />
-          <option name="timeStamp" value="32" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>
@@ -606,59 +594,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/SynchronousTime.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="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/Logger.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="760">
-          <caret line="40" column="22" selection-start-line="40" selection-start-column="22" selection-end-line="40" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="13" column="23" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="281">
-          <caret line="73" column="39" lean-forward="true" selection-start-line="73" selection-start-column="39" selection-end-line="73" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmHelper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="443">
-          <caret line="40" column="27" lean-forward="true" selection-start-line="40" selection-start-column="27" selection-end-line="40" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/telephony/gsm/GsmCellLocation.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="167">
-          <caret line="23" column="15" selection-start-line="23" selection-start-column="15" selection-end-line="23" selection-end-column="15" />
-          <folding>
-            <element signature="e#537#538#0" expanded="true" />
-            <element signature="e#588#589#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/stepCounter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/StepCount.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="38">
@@ -666,17 +601,6 @@
         </state>
       </provider>
     </entry>
-    <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="205">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-          <folding>
-            <element signature="e#548#549#0" expanded="true" />
-            <element signature="e#599#600#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/os/PowerManager.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="233">
@@ -784,13 +708,6 @@
         </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="265">
-          <caret line="391" column="67" selection-start-line="391" selection-start-column="45" selection-end-line="391" selection-end-column="67" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/StepCounterInterface.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="379">
@@ -847,13 +764,6 @@
         </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="302">
-          <caret line="235" column="51" selection-start-line="235" selection-start-column="51" selection-end-line="235" selection-end-column="51" />
-        </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">
@@ -868,13 +778,6 @@
         </state>
       </provider>
     </entry>
-    <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="377">
-          <caret line="42" column="20" selection-start-line="42" selection-start-column="20" selection-end-line="42" selection-end-column="20" />
-        </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">
@@ -924,6 +827,68 @@
         </state>
       </provider>
     </entry>
+    <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="151">
+          <caret line="234" column="68" selection-start-line="234" selection-start-column="68" selection-end-line="234" selection-end-column="68" />
+        </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="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>
+      </provider>
+    </entry>
+    <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="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/LocationClient.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="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>
+      </provider>
+    </entry>
+    <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="397">
+          <caret line="105" column="14" selection-start-line="105" selection-start-column="14" selection-end-line="105" selection-end-column="14" />
+          <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" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="321">
@@ -937,74 +902,102 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.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="151">
-          <caret line="324" column="28" selection-start-line="324" selection-start-column="28" selection-end-line="324" selection-end-column="28" />
+        <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" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#201#202#0" expanded="true" />
+            <element signature="e#252#253#0" expanded="true" />
           </folding>
         </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/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>
+      </provider>
+    </entry>
+    <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="378">
-          <caret line="301" column="68" selection-start-line="301" selection-start-column="68" selection-end-line="301" 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/GSensorListener.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>
+      </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>
+    <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="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/GSensorListener.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="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/service/base/AbstractConnectionService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="94">
-          <caret line="90" column="8" selection-start-line="90" selection-start-column="8" selection-end-line="90" selection-end-column="8" />
+          <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java">
       <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="283">
+          <caret line="250" column="43" selection-start-line="250" selection-start-column="26" selection-end-line="250" selection-end-column="43" />
         </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/service/Initialize.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="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/bean/Runtime.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="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
-          <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>
+          <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/utils/NettyConnection.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="190">
-          <caret line="109" column="17" selection-start-line="109" selection-start-column="17" selection-end-line="109" selection-end-column="17" />
+        <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" />
+          <folding>
+            <element signature="imports" 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/Deliver.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="169">
-          <caret line="254" column="46" selection-start-line="254" selection-start-column="46" selection-end-line="254" selection-end-column="46" />
+        <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>
       </provider>
     </entry>

diff --git a/app/src/main/java/com/ic/protocol/MainActivity.java b/app/src/main/java/com/ic/protocol/MainActivity.java
index 47faedd..66256ef 100644 (file)
--- a/app/src/main/java/com/ic/protocol/MainActivity.java
+++ b/app/src/main/java/com/ic/protocol/MainActivity.java
@@ -1,10 +1,13 @@
 package com.ic.protocol;
 
 import android.content.Intent;
+import android.os.Handler;
+import android.os.Message;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.ic.protocol.bean.StepCount;
@@ -16,6 +19,8 @@ import com.ic.protocol.utils.StepCounterInterface;
 
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import chestnut.ui.Toastc;
 import rx.android.schedulers.AndroidSchedulers;
@@ -23,52 +28,55 @@ import rx.schedulers.Schedulers;
 
 public class MainActivity extends AppCompatActivity {
 
-    private protocolMainServer mProtocolMainServer;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
         Button btnConnect = (Button) findViewById(R.id.btnConnect);
-        Button btnDisConnect = (Button) findViewById(R.id.btnDisConnect);
-        Button btnWrite = (Button) findViewById(R.id.btnWrite);
-        Button btnWrite2 = (Button) findViewById(R.id.btnWrite2);
+        TextView tv = (TextView)findViewById(R.id.textView);
 
         btnConnect.setOnClickListener(clickListener);
-        btnDisConnect.setOnClickListener(clickListener);
-        btnWrite.setOnClickListener(clickListener);
-        btnWrite2.setOnClickListener(clickListener);
+
 
         startService(new Intent(this,protocolMainServer.class));// protocol service
-        if (mProtocolMainServer == null ) mProtocolMainServer  = protocolMainServer.getInstance();
+
+
+        Handler handler=new Handler(new Handler.Callback() {
+            @Override
+            public boolean handleMessage(Message message) {
+
+                 tv.setText( protocolMainServer.getInstance().getServerAlive());
+
+                return false;
+            }
+        });
+        TimerTask tmt=new TimerTask() {
+            @Override
+            public void run() {
+                handler.sendEmptyMessage(0);
+            }
+        };
+        new Timer().schedule(tmt,0,2000);
+
 
     }
 
+
+
     private View.OnClickListener clickListener = new View.OnClickListener() {
         @Override
         public void onClick(View view) {
             switch (view.getId()) {
                 case R.id.btnConnect:
                     //进行连接Socket：这里使用的是，在本地上开启了一个服务器。
-//                    if (mProtocolMainServer == null ) mProtocolMainServer  = protocolMainServer.getInstance();
-//                    if(mProtocolMainServer !=null)    mProtocolMainServer.connectServer();
-                    break;
-                case R.id.btnDisConnect:
-                    //断开连接
-//                    if (mProtocolMainServer == null ) mProtocolMainServer  = protocolMainServer.getInstance();
-//                    if(mProtocolMainServer !=null) mProtocolMainServer.disconnectServer();
-                    break;
-                case R.id.btnWrite:
-                    //向RxSocket写数据
+                    stopService(new Intent(MainActivity.this,protocolMainServer.class));// protocol service
+                    startService(new Intent(MainActivity.this,protocolMainServer.class));// protocol service
 
-//                    if (mProtocolMainServer == null ) mProtocolMainServer  = protocolMainServer.getInstance();
-//                    if(mProtocolMainServer !=null) mProtocolMainServer.sendMsg(new String("IWAP00867155030001063#"));
-                    break;
-                case R.id.btnWrite2:
 
-//                    if(mProtocolMainServer !=null) mProtocolMainServer.testGpsData();
-                    StepCounterInterface.getStepCount();
                     break;
+
             }
         }
     };

diff --git a/app/src/main/java/com/ic/protocol/bean/Runtime.java b/app/src/main/java/com/ic/protocol/bean/Runtime.java
index 7ccf577..a8e5bcc 100644 (file)
--- a/app/src/main/java/com/ic/protocol/bean/Runtime.java
+++ b/app/src/main/java/com/ic/protocol/bean/Runtime.java
@@ -56,7 +56,7 @@ public class Runtime {
   \r
   private String host = "watch.jiai.pro"; //118.178.155.223\r
 \r
-  private String srvIP = "39.98.94.164";\r
+  private String srvIP = "118.178.155.223";//"39.98.94.164";\r
 \r
   private String imei = "867155030002145";\r
 \r

diff --git a/app/src/main/java/com/ic/protocol/service/Initialize.java b/app/src/main/java/com/ic/protocol/service/Initialize.java
index b960872..43d982a 100644 (file)
--- a/app/src/main/java/com/ic/protocol/service/Initialize.java
+++ b/app/src/main/java/com/ic/protocol/service/Initialize.java
@@ -53,7 +53,7 @@ public class Initialize extends AbstractConnectionService {
   \r
   public boolean onConnectionClose(Connection paramConnection, Runtime paramRuntime) {\r
     initOK=false;\r
-    return this.initOK ^ true;\r
+    return false;\r
   }\r
   \r
   public boolean onConnectionOpen(Connection paramConnection, Runtime paramRuntime) {\r

diff --git a/app/src/main/java/com/ic/protocol/service/KeepAlive.java b/app/src/main/java/com/ic/protocol/service/KeepAlive.java
index a4b22c3..bf4540b 100644 (file)
--- a/app/src/main/java/com/ic/protocol/service/KeepAlive.java
+++ b/app/src/main/java/com/ic/protocol/service/KeepAlive.java
@@ -247,6 +247,10 @@ public class KeepAlive extends AbstractConnectionService {
     connectionError = true;\r
     isConnected = false;\r
     paramRuntime.getContextProxy().sendBroadcast(isConnected);\r
+    StringBuilder stringBuilder = new StringBuilder();\r
+    stringBuilder.append("onConnectionClose=");\r
+    stringBuilder.append(",set KeepAlive isConnected = false");\r
+    Logger.i(stringBuilder.toString());\r
     LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_OFF);\r
     return false;\r
   }\r

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 bf8aef2..09af3bc 100644 (file)
--- a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
+++ b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
@@ -36,6 +36,7 @@ import com.ic.protocol.utils.DBHelper;
 import com.ic.protocol.utils.FileOutputUtil;\r
 import com.ic.protocol.utils.Logger;\r
 import com.ic.protocol.utils.NettyConnection;\r
+import com.ic.protocol.utils.ServiceUtil;\r
 import com.ic.protocol.utils.SharPreferenceUtil;\r
 import com.ic.protocol.utils.SimSignalUtil;\r
 import com.ic.protocol.utils.Util;\r
@@ -87,6 +88,15 @@ public class protocolMainServer extends Service {
 \r
     private static boolean is_wifi_network_ok = false;\r
 \r
+\r
+    public String getServerAlive(){\r
+        return new StringBuilder().append("Connecttion status is ").append(this.connection.isServerConnected())\r
+                .append("\n KeepAlive ").append(KeepAlive.isConnected)\r
+                .append( "\n cmd Queue size ").append(LocationClient.queue.size())\r
+                .append("\n AP01 = ").append(protocolAPIHelper.AP01(runtime))\r
+                .toString();\r
+    }\r
+\r
     private BroadcastReceiver AtCallbackBroadcastReceiver = new BroadcastReceiver() {\r
         public void onReceive(Context param1Context, Intent param1Intent) {\r
             if (param1Intent.getAction().equals("com.eqc.intent.action.callback.at")) {\r

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 eeb454f..7a3c29f 100644 (file)
--- a/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
+++ b/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
@@ -19,7 +19,7 @@ import static com.ic.protocol.utils.RxSocket.SocketStatus.CONNECTED;
 import static com.ic.protocol.utils.RxSocket.SocketStatus.DIS_CONNECT;\r
 \r
 \r
-public class NettyConnection implements Connection ,RxSocket.SocketConnectionListener{\r
+public class NettyConnection implements Connection {\r
   private static long realtime_old;\r
   private static final String TAG = NettyConnection.class.getSimpleName();\r
 \r
@@ -32,7 +32,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
   \r
   public NettyConnection(ConnectionListener paramConnectionListener) {\r
     this.listener = paramConnectionListener;\r
-    RxSocket.getInstance().setConnectionListener(this);\r
+//    RxSocket.getInstance().setConnectionListener(this);\r
     if (API == null) API=new protocolAPIHelper(\r
             new protocolAPIHelper.CmdHandler() {\r
                 @Override\r
@@ -44,7 +44,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
                             case BP00:\r
                                 API.handleBP00(cmd);\r
                                 Logger.i("服务器收到心跳AP00");\r
-                                sendCMDMessage("AP00",cmd);//通知下面线程状态变化\r
+                                DeliverCMDMessageToSystem("AP00",cmd);//通知下面线程状态变化\r
                                 break;\r
                             case BP01:\r
                                 API.handleBP01(cmd);\r
@@ -53,34 +53,34 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
                             case BP03:\r
                                 API.handleBP03(cmd);\r
                                 Logger.i("服务器收到心跳AP03");\r
-                                sendCMDMessage("AP03",cmd);//通知下面线程状态变化\r
+                                DeliverCMDMessageToSystem("AP03",cmd);//通知下面线程状态变化\r
                                 break;\r
                             case BP28:\r
                                  API.handleBP28(cmd);\r
                                 Logger.i("服务器收到语音AP28");\r
-                                sendCMDMessage("AP28",cmd);//通知下面线程状态变化\r
+                                DeliverCMDMessageToSystem("AP28",cmd);//通知下面线程状态变化\r
 \r
                                 break;\r
                             case BPTM:\r
                                 API.handleBP28(cmd);\r
                                 Logger.i("服务器收到校时命令APTM");\r
-                                sendCMDMessage("APTM",cmd);//通知下面线程状态变化\r
+                                DeliverCMDMessageToSystem("APTM",cmd);//通知下面线程状态变化\r
                                 break;\r
                             case BP85://设置闹钟\r
                                 API.handleBP85(cmd,NettyConnection.this,null);\r
                                 Logger.i("收到服务器设置闹钟命令BP85");\r
-                                sendCMDMessage("AP85",cmd);//通知下面线程状态变化\r
+                                DeliverCMDMessageToSystem("AP85",cmd);//通知下面线程状态变化\r
                                 break;\r
                             case BP33:\r
                                 //设置工作模式\r
                                 API.handleBP33(NettyConnection.this,null,cmd);\r
-                                sendCMDMessage("AP33",cmd);//通知下面线程状态变化\r
+                                DeliverCMDMessageToSystem("AP33",cmd);//通知下面线程状态变化\r
 \r
                                 break;\r
                             case BP16:\r
                                 //立即定位指令（长链接有效）\r
                                 API.handleBP16(NettyConnection.this,null,cmd);\r
-                                sendCMDMessage("StartLocate",cmd);//通知下面线程状态变化\r
+                                DeliverCMDMessageToSystem("StartLocate",cmd);//通知下面线程状态变化\r
                                 break;\r
                         }\r
 \r
@@ -97,7 +97,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
   \r
   public void close() {\r
       listener =null;\r
-      RxSocket.getInstance().setConnectionListener(null);\r
+//      RxSocket.getInstance().setConnectionListener(null);\r
   }\r
   \r
   public void connect(final String host, final int port) {\r
@@ -134,6 +134,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
                       log("RxSocket Connect Error : "+throwable.getMessage());\r
                     },\r
                     () -> {\r
+                        log("RxSocket Connect main");\r
 \r
                     }\r
             );\r
@@ -154,7 +155,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
                       log("RxSocket DisConnect Error : "+throwable.getMessage());\r
                     },\r
                     () -> {\r
-\r
+                        log("RxSocket DisConnect main");\r
                     }\r
             );\r
 \r
@@ -193,7 +194,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
                       log("RxSocket write Error : " + throwable.getMessage());\r
                     },\r
                     () -> {\r
-\r
+                        log("RxSocket write main ");\r
                     }\r
             );\r
     return true;\r
@@ -202,7 +203,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
   public int getTimeout() { return this.timeout; }\r
 \r
 \r
-  public void sendCMDMessage(String cmd,String msg){\r
+  public void DeliverCMDMessageToSystem(String cmd,String msg){\r
       if (NettyConnection.this.listener!=null){\r
           String[] msgArr=new String[]{cmd,msg};\r
           StringMessage stringMessage=new StringMessage(msgArr);\r
@@ -226,10 +227,10 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
 \r
                       },\r
                       throwable -> {\r
-\r
+                          log("get Msg throwable");\r
                       },\r
                       ()->{\r
-\r
+                          log("get Msg ()");\r
                       }\r
               );\r
 \r
@@ -247,6 +248,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
                       if (NettyConnection.this.listener!=null){\r
                           NettyConnection.this.listener.onConnectionClose();\r
                       }\r
+                      disconnectServer();\r
                   }\r
               });\r
 \r
@@ -267,18 +269,5 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
   \r
   public void setTimeout(int paramInt) { this.timeout = paramInt; }\r
 \r
-    @Override\r
-    public void onConnectionClose(String errMsg) {\r
-//        if (NettyConnection.this.listener!=null){\r
-//            NettyConnection.this.listener.onConnectionClose();\r
-//        }\r
-    }\r
-\r
-    @Override\r
-    public void onConnectionOpen() {\r
-//        if (NettyConnection.this.listener!=null){\r
-//            NettyConnection.this.listener.onConnectionOpen();\r
-//        }\r
-    }\r
 }\r
 \r

diff --git a/app/src/main/java/com/ic/protocol/utils/RxSocket.java b/app/src/main/java/com/ic/protocol/utils/RxSocket.java
index e7f23d1..3bade99 100644 (file)
--- a/app/src/main/java/com/ic/protocol/utils/RxSocket.java
+++ b/app/src/main/java/com/ic/protocol/utils/RxSocket.java
@@ -74,7 +74,7 @@ public class RxSocket {
     private ReadThread readThread = null;
     private boolean isReadThreadAlive = true;
     private SocketReconnectCallback socketReconnectCallback = null;
-    private SocketConnectionListener conectionListener = null;
+//    private SocketConnectionListener conectionListener = null;
 
     /*  方法
     * */
@@ -86,9 +86,9 @@ public class RxSocket {
         return connectStatus;
     }
 
-    public void setConnectionListener(SocketConnectionListener callback){
-        conectionListener=callback;
-    }
+//    public void setConnectionListener(SocketConnectionListener callback){
+//        conectionListener=callback;
+//    }
     /**
      * 建立Socket连接，只是尝试建立一次
      * @param ip    IP or 域名
@@ -294,13 +294,9 @@ public class RxSocket {
                         if (selectionKey != null) selectionKey.cancel();
                         socketChannel = SocketChannel.open();
                         socketChannel.configureBlocking(false);
-//                        socketChannel.setOption(SocketOptions.SO_KEEPALIVE, Boolean.TRUE);
-//                        socketChannel.setOption(SocketOptions.TCP_NODELAY, Boolean.TRUE);
-//                        socketChannel.getOption(StandardSocketOptions.SO_KEEPALIVE);
                         selector = Selector.open();
 //                        socketChannel.socket().setKeepAlive(true);
                         socketChannel.connect(new InetSocketAddress(ip, port));
-
 //                        socketChannel.socket().setTcpNoDelay(true);
                         selectionKey = socketChannel.register(selector, SelectionKey.OP_CONNECT);
                         socketStatus = SocketStatus.CONNECTING;
@@ -313,9 +309,6 @@ public class RxSocket {
                         if (socketReconnectCallback!=null)
                             socketReconnectCallback.onFail("SocketConnectFail1");
 
-//                        if( conectionListener !=null) {
-//                            conectionListener.onConnectionClose("SocketConnectFail");
-//                        }
                     }
                 }
                 //读取
@@ -336,9 +329,6 @@ public class RxSocket {
                                         if (socketReconnectCallback!=null)
                                             socketReconnectCallback.onSuccess();
 
-                                        if( conectionListener !=null) {
-                                            conectionListener.onConnectionOpen();
-                                        }
                                     } catch (Exception e) {
                                         isReadThreadAlive = false;
                                         socketStatus = SocketStatus.DIS_CONNECT;
@@ -347,9 +337,6 @@ public class RxSocket {
                                         if (socketReconnectCallback!=null)
                                             socketReconnectCallback.onFail("SocketConnectFail2");
 
-//                                        if( conectionListener !=null) {
-//                                            conectionListener.onConnectionClose("SocketConnectFail2");
-//                                        }
                                     }
                                 }
                             } else if (key.isReadable()) {
@@ -363,9 +350,6 @@ public class RxSocket {
                                     if (socketReconnectCallback!=null)
                                         socketReconnectCallback.onFail("SocketConnectFail3");
 
-//                                    if( conectionListener !=null) {
-//                                        conectionListener.onConnectionClose("SocketConnectFail3");
-//                                    }
                                 } else {
                                     LogUtils.i(OpenLog, TAG, "readSubject:msg！"+ "length:" + length);
                                     byte[] bytes = new byte[length];
@@ -385,9 +369,6 @@ public class RxSocket {
                         if (socketReconnectCallback!=null)
                             socketReconnectCallback.onFail("SocketConnectFail4");
 
-//                        if( conectionListener !=null) {
-//                            conectionListener.onConnectionClose("SocketConnectFail4");
-//                        }
                     }
                 }
             }
@@ -405,9 +386,4 @@ public class RxSocket {
         void onFail(String msg);
     }
 
-    public interface SocketConnectionListener {
-        void onConnectionClose(String errMsg);
-
-        void onConnectionOpen();
-    }
 }

diff --git a/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java b/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java
index e94c4a6..fd6b0ca 100644 (file)
--- a/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java
+++ b/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java
@@ -44,6 +44,8 @@ public class ServiceUtil {
       LocationClient.queue.offerLast(paramStringMessage);\r
     } \r
   }\r
+\r
+\r
   \r
 //  public static void offerVideoQueue(OssFileContent paramOssFileContent, LinkedBlockingDeque<OssFileContent> paramLinkedBlockingDeque, FileCache paramFileCache) {\r
 //    if (!paramLinkedBlockingDeque.offerLast(paramOssFileContent)) {\r

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b2ccdf0..61aa82c 100644 (file)
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,39 +10,26 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="com.ic.protocol.MainActivity">
 
-    <Button
-        android:id="@+id/btnConnect"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="5dp"
-        android:text="connect" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <Button
-        android:id="@+id/btnDisConnect"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/btnConnect"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="5dp"
-        android:text="disConnect" />
+        <Button
+            android:id="@+id/btnConnect"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="ReConnect" />
 
-    <Button
-        android:id="@+id/btnWrite"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/btnDisConnect"
-        android:layout_alignEnd="@+id/btnConnect"
-        android:layout_marginTop="5dp"
-        android:text="write" />
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scrollbars="vertical"
+            android:text="TextView"
+            android:textAlignment="viewStart"
+            android:textSize="18sp" />
+
+    </LinearLayout>
 
-    <Button
-        android:id="@+id/btnWrite2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/btnWrite"
-        android:layout_alignEnd="@+id/btnConnect"
-        android:layout_marginTop="5dp"
-        android:text="write" />
 </RelativeLayout>