1、添加B12（SOS）、B14（白名单）、B17（工厂设置）、B18（重启）、B31（关机） 命令解析

2、更新StepCount更加及时，但是似乎调用太多，需要再查。

diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
index c62f14e..e937cb2 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 e85aab4..b3ab48c 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 b90563b..0bfc8ec 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 e760cf0..4798ba1 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/fileHashes/resourceHashesCache.bin b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
index 46045a1..62771a5 100644 (file)
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 3dfaf24..44a477b 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 b1e3055..c64a8e1 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/5.4.1/javaCompile/taskHistory.bin b/.gradle/5.4.1/javaCompile/taskHistory.bin
index 93c349c..88d0cf6 100644 (file)
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 98b496d..05e052d 100644 (file)
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 34bf12b..18e8e2a 100644 (file)
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 15c34d2..4b9e256 100644 (file)
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 6fd9e2b..6f32454 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <project version="4">\r
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">\r
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">\r
     <output url="file://$PROJECT_DIR$/build/classes" />\r
   </component>\r
   <component name="ProjectType">\r

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2b05f8c..3bc2b43 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -18,24 +18,24 @@
       <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/src/main/java/com/ic/protocol/GSensorListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GSensorListener.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/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/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/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/Logger.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Logger.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/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/WakeLockUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/WakeLockUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/okio/okio.iml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/version_code.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/version_code.properties" 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" />
@@ -119,43 +119,33 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="487">
-              <caret line="526" column="56" selection-start-line="526" selection-start-column="56" selection-end-line="526" selection-end-column="56" />
+            <state relative-caret-position="2738">
+              <caret line="486" lean-forward="true" selection-start-line="486" selection-end-line="486" />
               <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#14562#14840#0" expanded="true" />
-                <element signature="e#14839#14840#0" expanded="true" />
+                <element signature="e#8041#8042#0" expanded="true" />
+                <element signature="e#8079#8080#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/protocolMainServer.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/DeviceInfoUtil.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="202">
-              <caret line="479" column="70" selection-start-line="479" selection-start-column="70" selection-end-line="479" selection-end-column="70" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#33472#33473#0" expanded="true" />
-                <element signature="e#33507#33508#0" expanded="true" />
-                <element signature="e#33560#33561#0" expanded="true" />
-                <element signature="e#33604#33605#0" expanded="true" />
-                <element signature="e#39340#39341#0" expanded="true" />
-                <element signature="e#39376#39377#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="38">
+              <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
             </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/service/protocolMainServer.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="156" column="57" lean-forward="true" selection-start-line="156" selection-start-column="57" selection-end-line="156" selection-end-column="57" />
+            <state relative-caret-position="343">
+              <caret line="420" column="66" lean-forward="true" selection-start-line="420" selection-start-column="66" selection-end-line="420" selection-end-column="66" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -164,77 +154,64 @@
         </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/GSensorListener.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="408">
-              <caret line="78" column="17" lean-forward="true" selection-start-line="78" selection-start-column="17" selection-end-line="78" selection-end-column="17" />
+            <state relative-caret-position="116">
+              <caret line="101" column="20" selection-start-line="101" selection-start-column="20" selection-end-line="101" 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/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="152">
-              <caret line="34" column="23" selection-start-line="34" selection-start-column="23" selection-end-line="34" selection-end-column="23" />
+            <state relative-caret-position="279">
+              <caret line="156" column="25" lean-forward="true" selection-start-line="156" selection-start-column="25" selection-end-line="156" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/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="283">
-              <caret line="111" column="44" lean-forward="true" selection-start-line="111" selection-start-column="44" selection-end-line="111" selection-end-column="44" />
-              <folding>
-                <element signature="e#8809#8810#0" expanded="true" />
-                <element signature="e#8830#8831#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="152">
+              <caret line="41" column="50" selection-start-line="41" selection-start-column="50" selection-end-line="41" selection-end-column="50" />
             </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/KeepAlive.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="528">
-              <caret line="355" column="40" lean-forward="true" selection-start-line="355" selection-start-column="40" selection-end-line="355" selection-end-column="40" />
+            <state relative-caret-position="592">
+              <caret line="196" column="52" selection-start-line="196" selection-start-column="52" selection-end-line="196" selection-end-column="52" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#2590#2591#0" expanded="true" />
-                <element signature="e#2626#2627#0" expanded="true" />
-                <element signature="e#7868#7869#0" expanded="true" />
-                <element signature="e#7902#7903#0" expanded="true" />
-                <element signature="e#10259#10260#0" expanded="true" />
-                <element signature="e#10294#10295#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <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="607">
-              <caret line="282" column="41" lean-forward="true" selection-start-line="282" selection-start-column="41" selection-end-line="282" selection-end-column="41" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Logger.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="149">
-              <caret line="65" column="22" selection-start-line="65" selection-start-column="22" selection-end-line="65" selection-end-column="22" />
+            <state relative-caret-position="202">
+              <caret line="409" selection-start-line="409" selection-end-line="409" />
+              <folding>
+                <element signature="e#26099#26100#0" expanded="true" />
+                <element signature="e#26132#26133#0" expanded="true" />
+                <element signature="e#26190#26191#0" expanded="true" />
+                <element signature="e#26223#26224#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/protocolAPIHelper.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="237">
-              <caret line="340" column="48" selection-start-line="340" selection-start-column="48" selection-end-line="340" selection-end-column="48" />
+            <state relative-caret-position="134">
+              <caret line="183" column="26" selection-start-line="183" selection-start-column="26" selection-end-line="183" selection-end-column="26" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -253,36 +230,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>handl</find>
-      <find>connect</find>
-      <find>DIS_CONNECT</find>
-      <find>socketStatus</find>
-      <find>LogUtils</find>
-      <find>send</find>
-      <find>InnerService</find>
-      <find>Runtime</find>
-      <find>errno</find>
-      <find>setHeartAlarm</find>
-      <find>sethear</find>
-      <find>wakelock</find>
-      <find>setAlarm</find>
-      <find>FileOutputUtil</find>
-      <find>AP00</find>
-      <find>retry</find>
-      <find>skip</find>
-      <find>onAlarmClock</find>
-      <find>Alarm</find>
-      <find>check</find>
-      <find>IMEI</find>
-      <find>ReadThread</find>
-      <find>onAlar</find>
-      <find>open</find>
-      <find>KeepAlive</find>
-      <find>checkconnection</find>
       <find>checkcon</find>
       <find>readSubject</find>
       <find>pre</find>
       <find>setHeart</find>
+      <find>stop</find>
+      <find>delaystop</find>
+      <find>fine</find>
+      <find>getBest</find>
+      <find>Log</find>
+      <find>strLatitude</find>
+      <find>latitude</find>
+      <find>StepCount</find>
+      <find>getSte</find>
+      <find>IMEI</find>
+      <find>gpsMode</find>
+      <find>dev</find>
+      <find>handl</find>
+      <find>BP1</find>
+      <find>StartLocate</find>
+      <find>ResartHeartAlarm</find>
+      <find>runtime</find>
+      <find>HeartAl</find>
+      <find>BP03</find>
+      <find>getStepCount</find>
+      <find>AP03</find>
+      <find>H12</find>
+      <find>updateStepCount</find>
+      <find>BP12</find>
+      <find>IWBP17,867155030001063,161723</find>
+      <find>BP17</find>
     </findStrings>
     <replaceStrings>
       <replace>stop</replace>
@@ -318,7 +295,6 @@
         <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/BatteryUtil.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/NMEAListener.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Config.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/utils/AlarmHelper.java" />
@@ -331,31 +307,33 @@
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/PedometerJNIUtil.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/eqc/utils/PedometerJNIUtil.java" />
-        <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
         <option value="$PROJECT_DIR$/app/src/main/jni/com_eqc_utils_PedometerJNIUtil.h" />
         <option value="$PROJECT_DIR$/app/src/main/jni/PedometerJNIUtil.c" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/SimSignalUtil.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java" />
         <option value="$PROJECT_DIR$/app/proguard-rules.pro" />
         <option value="$PROJECT_DIR$/app/build.gradle" />
-        <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/Logger.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/GSensorListener.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/WakeLockUtil.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/Logger.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/NMEAListener.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/version_code.properties" />
         <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/LocationClient.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/service/protocolMainServer.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java" />
       </list>
     </option>
   </component>
   <component name="OCFindUsagesOptions" text="true" ivars="false" properties="true" derivedClasses="false" />
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="279" />
-    <option name="y" value="96" />
+    <option name="x" value="294" />
+    <option name="y" value="93" />
     <option name="width" value="1259" />
     <option name="height" value="1019" />
   </component>
@@ -364,6 +342,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -448,14 +428,21 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="ic" type="462c0819:PsiDirectoryNode" />
               <item name="protocol" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="base" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="icsupport" type="b2602c69:ProjectViewProjectNode" />
+              <item name="icsupport" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="libs" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -469,11 +456,11 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="SHOW_ALL_PROCESSES" value="false" />
     <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
-    <property name="last_opened_file_path" value="Z:/rk3328/RKUpdateService-mid-7.0" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../eqcl02launcher" />
     <property name="project.structure.last.edited" value="Dependencies" />
     <property name="project.structure.proportion" value="0.17" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="preferences.externalTools" />
+    <property name="settings.editor.selected.configurable" value="experimental" />
   </component>
   <component name="PsdUISettings">
     <option name="MODULE_TAB" value="Signing Configs" />
@@ -615,7 +602,14 @@
       <option name="project" value="LOCAL" />
       <updated>1579141648310</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="增加 BP33和BP16的第一次定位强制執行邏輯">
+      <created>1579285852105</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1579285852105</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TodoView">
@@ -628,27 +622,27 @@
     </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.32503888" side_tool="true" weight="0.3266987" />
-      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.6756757" visible="true" weight="0.26418242" />
+      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.6723869" visible="true" weight="0.26385927" />
       <window_info id="Structure" order="2" sideWeight="0.32503888" side_tool="true" weight="0.3266987" />
       <window_info id="Favorites" order="3" sideWeight="0.22933884" side_tool="true" weight="0.3266987" />
-      <window_info id="Build Variants" order="4" sideWeight="0.3243243" side_tool="true" visible="true" weight="0.26418242" />
+      <window_info id="Build Variants" order="4" sideWeight="0.32761312" side_tool="true" visible="true" weight="0.26385927" />
       <window_info id="Image Layers" order="5" />
       <window_info id="Designer" order="6" />
       <window_info id="Resources Explorer" order="7" sideWeight="0.49586776" weight="0.32944405" />
       <window_info id="Capture Tool" order="8" />
-      <window_info anchor="bottom" id="Run" order="0" sideWeight="0.49721915" weight="0.58627856" />
-      <window_info anchor="bottom" auto_hide="true" x="96" y="344" width="1798" height="456" id="Logcat" order="1" sideWeight="0.5839822" weight="0.47921" />
+      <window_info anchor="bottom" id="Run" order="0" sideWeight="0.49721915" weight="0.5856833" />
+      <window_info anchor="bottom" auto_hide="true" x="96" y="344" width="1798" height="456" id="Logcat" order="1" sideWeight="0.5839822" weight="0.47830802" />
       <window_info anchor="bottom" id="TODO" order="2" weight="0.3286334" />
-      <window_info anchor="bottom" id="Find" order="3" sideWeight="0.46941045" weight="0.47089398" />
-      <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49276975" weight="0.512474" />
+      <window_info anchor="bottom" id="Find" order="3" sideWeight="0.46941045" weight="0.5314534" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="4" sideWeight="0.49276975" visible="true" weight="0.30477223" />
       <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.42992213" side_tool="true" weight="0.32744282" />
       <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.4916574" weight="0.25155926" />
-      <window_info anchor="bottom" id="Debug" order="8" sideWeight="0.57007784" weight="0.32744282" />
+      <window_info anchor="bottom" id="Build" order="7" sideWeight="0.4916574" weight="0.2505423" />
+      <window_info anchor="bottom" id="Debug" order="8" sideWeight="0.57007784" weight="0.3264642" />
       <window_info anchor="bottom" id="Android Profiler" order="9" />
       <window_info active="true" anchor="bottom" id="Messages" order="10" visible="true" weight="0.2920998" />
       <window_info anchor="right" id="Device File Explorer" order="0" sideWeight="0.5007728" side_tool="true" weight="0.3298109" />
@@ -657,6 +651,7 @@
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info anchor="right" id="Palette&#9;" order="4" />
       <window_info anchor="right" id="Preview" order="5" />
+      <window_info anchor="right" id="Hierarchy" order="6" weight="0.32995737" />
     </layout>
     <layout-to-restore>
       <window_info id="Captures" order="0" sideWeight="0.50138503" side_tool="true" weight="0.32995737" />
@@ -690,14 +685,15 @@
     <MESSAGE value="Gsensor改为采用API控制。" />
     <MESSAGE value="Gsensor改为采用API控制。&#10;测试AT指令开关SIM卡&#10;V320" />
     <MESSAGE value="修改Jni函数，增加心率和StepCounter的控制。&#10;修改协议界面，增加心率日志。&#10;修改proguard配置，解决release版本无法运行问题。" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改Jni函数，增加心率和StepCounter的控制。&#10;修改协议界面，增加心率日志。&#10;修改proguard配置，解决release版本无法运行问题。" />
+    <MESSAGE value="增加 BP33和BP16的第一次定位强制執行邏輯" />
+    <option name="LAST_COMMIT_MESSAGE" value="增加 BP33和BP16的第一次定位强制執行邏輯" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java</url>
-          <line>490</line>
+          <line>456</line>
           <properties />
           <option name="timeStamp" value="17" />
         </line-breakpoint>
@@ -779,47 +775,7 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/StepCounterInterface.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/jni/CMakeLists.txt" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/PedometerJNIUtil.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CustomDialog.java" />
-    <entry file="file://$PROJECT_DIR$/app/debug/ICSer_V320_202001111541_debug/res/layout/abc_search_dropdown_item_icons_2line.xml" />
-    <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://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/include/stdio.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="137" column="4" selection-start-line="137" selection-start-column="4" selection-end-line="137" selection-end-column="4" />
-        </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">
-          <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/res/layout/activity_main.xml">
-      <provider selected="true" editor-type-id="android-designer2" />
-      <provider editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="69" selection-start-line="69" selection-end-line="69" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/include/unistd.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="273" column="31" selection-start-line="273" selection-start-column="31" selection-end-line="273" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/include/unistd.h" />
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="285">
@@ -829,13 +785,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/jni/com_eqc_utils_PedometerJNIUtil.h" />
     <entry file="file://$PROJECT_DIR$/app/src/main/jni/jni_interface/com.eqc.utils.PedometerJNIUtil.h" />
-    <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/include/jni.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="123">
-          <caret line="34" column="17" selection-start-line="34" selection-start-column="17" selection-end-line="34" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/include/jni.h" />
     <entry file="file://$PROJECT_DIR$/app/src/main/jni/PedometerJNIUtil.c" />
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/eqc/utils/PedometerJNIUtil.java" />
     <entry file="file://$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/com/ic/protocol/BuildConfig.java">
@@ -852,13 +802,6 @@
         </state>
       </provider>
     </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="418">
-          <caret line="40" column="62" selection-start-line="40" selection-start-column="62" selection-end-line="40" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/SimSignalUtil.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1824">
@@ -869,13 +812,6 @@
         </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="76">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </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="342">
@@ -913,9 +849,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/version_code.properties">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1475">
@@ -944,14 +877,6 @@
         </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="-159">
-          <caret line="135" column="86" selection-start-line="135" selection-start-column="74" selection-end-line="135" selection-end-column="86" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/util/Log.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="494">
@@ -963,13 +888,6 @@
         </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="132">
-          <caret line="34" column="28" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="28" />
-        </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="38">
@@ -988,45 +906,72 @@
         </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/utils/Connection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="110" column="2" lean-forward="true" selection-start-line="110" selection-start-column="2" selection-end-line="110" selection-end-column="2" />
+        <state relative-caret-position="285">
+          <caret line="15" column="7" selection-start-line="15" selection-start-column="7" selection-end-line="15" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Logger.java">
+    <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="149">
-          <caret line="65" column="22" selection-start-line="65" selection-start-column="22" selection-end-line="65" selection-end-column="22" />
+        <state relative-caret-position="1856">
+          <caret line="113" column="29" selection-start-line="113" selection-start-column="29" selection-end-line="113" selection-end-column="29" />
         </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/lang/RuntimeException.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="237">
-          <caret line="340" column="48" selection-start-line="340" selection-start-column="48" selection-end-line="340" selection-end-column="48" />
+        <state relative-caret-position="133">
+          <caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#304#305#0" expanded="true" />
+            <element signature="e#355#356#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/location/Location.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="283">
-          <caret line="111" column="44" lean-forward="true" selection-start-line="111" selection-start-column="44" selection-end-line="111" selection-end-column="44" />
+        <state relative-caret-position="334">
+          <caret line="84" column="27" lean-forward="true" selection-start-line="84" selection-start-column="27" selection-end-line="84" selection-end-column="27" />
           <folding>
-            <element signature="e#8809#8810#0" expanded="true" />
-            <element signature="e#8830#8831#0" expanded="true" />
+            <element signature="e#2077#2078#0" expanded="true" />
+            <element signature="e#2128#2129#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Connection.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="285">
-          <caret line="15" column="7" selection-start-line="15" selection-start-column="7" selection-end-line="15" selection-end-column="7" />
+        <state relative-caret-position="305">
+          <caret line="102" column="43" selection-start-line="102" selection-start-column="25" selection-end-line="102" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/location/LocationManager.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="236">
+          <caret line="218" column="44" lean-forward="true" selection-start-line="218" selection-start-column="44" selection-end-line="218" selection-end-column="44" />
+          <folding>
+            <element signature="e#7511#7512#0" expanded="true" />
+            <element signature="e#7562#7563#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="51" column="65" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="65" />
+        </state>
+      </provider>
+      <provider editor-type-id="android-manifest" />
+    </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="19">
+          <caret line="82" column="26" selection-start-line="82" selection-start-column="26" selection-end-line="82" selection-end-column="26" />
         </state>
       </provider>
     </entry>
@@ -1037,78 +982,155 @@
         </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/utils/Logger.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="156" column="57" lean-forward="true" selection-start-line="156" selection-start-column="57" selection-end-line="156" selection-end-column="57" />
+        <state relative-caret-position="207">
+          <caret line="13" column="39" selection-start-line="13" selection-start-column="39" selection-end-line="13" selection-end-column="39" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/hardware/SensorManager.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="78" column="17" lean-forward="true" selection-start-line="78" selection-start-column="17" selection-end-line="78" selection-end-column="17" />
+        <state relative-caret-position="134">
+          <caret line="164" column="19" selection-start-line="164" selection-start-column="19" selection-end-line="164" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/Constants.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="1856">
-          <caret line="113" column="29" selection-start-line="113" selection-start-column="29" selection-end-line="113" selection-end-column="29" />
+        <state relative-caret-position="5092">
+          <caret line="288" column="72" selection-start-line="288" selection-start-column="72" selection-end-line="288" selection-end-column="72" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </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="570">
+          <caret line="49" column="58" selection-start-line="49" selection-start-column="58" selection-end-line="49" selection-end-column="58" />
+        </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">
+        <state relative-caret-position="1596">
+          <caret line="84" selection-start-line="84" selection-end-line="84" />
+        </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="76">
+          <caret line="42" column="13" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/version_code.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="19">
+          <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
         </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="528">
-          <caret line="355" column="40" lean-forward="true" selection-start-line="355" selection-start-column="40" selection-end-line="355" selection-end-column="40" />
+        <state relative-caret-position="150">
+          <caret line="323" selection-start-line="323" selection-end-line="323" />
+        </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="592">
+          <caret line="196" column="52" selection-start-line="196" selection-start-column="52" selection-end-line="196" selection-end-column="52" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2590#2591#0" expanded="true" />
-            <element signature="e#2626#2627#0" expanded="true" />
-            <element signature="e#7868#7869#0" expanded="true" />
-            <element signature="e#7902#7903#0" expanded="true" />
-            <element signature="e#10259#10260#0" expanded="true" />
-            <element signature="e#10294#10295#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/Initialize.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="41" column="50" selection-start-line="41" selection-start-column="50" selection-end-line="41" selection-end-column="50" />
+        </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="116">
+          <caret line="101" column="20" selection-start-line="101" selection-start-column="20" selection-end-line="101" selection-end-column="20" />
+        </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="487">
-          <caret line="526" column="56" selection-start-line="526" selection-start-column="56" selection-end-line="526" selection-end-column="56" />
+        <state relative-caret-position="38">
+          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
+        </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="134">
+          <caret line="183" column="26" selection-start-line="183" selection-start-column="26" selection-end-line="183" selection-end-column="26" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#14562#14840#0" expanded="true" />
-            <element signature="e#14839#14840#0" 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/service/SilentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="567" column="37" selection-start-line="567" selection-start-column="37" selection-end-line="567" selection-end-column="37" />
+        </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="202">
-          <caret line="479" column="70" selection-start-line="479" selection-start-column="70" selection-end-line="479" selection-end-column="70" />
+          <caret line="409" selection-start-line="409" selection-end-line="409" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#33472#33473#0" expanded="true" />
-            <element signature="e#33507#33508#0" expanded="true" />
-            <element signature="e#33560#33561#0" expanded="true" />
-            <element signature="e#33604#33605#0" expanded="true" />
-            <element signature="e#39340#39341#0" expanded="true" />
-            <element signature="e#39376#39377#0" expanded="true" />
+            <element signature="e#26099#26100#0" expanded="true" />
+            <element signature="e#26132#26133#0" expanded="true" />
+            <element signature="e#26190#26191#0" expanded="true" />
+            <element signature="e#26223#26224#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="607">
-          <caret line="282" column="41" lean-forward="true" selection-start-line="282" selection-start-column="41" selection-end-line="282" selection-end-column="41" />
+        <state relative-caret-position="279">
+          <caret line="156" column="25" lean-forward="true" selection-start-line="156" selection-start-column="25" selection-end-line="156" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="343">
+          <caret line="420" column="66" lean-forward="true" selection-start-line="420" selection-start-column="66" selection-end-line="420" selection-end-column="66" />
+          <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="2738">
+          <caret line="486" lean-forward="true" selection-start-line="486" selection-end-line="486" />
+          <folding>
+            <element signature="e#8041#8042#0" expanded="true" />
+            <element signature="e#8079#8080#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

diff --git a/app/app.iml b/app/app.iml
index f429dab..95ac0dd 100644 (file)
--- a/app/app.iml
+++ b/app/app.iml
@@ -19,7 +19,7 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />\r
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />\r
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />\r
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />\r
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />\r
         <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />\r
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />\r
       </configuration>\r
@@ -103,8 +103,8 @@
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />\r
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />\r
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\LauncherCtrl.jar:unspecified@jar" level="project" />\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\LauncherCtrl.jar:unspecified@jar" level="project" />\r
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar" level="project" />\r
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project" />\r
     <orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project" />\r
     <orderEntry type="library" name="Gradle: com.github.ChestnutPlus:TestModules:v1.0.16@aar" level="project" />\r

diff --git a/app/src/main/java/com/ic/protocol/GSensorListener.java b/app/src/main/java/com/ic/protocol/GSensorListener.java
index e029444..f99b7f8 100644 (file)
--- a/app/src/main/java/com/ic/protocol/GSensorListener.java
+++ b/app/src/main/java/com/ic/protocol/GSensorListener.java
@@ -99,7 +99,11 @@ public class GSensorListener implements SensorEventListener {
   \r
   private void sendAntiOff(int paramInt) {}\r
   \r
-  public int getStepCount() { return this.CURRENT_STEP; }\r
+  public int getStepCount() {\r
+    this.CURRENT_STEP=ICJniUtils.getStepCount();\r
+    return this.CURRENT_STEP;\r
+\r
+  }\r
   \r
   public PowerManager.WakeLock getWakeLock() {\r
    PowerManager.WakeLock wakeLock = ((PowerManager)this.mContext.getSystemService(Context.POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "MyWakelockTag_GSensorListener");\r

diff --git a/app/src/main/java/com/ic/protocol/LocationClient.java b/app/src/main/java/com/ic/protocol/LocationClient.java
index e9fb3d4..5e7b4ff 100644 (file)
--- a/app/src/main/java/com/ic/protocol/LocationClient.java
+++ b/app/src/main/java/com/ic/protocol/LocationClient.java
@@ -186,7 +186,7 @@ public class LocationClient {
     } \r
   }\r
   //计算运动并发送数据\r
-  private void handlerH12() {\r
+  private void updateStepCount() {\r
     int i = this.gSensorListener.getStepCount();\r
     runtime.setTotalStepCount(i);\r
     this.H12StepCount = DeviceInfoUtil.getStepCount((runtime.getContextProxy()).context);\r
@@ -471,6 +471,7 @@ public void updateCellInfo() {
   }\r
   \r
   public void onAlarm(PowerManager.WakeLock paramWakeLock) {\r
+    //每分钟更新一次数据\r
     runtime.preCellInfo = runtime.getCurrentCellInfo();\r
     runtime.preCdmaInfo = runtime.getCdmaInfo();\r
     runtime.preTime = TimeUtil.getSystemTime(System.currentTimeMillis() - (protocolMainServer.alarmCycle * 60 * 1000));\r
@@ -478,7 +479,7 @@ public void updateCellInfo() {
     stringBuilder.append("runtime.preCellInfo=");\r
     stringBuilder.append(runtime.preCellInfo);\r
     Logger.i(stringBuilder.toString());\r
-    handlerH12();//update StepCount\r
+    updateStepCount();//update StepCount\r
     this.gSensorListener.startListen(paramWakeLock);\r
     performAlarm(paramWakeLock);\r
   }\r

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 5004d6e..d726fee 100644 (file)
--- a/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
@@ -336,6 +336,160 @@ public class protocolAPIHelper {
 \r
     }\r
 \r
+\r
+    //重启\r
+\r
+\r
+    public static String AP18(String index){\r
+        return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP18))\r
+                .append(CMDSPLIT).append(index)\r
+                .append(CMDEND).toString();\r
+    }\r
+    public void handleBP18(Connection connection,String cmd) {\r
+\r
+        //    IWBP18,867155030001063,161723\r
+        String[] cmdlist=cmd.split(CMDSPLIT);\r
+        if (cmdlist.length==3) {\r
+\r
+            connection.send(genStringMessage("AP18",AP18(cmdlist[2])));\r
+\r
+        }\r
+    }\r
+    //恢复出厂设置\r
+\r
+\r
+    public static String AP17(String index){\r
+        return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP17))\r
+                .append(CMDSPLIT).append(index)\r
+                .append(CMDEND).toString();\r
+    }\r
+    public void handleBP17(Connection connection,String cmd) {\r
+\r
+        //    IWBP17,867155030001063,161723\r
+        String[] cmdlist=cmd.split(CMDSPLIT);\r
+        if (cmdlist.length==3) {\r
+\r
+            connection.send(genStringMessage("AP17",AP17(cmdlist[2])));\r
+\r
+        }\r
+    }\r
+\r
+    //关机\r
+\r
+\r
+    public static String AP31(String index){\r
+        return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP31))\r
+                .append(CMDSPLIT).append(index)\r
+                .append(CMDEND).toString();\r
+    }\r
+    public void handleBP31(Connection connection,String cmd) {\r
+\r
+        //    IWBP31,867155030001063,161723\r
+        String[] cmdlist=cmd.split(CMDSPLIT);\r
+        if (cmdlist.length==3) {\r
+\r
+            connection.send(genStringMessage("AP31",AP31(cmdlist[2])));\r
+\r
+        }\r
+    }\r
+\r
+        //设置SOS号码\r
+    public static String AP12(String index,String phNum1,String phNum2,String phNum3){\r
+        return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP12))\r
+                .append(CMDSPLIT).append(index)\r
+                .append(CMDSPLIT).append(phNum1)\r
+                .append(CMDSPLIT).append(phNum2)\r
+                .append(CMDSPLIT).append(phNum3)\r
+                .append(CMDEND).toString();\r
+    }\r
+\r
+    //设置SOS号码\r
+    public void handleBP12(Connection connection,String cmd){\r
+        //    IWBP12,353456789012345,080835,135XXXXXXXX,135XXXXXXXX,135XXXXXXXX#\r
+        String[] cmdlist=cmd.split(CMDSPLIT);\r
+        if (cmdlist.length>=3){\r
+            String index=cmdlist[2];\r
+            String phNum1=cmdlist.length==3?"":cmdlist[3];\r
+            String phNum2=cmdlist.length>3?(cmdlist.length==4?"":cmdlist[4]):"";\r
+            String phNum3=(cmdlist.length>4)?(cmdlist.length==5? "":cmdlist[5]):"";\r
+            Logger.i(new StringBuffer().append("get Emegency Numbs "+phNum1+","+phNum2+","+phNum3).toString());\r
+            connection.send(genStringMessage("AP12",AP12(index,phNum1,phNum2,phNum3)));\r
+\r
+        }else{\r
+            Logger.i(" BP12 format error!");\r
+        }\r
+    }\r
+\r
+\r
+    public static String  AP14(String index,String[] phnumbs){\r
+        return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP14))\r
+                .append(CMDSPLIT).append(index)\r
+                .append(CMDSPLIT).append(phnumbs[0])\r
+                .append(CMDSPLIT).append(phnumbs[1])\r
+                .append(CMDSPLIT).append(phnumbs[2])\r
+                .append(CMDSPLIT).append(phnumbs[3])\r
+                .append(CMDSPLIT).append(phnumbs[4])\r
+                .append(CMDSPLIT).append(phnumbs[5])\r
+                .append(CMDSPLIT).append(phnumbs[6])\r
+                .append(CMDSPLIT).append(phnumbs[7])\r
+                .append(CMDSPLIT).append(phnumbs[8])\r
+                .append(CMDSPLIT).append(phnumbs[9])\r
+                .append(CMDEND).toString();\r
+    }\r
+//设置通讯录，白名单\r
+    public void handleBP14(Connection connection,String cmd){\r
+//        IWBP14,867155030001063,357444,9b44529b|13554820016,,,,,,,,,\r
+/**\r
+ * IWBP14,353456789012345,080835,D3590D54|135xxxxxxxxxx, D3590D54|135xxxxxxxxxx, D3590D54|135xxxxxxxxxx, D3590D54|135xxxxxxxxxx, D3590D54|135xxxxxxxxxx, D3590D54|135xxxxxxxxxx, D3590D54|135xxxxxxxxxx, D3590D54|135xxxxxxxxxx, D3590D54|135xxxxxxxxxx, D3590D54|135xxxxxxxxxx#\r
+ */\r
+        String[] cmdlist=cmd.split(CMDSPLIT);\r
+        String[] phnums=new String[]{"","","","","","","","","",""};\r
+        StringBuffer sb=new StringBuffer().append("recv phone Numbs ");\r
+        if (cmdlist.length>=3){\r
+            switch (cmdlist.length){\r
+                case 13:\r
+                    phnums[9]=cmdlist[12];\r
+                    sb.append(phnums[9]).append(",");\r
+                case 12:\r
+                    phnums[8]=cmdlist[11];\r
+                    sb.append(phnums[8]).append(",");\r
+                case 11:\r
+                    phnums[7]=cmdlist[10];\r
+                    sb.append(phnums[7]).append(",");\r
+                case 10:\r
+                    phnums[6]=cmdlist[9];\r
+                    sb.append(phnums[6]).append(",");\r
+                case 9:\r
+                    phnums[5]=cmdlist[8];\r
+                    sb.append(phnums[5]).append(",");\r
+                case 8:\r
+                    phnums[4]=cmdlist[7];\r
+                    sb.append(phnums[4]).append(",");\r
+                case 7:\r
+                    phnums[3]=cmdlist[6];\r
+                    sb.append(phnums[3]).append(",");\r
+                case 6:\r
+                    phnums[2]=cmdlist[5];\r
+                    sb.append(phnums[2]).append(",");\r
+                case 5:\r
+                    phnums[1]=cmdlist[4];\r
+                    sb.append(phnums[1]).append(",");\r
+                case 4:\r
+                    phnums[0]=cmdlist[3];\r
+                    sb.append(phnums[0]).append(",");\r
+\r
+            }\r
+\r
+            String index=cmdlist[2];\r
+            Logger.i(sb.toString());\r
+            connection.send(genStringMessage("AP14",AP14(index,phnums)));\r
+\r
+        }else{\r
+            Logger.i(" BP14 format error!");\r
+        }\r
+\r
+    }\r
+\r
 //设置闹钟\r
     public void handleBP85(String cmd , Connection connection,Runtime runtime){\r
 //        IWBP85,867155030001063,155312,1,1,0235,12,1,1\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 922f37c..e196ff2 100644 (file)
--- a/app/src/main/java/com/ic/protocol/service/KeepAlive.java
+++ b/app/src/main/java/com/ic/protocol/service/KeepAlive.java
@@ -198,7 +198,7 @@ public class KeepAlive extends AbstractConnectionService {
       return true;\r
     } else if ("BP03".equals(paramStringMessage.cmd())){\r
       //每次心跳，查询一下 是否有语音消息需要接收。\r
-      paramConnection.send(protocolAPIHelper.genStringMessage("AP05",protocolAPIHelper.AP05(true)));\r
+//      paramConnection.send(protocolAPIHelper.genStringMessage("AP05",protocolAPIHelper.AP05(true)));\r
     }\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 fe8fb1e..b454087 100644 (file)
--- a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
+++ b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
@@ -345,7 +345,7 @@ public class protocolMainServer extends Service {
     }\r
     private void wakeUpFromSleep() {\r
         this.startAlarmCount = 0;\r
-        alarmCycle = 3;\r
+//        alarmCycle = 1;\r
         setAlarm(alarmCycle);\r
         this.runtime.getContextProxy().sendBroadcast(ACTION_EQC_ALARM, this.runtime);\r
         this.connection.open();\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 926c459..7c8fed9 100644 (file)
--- a/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
+++ b/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
@@ -98,6 +98,38 @@ public class NettyConnection implements Connection {
                                 //查询服务器语音 返回信息\r
                                 API.handleBP05(cmd);\r
                                 break;\r
+\r
+                            case BP12:\r
+                                //收到设置SOS号码\r
+                                API.handleBP12(NettyConnection.this,cmd);\r
+                                Logger.i("收到服务器设置SOS号码命令BP12");\r
+                                break;\r
+                            case BP14:\r
+                                //收到设置白名单号码\r
+                                API.handleBP14(NettyConnection.this,cmd);\r
+                                Logger.i("收到服务器设置白名单号码命令BP14");\r
+                                break;\r
+\r
+                            case BP17:\r
+                                //收到恢复出厂设置\r
+                                API.handleBP17(NettyConnection.this,cmd);\r
+                                Logger.i("收到服务器恢复出厂设置命令BP17");\r
+                                DeliverCMDMessageToSystem("FactoryReset",cmd);//通知下面线程状态变化\r
+                                break;\r
+\r
+                            case BP18:\r
+                                //收到重启\r
+                                API.handleBP18(NettyConnection.this,cmd);\r
+                                Logger.i("收到服务器重启命令BP18");\r
+                                DeliverCMDMessageToSystem("Reboot",cmd);//通知下面线程状态变化\r
+                                break;\r
+\r
+                            case BP31:\r
+                                //收到关机\r
+                                API.handleBP31(NettyConnection.this,cmd);\r
+                                Logger.i("收到服务器关机命令BP31");\r
+                                DeliverCMDMessageToSystem("poweroff",cmd);//通知下面线程状态变化\r
+                                break;\r
                         }\r
 \r
                         return ret;\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 9a7e295..d40b7b4 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
 #Thu Jan 16 18:40:41 CST 2020\r
-VERSION_CODE=327\r
+VERSION_CODE=340\r

diff --git a/local.properties b/local.properties
index 43485bd..28f1297 100644 (file)
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.\r
 # For customization when using a Version Control System, please read the\r
 # header note.\r
-#Thu Jan 09 11:58:34 CST 2020\r
-sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk\r
+#Fri Jan 17 00:04:53 CST 2020\r
+sdk.dir=C\:\\Users\\Admin\\AppData\\Local\\Android\\Sdk\r