From: snickersun <scy@incartech.cn>
Date: Mon, 6 Jan 2020 15:20:53 +0000 (+0800)
Subject: update  socket and alarm timer work now
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=c0c8ed5ce7fc72ee0ecfccab91d6ddaad05cc6bd;p=icsupport.git

update  socket and alarm timer work now
---

diff --git a/.gradle/2.14.1/taskArtifacts/cache.properties.lock b/.gradle/2.14.1/taskArtifacts/cache.properties.lock
index ed0f7caf..9bcadf1c 100644
Binary files a/.gradle/2.14.1/taskArtifacts/cache.properties.lock and b/.gradle/2.14.1/taskArtifacts/cache.properties.lock differ
diff --git a/.gradle/2.14.1/taskArtifacts/fileHashes.bin b/.gradle/2.14.1/taskArtifacts/fileHashes.bin
index fe6475dc..81625ae4 100644
Binary files a/.gradle/2.14.1/taskArtifacts/fileHashes.bin and b/.gradle/2.14.1/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin
index 605fd469..15aca6ff 100644
Binary files a/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin and b/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin
index b97dc269..67abdd21 100644
Binary files a/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin and b/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin differ
diff --git a/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin
index 151ad464..92ed880f 100644
Binary files a/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin and b/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin differ
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index c2eb2949..39c32a68 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 01406ff8..1bc2e43a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,41 +11,30 @@
     <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3cab4ae3-9bca-4cb9-b7a2-2861bcc36b52" name="Default Changelist" comment="">
+    <list default="true" id="3cab4ae3-9bca-4cb9-b7a2-2861bcc36b52" name="Default Changelist" comment="20200104">
       <change beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/cache.properties.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/cache.properties.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileHashes.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____local_jars___E__android_workspace_icsupport_app_libs_okio_2_4_3_jar_unspecified_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_okio_2_4_3_jar_unspecified_jar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_annotations_25_1_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_annotations_25_1_0_jar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ICContentProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ICContentProvider.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/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/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/AudioService.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/AudioService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/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/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/NetworkObservable.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NetworkObservable.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/SimSignalUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/SimSignalUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/icsupport.iml" beforeDir="false" afterPath="$PROJECT_DIR$/icsupport.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/okio/okio.iml" beforeDir="false" afterPath="$PROJECT_DIR$/okio/okio.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/settings.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/settings.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.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$/library/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/library/build.gradle" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -84,97 +73,97 @@
   </component>
   <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/bean/StringMessage.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-209">
-              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <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/NettyConnection.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3459">
-              <caret line="480" column="55" selection-start-line="480" selection-start-column="55" selection-end-line="480" selection-end-column="55" />
+            <state relative-caret-position="205">
+              <caret line="187" column="33" lean-forward="true" selection-start-line="187" selection-start-column="33" selection-end-line="187" selection-end-column="33" />
               <folding>
-                <element signature="e#7211#8727#0" expanded="true" />
-                <element signature="e#8726#8727#0" expanded="true" />
-                <element signature="e#28402#28403#0" expanded="true" />
-                <element signature="e#28499#28500#0" expanded="true" />
-                <element signature="e#29332#29333#0" expanded="true" />
-                <element signature="e#29370#29371#0" expanded="true" />
-                <element signature="e#32566#32567#0" expanded="true" />
-                <element signature="e#32593#32594#0" expanded="true" />
-                <element signature="e#35757#35758#0" expanded="true" />
+                <element signature="e#4682#4683#0" expanded="true" />
+                <element signature="e#4771#4772#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/Context.class">
+        <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="-114">
-              <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
+            <state relative-caret-position="130">
+              <caret line="44" column="3" selection-start-line="44" selection-start-column="3" selection-end-line="46" selection-end-column="48" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/Service.class">
+        <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="190">
-              <caret line="20" column="44" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="44" />
+            <state relative-caret-position="24">
+              <caret line="579" column="25" selection-start-line="579" selection-start-column="25" selection-end-line="579" selection-end-column="25" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Alarm.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="38">
-              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+            <state relative-caret-position="471">
+              <caret line="72" column="75" lean-forward="true" selection-start-line="72" selection-start-column="75" selection-end-line="72" selection-end-column="75" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.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="133">
-              <caret line="12" column="36" selection-start-line="12" selection-start-column="36" selection-end-line="12" selection-end-column="36" />
+            <state relative-caret-position="228">
+              <caret line="581" column="50" selection-start-line="581" selection-start-column="50" selection-end-line="581" selection-end-column="50" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java">
+        <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="229">
-              <caret line="255" column="7" lean-forward="true" selection-start-line="255" selection-start-column="7" selection-end-line="255" selection-end-column="7" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="258">
+              <caret line="140" column="88" selection-start-line="140" selection-start-column="88" selection-end-line="140" selection-end-column="88" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java">
+        <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="513">
-              <caret line="32" column="2" selection-start-line="32" selection-start-column="2" selection-end-line="32" selection-end-column="2" />
+            <state relative-caret-position="177">
+              <caret line="50" column="43" selection-start-line="50" selection-start-column="43" selection-end-line="50" selection-end-column="43" />
+              <folding>
+                <element signature="e#17063#17104#0" expanded="true" />
+                <element signature="e#17243#17284#0" expanded="true" />
+                <element signature="e#17375#17416#0" expanded="true" />
+                <element signature="e#17510#17551#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/Deliver.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CustomDialog.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="143">
-              <caret line="43" column="24" selection-start-line="43" selection-start-column="24" selection-end-line="43" selection-end-column="24" />
+            <state relative-caret-position="228">
+              <caret line="119" column="21" selection-start-line="119" selection-start-column="21" selection-end-line="119" selection-end-column="21" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -183,10 +172,13 @@
         </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/utils/CustomNotification.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1627">
-              <caret line="120" column="41" selection-start-line="120" selection-start-column="41" selection-end-line="120" selection-end-column="41" />
+            <state relative-caret-position="2033">
+              <caret line="107" column="42" lean-forward="true" selection-start-line="86" selection-start-column="8" selection-end-line="107" selection-end-column="42" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -202,36 +194,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>FLAG_UPDATE_CURRENT</find>
-      <find>sc</find>
-      <find>134217728</find>
-      <find>EqcAlgorithmInterfaceMethod1</find>
-      <find>waitForWifiListReply</find>
-      <find>268435456</find>
-      <find>simState</find>
-      <find>PassData</find>
-      <find>setSignalStrength</find>
-      <find>268435462</find>
-      <find>getInstance</find>
-      <find>getStatusBarIconState</find>
-      <find>isscre</find>
-      <find>cachedir</find>
-      <find>getExternalCacheDir</find>
-      <find>NetworkObservable</find>
-      <find>setHostAndPort</find>
-      <find>port</find>
-      <find>connectServer</find>
-      <find>MyThread2</find>
-      <find>is_allowed_in_sleep_mode</find>
-      <find>onHeartAlarm</find>
-      <find>LocationClient</find>
-      <find>rx</find>
-      <find>queue</find>
-      <find>onStartCommand</find>
+      <find>ACTION_ALARM</find>
+      <find>heart</find>
+      <find>isHeartrRateExists</find>
       <find>ACTION_EQC_ALARM</find>
-      <find>newAPi</find>
-      <find>send_at_to_update_lbs</find>
-      <find>cmcm_call_eiot_into_powersave_mode</find>
+      <find>mProtocolAPI</find>
+      <find>AP00</find>
+      <find>strncpy</find>
+      <find>Echo</find>
+      <find>message</find>
+      <find>new_socket</find>
+      <find>send</find>
+      <find>mDeliver</find>
+      <find>setHeartAlarm</find>
+      <find>ACTION_STEP_COUNT_ALARM</find>
+      <find>SLEEP_ALARM</find>
+      <find>WAKE_ALARM</find>
+      <find>setAlarm</find>
+      <find>YUN_ALARM_CHANGE</find>
+      <find>SimSignalUtil</find>
+      <find>queue</find>
+      <find>SocketStatus</find>
+      <find>socketStatusListener</find>
+      <find>Stat</find>
+      <find>ProcessReceiver</find>
+      <find>CustomNotification</find>
+      <find>setWakeupAlarm</find>
+      <find>Open</find>
+      <find>ALARM</find>
+      <find>setExact</find>
+      <find>status</find>
     </findStrings>
     <replaceStrings>
       <replace>CMDSPLIT</replace>
@@ -246,9 +238,7 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <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/bean/serverStatus.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/location.java" />
         <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Config.java" />
@@ -264,12 +254,8 @@
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Update.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/VoiceContent.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ParseUpdate.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/PassData.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/AudioService.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.java" />
-        <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/BootCompleteReceiver.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/CrashHandler.java" />
         <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
@@ -277,23 +263,37 @@
         <option value="$PROJECT_DIR$/library/src/main/java/com/eiot/watch_lib/LauncherCtrl.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ICContentProvider.java" />
         <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/utils/NetworkObservable.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/MainActivity.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" />
         <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/adapter/protocolAPIHelper.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java" />
+        <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NetworkObservable.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/bean/heartRateStatus.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/AlarmWakeUp.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ContextProxy.java" />
+        <option value="D:/incar/Downloads/test_srv.c" />
+        <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/service/Initialize.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RxSocket.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/utils/NettyConnection.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CustomNotification.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CameraUtil.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CustomDialog.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/SynchronousTime.java" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="459" />
-    <option name="y" value="295" />
+    <option name="x" value="521" />
+    <option name="y" value="34" />
     <option name="width" value="1278" />
     <option name="height" value="728" />
   </component>
@@ -350,31 +350,9 @@
               <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="values" type="ddeffd01:AndroidResFolderTypeNode" />
-            </path>
-            <path>
-              <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
-              <item name="library" type="feadf853:AndroidModuleNode" />
-            </path>
             <path>
               <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
               <item name="library" type="feadf853:AndroidModuleNode" />
-              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
-            </path>
-            <path>
-              <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
-              <item name="library" type="feadf853:AndroidModuleNode" />
-              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
-              <item name="watch_lib" type="cbb59c9e:AndroidPsiDirectoryNode" />
             </path>
             <path>
               <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
@@ -394,24 +372,28 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="SHOW_ALL_PROCESSES" value="false" />
     <property name="android.sdk.path" value="E:/Android/sdk" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../eqclauncher/library" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils" />
     <property name="not.eligible.for.single.variant.sync" value="true" />
     <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="AndroidSdkUpdater" />
   </component>
+  <component name="PsdUISettings">
+    <option name="LAST_EDITED_BUILD_TYPE" value="release" />
+  </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.ic.protocol" />
       <recent name="com.ic.protocol.utils" />
+      <recent name="com.ic.protocol.service" />
+      <recent name="com.ic.protocol" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\workspace\icsupport\app\src\main\java\com\ic\protocol\utils" />
       <recent name="D:\workspace\icsupport\app" />
       <recent name="D:\workspace\icsupport\app\src\main\java\com\ic\protocol" />
       <recent name="E:\android_workspace\icsupport\app\src\main\java\com\ic\protocol\bean" />
       <recent name="E:\android_workspace\icsupport\app\src\main\java\com\ic\protocol\service" />
-      <recent name="E:\android_workspace\icsupport\app\src\main\java\com\ic\protocol" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -520,9 +502,10 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1858" height="1096" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
-      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.49541286" visible="true" weight="0.22135706" />
+      <window_info id="Captures" order="0" sideWeight="0.50390625" side_tool="true" visible="true" weight="0.19299221" />
+      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.49609375" visible="true" weight="0.19299221" />
       <window_info id="Structure" order="2" side_tool="true" />
       <window_info id="Favorites" order="3" sideWeight="0.5045872" side_tool="true" weight="0.3293461" />
       <window_info id="Build Variants" order="4" side_tool="true" />
@@ -531,15 +514,15 @@
       <window_info id="Resources Explorer" order="7" />
       <window_info id="Capture Tool" order="8" />
       <window_info anchor="bottom" id="Run" order="0" />
-      <window_info active="true" anchor="bottom" id="Logcat" order="1" visible="true" weight="0.52286905" />
-      <window_info anchor="bottom" id="TODO" order="2" weight="0.32917964" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.2765073" />
+      <window_info active="true" anchor="bottom" id="Logcat" order="1" visible="true" weight="0.46777546" />
+      <window_info anchor="bottom" id="TODO" order="2" weight="0.32848233" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.42099792" />
       <window_info anchor="bottom" id="Terminal" order="4" weight="0.32744282" />
       <window_info anchor="bottom" id="Event Log" order="5" side_tool="true" />
-      <window_info anchor="bottom" id="Version Control" order="6" />
+      <window_info anchor="bottom" id="Version Control" order="6" weight="0.32952183" />
       <window_info anchor="bottom" id="Build" order="7" weight="0.32952183" />
       <window_info anchor="bottom" id="Android Profiler" order="8" />
-      <window_info anchor="bottom" id="Find" order="9" weight="0.4864865" />
+      <window_info anchor="bottom" id="Find" order="9" weight="0.35862786" />
       <window_info anchor="right" id="Capture Analysis" order="0" />
       <window_info anchor="right" id="Gradle" order="1" weight="0.3293461" />
       <window_info anchor="right" id="Theme Preview" order="2" />
@@ -561,11 +544,70 @@
           <properties />
           <option name="timeStamp" value="2" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java</url>
+          <line>298</line>
+          <properties />
+          <option name="timeStamp" value="41" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java</url>
+          <line>301</line>
+          <properties />
+          <option name="timeStamp" value="44" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java</url>
+          <line>300</line>
+          <properties />
+          <option name="timeStamp" value="45" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java</url>
+          <line>25</line>
+          <properties />
+          <option name="timeStamp" value="46" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java</url>
+          <line>129</line>
+          <properties />
+          <option name="timeStamp" value="47" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java</url>
+          <line>128</line>
+          <properties />
+          <option name="timeStamp" value="48" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java</url>
+          <line>124</line>
+          <properties />
+          <option name="timeStamp" value="49" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java</url>
+          <line>73</line>
+          <properties />
+          <option name="timeStamp" value="50" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java</url>
+          <line>72</line>
+          <properties />
+          <option name="timeStamp" value="52" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="debuggerHistoryManager">
     <expressions id="watch">
+      <expression>
+        <expression-string>Build.VERSION.SDK_INT &gt;= 19</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
       <expression>
         <expression-string>&quot;33&quot;.split(&quot;#&quot;)</expression-string>
         <language-id>JAVA</language-id>
@@ -594,427 +636,449 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/DeviceInfoUtil.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="-2570">
-          <caret line="18" column="39" selection-start-line="18" selection-start-column="39" selection-end-line="18" selection-end-column="39" />
-          <folding>
-            <element signature="e#5048#5049#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="249">
+          <caret line="30" column="21" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Android/sdk/sources/android-25/android/provider/Settings.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/FileCache.java">
+    <entry file="file://$PROJECT_DIR$/app/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="63" column="16" selection-start-line="63" selection-start-column="16" selection-end-line="63" selection-end-column="16" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="171">
+          <caret line="9" column="30" lean-forward="true" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/Service.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="190">
+          <caret line="20" column="44" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Android/sdk/sources/android-25/android/app/PendingIntent.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Update.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/BootCompleteReceiver.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="447">
-          <caret line="247" column="30" selection-start-line="247" selection-start-column="30" selection-end-line="247" selection-end-column="30" />
+        <state relative-caret-position="228">
+          <caret line="12" column="3" lean-forward="true" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/VoiceContent.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/net/NetworkInfo.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="465">
-          <caret line="38" selection-start-line="38" selection-end-line="38" />
+        <state relative-caret-position="143">
+          <caret line="42" column="19" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="19" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#961#962#0" expanded="true" />
+            <element signature="e#1012#1013#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/Intent.class">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="158">
-          <caret line="283" column="50" selection-start-line="283" selection-start-column="28" selection-end-line="283" selection-end-column="50" />
+        <state relative-caret-position="230">
+          <caret line="250" column="62" lean-forward="true" selection-start-line="250" selection-start-column="62" selection-end-line="250" selection-end-column="62" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/lang/String.class">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/Context.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2109">
-          <caret line="170" column="15" selection-start-line="170" selection-start-column="15" selection-end-line="170" selection-end-column="15" />
-          <folding>
-            <element signature="e#4574#4575#0" expanded="true" />
-            <element signature="e#4625#4626#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="-114">
+          <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/PassData.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Config.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="25" column="10" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="38">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ParseUpdate.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ConnectionListener.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="323" column="13" lean-forward="true" selection-start-line="323" selection-start-column="13" selection-end-line="323" selection-end-column="13" />
+        <state relative-caret-position="95">
+          <caret line="5" column="35" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="35" />
+        </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="493">
+          <caret line="601" column="8" selection-start-line="601" selection-start-column="8" selection-end-line="601" 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/service/base/AbstractInvokeHandlerService.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/ContextWrapper.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
+        <state relative-caret-position="222">
+          <caret line="368" column="18" selection-start-line="368" selection-start-column="18" selection-end-line="368" selection-end-column="18" />
+          <folding>
+            <element signature="e#10776#10777#0" expanded="true" />
+            <element signature="e#10827#10828#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/Intent.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="87">
-          <caret line="68" column="19" selection-start-line="68" selection-start-column="19" selection-end-line="68" selection-end-column="19" />
+        <state relative-caret-position="195">
+          <caret line="576" column="18" selection-start-line="576" selection-start-column="18" selection-end-line="576" selection-end-column="18" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#25167#25168#0" expanded="true" />
+            <element signature="e#25218#25219#0" expanded="true" />
+            <element signature="e#31946#31947#0" expanded="true" />
+            <element signature="e#31997#31998#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/AudioService.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/PendingIntent.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="85" column="33" selection-start-line="85" selection-start-column="33" selection-end-line="85" selection-end-column="33" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="222">
+          <caret line="50" column="32" selection-start-line="50" selection-start-column="32" selection-end-line="50" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
-      <provider editor-type-id="android-manifest" />
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/AlarmManager.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="134" selection-start-line="134" selection-end-line="134" />
+        <state relative-caret-position="222">
+          <caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/os/PowerManager.class">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="14" column="57" lean-forward="true" selection-start-line="14" selection-start-column="57" selection-end-line="14" selection-end-column="57" />
+        <state relative-caret-position="271">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+          <folding>
+            <element signature="e#407#408#0" expanded="true" />
+            <element signature="e#434#435#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NetworkObservable.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="703">
-          <caret line="37" column="2" selection-start-line="37" selection-start-column="2" selection-end-line="37" selection-end-column="2" />
+        <state relative-caret-position="95">
+          <caret line="16" column="74" lean-forward="true" selection-start-line="16" selection-start-column="74" selection-end-line="16" selection-end-column="74" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#2697#2698#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="2" column="90" selection-start-line="2" selection-start-column="90" selection-end-line="2" selection-end-column="90" />
+        <state relative-caret-position="133">
+          <caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/BootCompleteReceiver.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/util/Calendar.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="12" column="3" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
+        <state relative-caret-position="253">
+          <caret line="116" column="20" selection-start-line="116" selection-start-column="20" selection-end-line="116" selection-end-column="20" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#3672#3673#0" expanded="true" />
+            <element signature="e#3723#3724#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/pm/PackageManager.class">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/lang/Character.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="35">
-          <caret line="158" column="60" selection-start-line="158" selection-start-column="60" selection-end-line="158" selection-end-column="60" />
+        <state relative-caret-position="196">
+          <caret line="58" column="29" selection-start-line="58" selection-start-column="29" selection-end-line="58" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ICApplication.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ContextProxy.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="344">
-          <caret line="83" column="38" selection-start-line="83" selection-start-column="38" selection-end-line="83" selection-end-column="38" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="92">
+          <caret line="424" column="23" selection-start-line="428" selection-start-column="17" selection-end-line="428" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/library/src/main/java/com/eiot/watch_lib/LauncherCtrl.java">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/library/src/main/java/com/eiot/watch_lib/LauncherCtrl.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="2185">
-          <caret line="123" column="5" selection-start-line="123" selection-start-column="5" selection-end-line="123" selection-end-column="5" />
+        <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/DBHelper.java">
+    <entry file="file://D:/incar/Downloads/tcp_server.c">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="959" column="3" lean-forward="true" selection-start-line="959" selection-start-column="3" selection-end-line="959" selection-end-column="3" />
+        <state relative-caret-position="-4712">
+          <caret line="16" column="1" lean-forward="true" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/ContentProvider.class">
+    <entry file="file://D:/incar/Downloads/test_srv.c">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" />
-          <folding>
-            <element signature="e#782#783#0" expanded="true" />
-            <element signature="e#833#834#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="95">
+          <caret line="407" column="51" lean-forward="true" selection-start-line="407" selection-start-column="51" selection-end-line="407" selection-end-column="51" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ICContentProvider.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="-301">
-          <caret line="137" column="83" selection-start-line="137" selection-start-column="83" selection-end-line="137" selection-end-column="83" />
+        <state relative-caret-position="-310">
+          <caret line="93" column="2" lean-forward="true" selection-start-line="93" selection-start-column="2" selection-end-line="93" selection-end-column="2" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/CrashHandler.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/telephony/TelephonyManager.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="56">
-          <caret line="98" selection-start-line="98" selection-end-line="108" selection-end-column="54" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#3004#3029#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="218">
+          <caret line="66" column="43" selection-start-line="66" selection-start-column="28" selection-end-line="66" selection-end-column="43" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/ContextWrapper.class">
+    <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="320">
+          <caret line="220" column="43" lean-forward="true" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <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="216">
-          <caret line="165" lean-forward="true" selection-start-line="165" selection-end-line="165" />
+        <state relative-caret-position="282">
+          <caret line="90" column="70" lean-forward="true" selection-start-line="90" selection-start-column="70" selection-end-line="90" selection-end-column="70" />
           <folding>
-            <element signature="e#4410#4411#0" expanded="true" />
-            <element signature="e#4461#4462#0" expanded="true" />
+            <element signature="e#612#1023#0" expanded="true" />
+            <element signature="e#1022#1023#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.0/d4a0c3bc36ac0ece84cdf7aa08b18c344b467238/rxjava-1.1.0-sources.jar!/rx/subjects/BehaviorSubject.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Util.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="154" column="16" selection-start-line="154" selection-start-column="16" selection-end-line="154" selection-end-column="16" />
+        <state relative-caret-position="196">
+          <caret line="375" column="24" selection-start-line="375" selection-start-column="24" selection-end-line="375" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NetworkObservable.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="1102">
-          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+        <state relative-caret-position="234">
+          <caret line="247" column="76" selection-start-line="247" selection-start-column="66" selection-end-line="247" selection-end-column="76" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Connection.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="133">
-          <caret line="7" column="7" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="7" />
+        <state relative-caret-position="350">
+          <caret line="25" column="62" selection-start-line="25" selection-start-column="62" selection-end-line="25" selection-end-column="62" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/BaseService.java">
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.0/d4a0c3bc36ac0ece84cdf7aa08b18c344b467238/rxjava-1.1.0-sources.jar!/rx/Observable.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+        <state relative-caret-position="19">
+          <caret line="7927" selection-start-line="7927" selection-end-line="7927" />
+          <folding>
+            <element signature="e#412406#412407#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.java">
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.0/d4a0c3bc36ac0ece84cdf7aa08b18c344b467238/rxjava-1.1.0-sources.jar!/rx/observers/SafeSubscriber.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="155">
-          <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="4" />
+        <state relative-caret-position="161">
+          <caret line="138" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java">
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.0/d4a0c3bc36ac0ece84cdf7aa08b18c344b467238/rxjava-1.1.0-sources.jar!/rx/internal/schedulers/ScheduledAction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="59" selection-start-line="59" selection-end-line="59" />
+        </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="165">
-          <caret line="224" column="25" lean-forward="true" selection-start-line="224" selection-start-column="25" selection-end-line="224" selection-end-column="25" />
+        <state relative-caret-position="190">
+          <caret line="391" column="17" selection-start-line="391" selection-start-column="8" selection-end-line="391" selection-end-column="17" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="e#2519#2520#0" expanded="true" />
+            <element signature="e#2555#2556#0" expanded="true" />
+            <element signature="e#7855#7856#0" expanded="true" />
+            <element signature="e#7889#7890#0" expanded="true" />
+            <element signature="e#10281#10282#0" expanded="true" />
+            <element signature="e#10316#10317#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/lang/Enum.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        <state relative-caret-position="161">
+          <caret line="14" column="24" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
+          <folding>
+            <element signature="e#373#374#0" expanded="true" />
+            <element signature="e#424#425#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/FileOutputUtil.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/StringMessage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-22">
-          <caret line="91" column="69" lean-forward="true" selection-start-line="91" selection-start-column="69" selection-end-line="91" selection-end-column="69" />
+        <state relative-caret-position="190">
+          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/SimSignalUtil.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Logger.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="922">
-          <caret line="93" lean-forward="true" selection-start-line="93" selection-end-line="93" />
+        <state relative-caret-position="180">
+          <caret line="42" column="32" lean-forward="true" selection-start-line="42" selection-start-column="32" selection-end-line="42" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/os/PowerManager.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="159">
-          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        <state relative-caret-position="228">
+          <caret line="15" column="50" lean-forward="true" selection-start-line="15" selection-start-column="50" selection-end-line="15" selection-end-column="50" />
         </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/utils/CameraUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="371">
+          <caret line="74" column="30" selection-start-line="74" selection-start-column="30" selection-end-line="74" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <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="193">
-          <caret line="201" column="16" selection-start-line="201" selection-start-column="16" selection-end-line="201" selection-end-column="16" />
+        <state relative-caret-position="177">
+          <caret line="50" column="43" selection-start-line="50" selection-start-column="43" selection-end-line="50" selection-end-column="43" />
           <folding>
-            <element signature="e#3182#3183#0" expanded="true" />
-            <element signature="e#3271#3272#0" expanded="true" />
+            <element signature="e#17063#17104#0" expanded="true" />
+            <element signature="e#17243#17284#0" expanded="true" />
+            <element signature="e#17375#17416#0" expanded="true" />
+            <element signature="e#17510#17551#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/utils/CustomNotification.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="693" selection-start-line="693" selection-end-line="693" />
+        <state relative-caret-position="2033">
+          <caret line="107" column="42" lean-forward="true" selection-start-line="86" selection-start-column="8" selection-end-line="107" selection-end-column="42" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/telephony/TelephonyManager.class">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CustomDialog.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="95" column="24" selection-start-line="95" selection-start-column="24" selection-end-line="95" selection-end-column="24" />
+        <state relative-caret-position="228">
+          <caret line="119" column="21" selection-start-line="119" selection-start-column="21" selection-end-line="119" selection-end-column="21" />
           <folding>
-            <element signature="e#4052#4053#0" expanded="true" />
-            <element signature="e#4103#4104#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+      <provider editor-type-id="android-manifest" />
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="245" column="65" selection-start-line="245" selection-start-column="65" selection-end-line="245" selection-end-column="65" />
+        <state relative-caret-position="258">
+          <caret line="140" column="88" selection-start-line="140" selection-start-column="88" selection-end-line="140" selection-end-column="88" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/StringMessage.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="-209">
-          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        <state relative-caret-position="161">
+          <caret line="70" column="25" selection-start-line="70" selection-start-column="25" selection-end-line="70" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/lang/String.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="43" column="24" selection-start-line="43" selection-start-column="24" selection-end-line="43" selection-end-column="24" />
+        <state relative-caret-position="161">
+          <caret line="170" column="15" selection-start-line="170" selection-start-column="15" selection-end-line="170" selection-end-column="15" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#4574#4575#0" expanded="true" />
+            <element signature="e#4625#4626#0" expanded="true" />
           </folding>
         </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="-1627">
-          <caret line="120" column="41" selection-start-line="120" selection-start-column="41" selection-end-line="120" selection-end-column="41" />
-        </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="513">
-          <caret line="32" column="2" selection-start-line="32" selection-start-column="2" selection-end-line="32" selection-end-column="2" />
-        </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/service/Deliver.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="229">
-          <caret line="255" column="7" lean-forward="true" selection-start-line="255" selection-start-column="7" selection-end-line="255" selection-end-column="7" />
+        <state relative-caret-position="24">
+          <caret line="579" column="25" selection-start-line="579" selection-start-column="25" selection-end-line="579" selection-end-column="25" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.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="133">
-          <caret line="12" column="36" selection-start-line="12" selection-start-column="36" selection-end-line="12" selection-end-column="36" />
+        <state relative-caret-position="471">
+          <caret line="72" column="75" lean-forward="true" selection-start-line="72" selection-start-column="75" selection-end-line="72" selection-end-column="75" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Alarm.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.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 relative-caret-position="57">
+          <caret line="23" column="42" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/Service.class">
+    <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="20" column="44" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="44" />
+        <state relative-caret-position="228">
+          <caret line="581" column="50" selection-start-line="581" selection-start-column="50" selection-end-line="581" selection-end-column="50" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/Context.class">
+    <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="-114">
-          <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
+        <state relative-caret-position="130">
+          <caret line="44" column="3" selection-start-line="44" selection-start-column="3" selection-end-line="46" selection-end-column="48" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3459">
-          <caret line="480" column="55" selection-start-line="480" selection-start-column="55" selection-end-line="480" selection-end-column="55" />
+        <state relative-caret-position="205">
+          <caret line="187" column="33" lean-forward="true" selection-start-line="187" selection-start-column="33" selection-end-line="187" selection-end-column="33" />
           <folding>
-            <element signature="e#7211#8727#0" expanded="true" />
-            <element signature="e#8726#8727#0" expanded="true" />
-            <element signature="e#28402#28403#0" expanded="true" />
-            <element signature="e#28499#28500#0" expanded="true" />
-            <element signature="e#29332#29333#0" expanded="true" />
-            <element signature="e#29370#29371#0" expanded="true" />
-            <element signature="e#32566#32567#0" expanded="true" />
-            <element signature="e#32593#32594#0" expanded="true" />
-            <element signature="e#35757#35758#0" expanded="true" />
+            <element signature="e#4682#4683#0" expanded="true" />
+            <element signature="e#4771#4772#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/app/src/main/java/com/ic/protocol/LocationClient.java b/app/src/main/java/com/ic/protocol/LocationClient.java
index 3ec0e15f..c7b343c2 100644
--- a/app/src/main/java/com/ic/protocol/LocationClient.java
+++ b/app/src/main/java/com/ic/protocol/LocationClient.java
@@ -339,18 +339,18 @@ public class LocationClient {
   }
   
   private void sendBatteryNotification() {
-//    if (runtime.getHaveBatteryChange() && !runtime.getBatterychanging() && !this.batteryNotification) {
+    if (runtime.getHaveBatteryChange() && !runtime.getBatterychanging() && !this.batteryNotification) {
 //      connection.send(API.H05(runtime, "2"));
-//      this.batteryNotification = true;
-//    }
-//    if (runtime.getBatteryLow() && !runtime.getBatterychanging() && !this.batteryLowNotification) {
+      this.batteryNotification = true;
+    }
+    if (runtime.getBatteryLow() && !runtime.getBatterychanging() && !this.batteryLowNotification) {
 //      connection.send(API.H05(runtime, "1"));
-//      this.batteryLowNotification = true;
-//    }
-//    if (runtime.getBatterychanging()) {
-//      this.batteryNotification = false;
-//      this.batteryLowNotification = false;
-//    }
+      this.batteryLowNotification = true;
+    }
+    if (runtime.getBatterychanging()) {
+      this.batteryNotification = false;
+      this.batteryLowNotification = false;
+    }
   }
   
   private static StringMessage setNewKey(StringMessage paramStringMessage, String paramString) {
@@ -518,6 +518,7 @@ public class LocationClient {
     this.mLbsHelper.setOnWiFiInfoListener(new LBSHelper.OnWiFiInfoListener() {
           public void getWifiInfoCallBack(String param1String) {
 //            LocationClient.access$002(true);
+//            LocationClient.this.
             runtime.currentWifiInfo = param1String;
           }
         });
@@ -525,10 +526,10 @@ public class LocationClient {
   
   @TargetApi(Build.VERSION_CODES.FROYO)
   public void EqcAlgorithmInterfaceMethod3() {
-//    if (Deliver.is_active_location) {
-//      Deliver.is_active_location = false;
-//      getLocationWakeLock();
-//    }
+    if (Deliver.is_active_location) {
+      Deliver.is_active_location = false;
+      getLocationWakeLock();
+    }
     Settings.Secure.setLocationProviderEnabled(runtime.getContextProxy().getResolver(), GPS_PROVIDER, false);
     Single.just(null).observeOn(AndroidSchedulers.mainThread()).subscribe(new Action1<Object>() {
           public void call(Object param1Object) { LocationClient.this.nmeaListener.stopListen(); }
@@ -608,61 +609,61 @@ public class LocationClient {
   }
   
   public void resolveResult(int paramInt1, int paramInt2, int paramInt3, double paramDouble1, double paramDouble2, double paramDouble3, float paramFloat1, float paramFloat2, int paramInt4, float paramFloat3, long paramLong1, long paramLong2, double paramDouble4, double paramDouble5, int paramInt5, long paramLong3, int paramInt6) {
-//    int i = SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LACATION_CYCLE, 3);
-//    String str1 = runtime.getLatitude();
-//    String str2 = runtime.getLongitude();
-//    paramLong2 = runtime.getTimestamp();
-//    isLocationCallBack = false;
-//    if ((paramInt2 & true) == 1) {
-//      Logger.i("开机定位");
-//      performExecute(paramInt1, i, 0, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x2) >> 1 == 1) {
-//      Logger.i("周期定位");
-//      performExecute(paramInt1, i, 1, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x4) >> 2 == 1) {
-//      Logger.i("主动定位");
-//      performExecute(paramInt1, i, 2, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x8) >> 3 == 1) {
-//      Logger.i("SOS定位");
-//      performExecute(paramInt1, i, 3, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x10) >> 4 == 1) {
-//      Logger.i("获取位置信息");
-//      performExecute(paramInt1, i, 4, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x20) >> 5 == 1) {
-//      Logger.i("定时定位");
-//      performExecute(paramInt1, i, 5, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x40) >> 6 == 1) {
-//      Logger.i("实时定位");
-//      performExecute(paramInt1, i, 6, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x80) >> 7 == 1) {
-//      Logger.i("摇一摇");
-//      Runtime runtime1 = runtime;
-//      LocationClient locationClient = this;
-////      ServiceUtil.offerQueue(API.H15(runtime1, locationClient.mWifiInfo, locationClient.mCellInfo, 7));
-//    }
-//    if ((paramInt2 & 0x100) >> 8 == 1) {
-//      Logger.i("脱落报警");
-//      performExecute(paramInt1, i, 8, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x200) >> 9 == 1) {
-//      Logger.i("照相定位");
-//      performExecute(paramInt1, i, 9, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x400) >> 10 == 1) {
-//      Logger.i("获取经纬度");
-//      performExecute(paramInt1, i, 10, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x800) >> 11 == 1) {
-//      Logger.i("获取天气");
-//      performExecute(paramInt1, i, 11, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
+    int i = SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LACATION_CYCLE, 3);
+    String str1 = runtime.getLatitude();
+    String str2 = runtime.getLongitude();
+    paramLong2 = runtime.getTimestamp();
+    isLocationCallBack = false;
+    if ((paramInt2 & 0x1) == 1) {
+      Logger.i("开机定位");
+      performExecute(paramInt1, i, 0, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x2) >> 1 == 1) {
+      Logger.i("周期定位");
+      performExecute(paramInt1, i, 1, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x4) >> 2 == 1) {
+      Logger.i("主动定位");
+      performExecute(paramInt1, i, 2, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x8) >> 3 == 1) {
+      Logger.i("SOS定位");
+      performExecute(paramInt1, i, 3, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x10) >> 4 == 1) {
+      Logger.i("获取位置信息");
+      performExecute(paramInt1, i, 4, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x20) >> 5 == 1) {
+      Logger.i("定时定位");
+      performExecute(paramInt1, i, 5, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x40) >> 6 == 1) {
+      Logger.i("实时定位");
+      performExecute(paramInt1, i, 6, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x80) >> 7 == 1) {
+      Logger.i("摇一摇");
+      Runtime runtime1 = runtime;
+      LocationClient locationClient = this;
+//      ServiceUtil.offerQueue(API.H15(runtime1, locationClient.mWifiInfo, locationClient.mCellInfo, 7));
+    }
+    if ((paramInt2 & 0x100) >> 8 == 1) {
+      Logger.i("脱落报警");
+      performExecute(paramInt1, i, 8, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x200) >> 9 == 1) {
+      Logger.i("照相定位");
+      performExecute(paramInt1, i, 9, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x400) >> 10 == 1) {
+      Logger.i("获取经纬度");
+      performExecute(paramInt1, i, 10, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x800) >> 11 == 1) {
+      Logger.i("获取天气");
+      performExecute(paramInt1, i, 11, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
   }
   
   public void start() {
@@ -738,6 +739,7 @@ public class LocationClient {
 
               this.lock.lock();
 //              LocationClient.access$1102(false);
+              LocationClient.mHasWifiResult=false;
               try {
                 if (KeepAlive.isConnected) {
                   this.condition.await(30000L, TimeUnit.MILLISECONDS);
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 b03653d7..55149faf 100644
--- a/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
@@ -8,203 +8,209 @@ import java.util.HashMap;
 public class protocolAPIHelper {
     private static final String TAG = "ICSrv." + protocolAPIHelper.class.getSimpleName();
 
-    private static final String CMDHEADER="IW";
-    private static final String CMDEND="#";
-    private static final String CMDSPLIT=",";
-    public enum CMD_TYPE{
-        AP00,
+    private static final String CMDHEADER = "IW";
+    private static final String CMDEND = "#";
+    private static final String CMDSPLIT = ",";
+    private CmdHandler cmdHandler=null;
+    public enum CMD_TYPE {
+        /*终端发起*/
+        AP00,//登录包
         BP00,
-        AP01,
+        AP01,//混合定位
         BP01,
-        AP02,
+        AP02,//多基站定位
         BP02,
-        AP92,
+        AP92,//CDMA 混合定位
         BP92,
-        AP03,
+        AP03,//心跳包
         BP03,
-        AP05,
+        AP05,//语音查询接收
         BP05,
-        AP07,
+        AP07,//语音上行
         BP07,
-        AP10,
+        AP10,//报警与地址回复
         BP10,
-        AP49,
+        AP49,//心率上传
         BP49,
-        APTM,
+        APTM,//基站校时及获取定位
         BPTM,
+        /* 服务器发起*/
         AP12,
-        BP12,
+        BP12,//SOS 号码设置
         AP14,
-        BP14,
+        BP14,//设置联系人白名单
         AP15,
-        BP15,
+        BP15,//设置定位周期
         AP16,
-        BP16,
+        BP16,//立即定位
         AP17,
-        BP17,
+        BP17,//恢复出厂设置
         AP18,
-        BP18,
+        BP18,//重启设备
         AP21,
-        BP21,
+        BP21,//设置计步开关
         AP28,
-        BP28,
+        BP28, //语音下行
         AP31,
-        BP31,
+        BP31,//关机
         AP33,
-        BP33,
+        BP33,//工作模式
         APXL,
-        BPXL,
+        BPXL,//测量血压
         AP84,
-        BP84,
+        BP84,//白名单开关
         AP85,
-        BP85,
+        BP85,//设置闹钟
         AP86,
-        BP86,
+        BP86,//心率血压测试周期
         AP89,
-        BP89,
+        BP89,//心率血压阀值设置
         UNKNOWN_CMD,
     }
 
-    private static HashMap<CMD_TYPE,String> cmdMap=null;
+    private static HashMap<CMD_TYPE, String> cmdMap = null;
 
     static {
-        cmdMap= new HashMap<CMD_TYPE, String>() ;
-        cmdMap.put(CMD_TYPE.AP00,"AP00");
-        cmdMap.put(CMD_TYPE.BP00,"BP00");
-        cmdMap.put(CMD_TYPE.AP01,"AP01");
-        cmdMap.put(CMD_TYPE.BP01,"BP01");
-        cmdMap.put(CMD_TYPE.AP02,"AP02");
-        cmdMap.put(CMD_TYPE.BP02,"BP02");
-        cmdMap.put(CMD_TYPE.AP92,"AP92");
-        cmdMap.put(CMD_TYPE.BP92,"BP92");
-        cmdMap.put(CMD_TYPE.AP03,"AP03");
-        cmdMap.put(CMD_TYPE.BP03,"BP03");
-        cmdMap.put(CMD_TYPE.AP05,"AP05");
-        cmdMap.put(CMD_TYPE.BP05,"BP05");
-        cmdMap.put(CMD_TYPE.AP07,"AP07");
-        cmdMap.put(CMD_TYPE.BP07,"BP07");
-        cmdMap.put(CMD_TYPE.AP10,"AP10");
-        cmdMap.put(CMD_TYPE.BP10,"BP10");
-        cmdMap.put(CMD_TYPE.AP49,"AP49");
-        cmdMap.put(CMD_TYPE.BP49,"BP49");
-        cmdMap.put(CMD_TYPE.APTM,"APTM");
-        cmdMap.put(CMD_TYPE.BPTM,"BPTM");
-        cmdMap.put(CMD_TYPE.AP12,"AP12");
-        cmdMap.put(CMD_TYPE.BP12,"BP12");
-        cmdMap.put(CMD_TYPE.AP14,"AP14");
-        cmdMap.put(CMD_TYPE.BP14,"BP14");
-        cmdMap.put(CMD_TYPE.AP15,"AP15");
-        cmdMap.put(CMD_TYPE.BP15,"BP15");
-        cmdMap.put(CMD_TYPE.AP16,"AP16");
-        cmdMap.put(CMD_TYPE.BP16,"BP16");
-        cmdMap.put(CMD_TYPE.AP17,"AP17");
-        cmdMap.put(CMD_TYPE.BP17,"BP17");
-        cmdMap.put(CMD_TYPE.AP18,"AP00");
-        cmdMap.put(CMD_TYPE.BP18,"BP18");
-        cmdMap.put(CMD_TYPE.AP21,"AP21");
-        cmdMap.put(CMD_TYPE.BP21,"BP21");
-        cmdMap.put(CMD_TYPE.AP28,"AP28");
-        cmdMap.put(CMD_TYPE.BP28,"BP28");
-        cmdMap.put(CMD_TYPE.AP31,"AP31");
-        cmdMap.put(CMD_TYPE.BP31,"BP31");
-        cmdMap.put(CMD_TYPE.AP33,"AP33");
-        cmdMap.put(CMD_TYPE.BP33,"BP33");
-        cmdMap.put(CMD_TYPE.APXL,"APXL");
-        cmdMap.put(CMD_TYPE.BPXL,"BPXL");
-        cmdMap.put(CMD_TYPE.AP84,"AP84");
-        cmdMap.put(CMD_TYPE.BP84,"BP84");
-        cmdMap.put(CMD_TYPE.AP85,"AP85");
-        cmdMap.put(CMD_TYPE.BP85,"BP85");
-        cmdMap.put(CMD_TYPE.AP86,"AP86");
-        cmdMap.put(CMD_TYPE.BP86,"BP86");
-        cmdMap.put(CMD_TYPE.AP89,"AP89");
-        cmdMap.put(CMD_TYPE.BP89,"BP89");
+        cmdMap = new HashMap<CMD_TYPE, String>();
+        cmdMap.put(CMD_TYPE.AP00, "AP00");
+        cmdMap.put(CMD_TYPE.BP00, "BP00");
+        cmdMap.put(CMD_TYPE.AP01, "AP01");
+        cmdMap.put(CMD_TYPE.BP01, "BP01");
+        cmdMap.put(CMD_TYPE.AP02, "AP02");
+        cmdMap.put(CMD_TYPE.BP02, "BP02");
+        cmdMap.put(CMD_TYPE.AP92, "AP92");
+        cmdMap.put(CMD_TYPE.BP92, "BP92");
+        cmdMap.put(CMD_TYPE.AP03, "AP03");
+        cmdMap.put(CMD_TYPE.BP03, "BP03");
+        cmdMap.put(CMD_TYPE.AP05, "AP05");
+        cmdMap.put(CMD_TYPE.BP05, "BP05");
+        cmdMap.put(CMD_TYPE.AP07, "AP07");
+        cmdMap.put(CMD_TYPE.BP07, "BP07");
+        cmdMap.put(CMD_TYPE.AP10, "AP10");
+        cmdMap.put(CMD_TYPE.BP10, "BP10");
+        cmdMap.put(CMD_TYPE.AP49, "AP49");
+        cmdMap.put(CMD_TYPE.BP49, "BP49");
+        cmdMap.put(CMD_TYPE.APTM, "APTM");
+        cmdMap.put(CMD_TYPE.BPTM, "BPTM");
+        cmdMap.put(CMD_TYPE.AP12, "AP12");
+        cmdMap.put(CMD_TYPE.BP12, "BP12");
+        cmdMap.put(CMD_TYPE.AP14, "AP14");
+        cmdMap.put(CMD_TYPE.BP14, "BP14");
+        cmdMap.put(CMD_TYPE.AP15, "AP15");
+        cmdMap.put(CMD_TYPE.BP15, "BP15");
+        cmdMap.put(CMD_TYPE.AP16, "AP16");
+        cmdMap.put(CMD_TYPE.BP16, "BP16");
+        cmdMap.put(CMD_TYPE.AP17, "AP17");
+        cmdMap.put(CMD_TYPE.BP17, "BP17");
+        cmdMap.put(CMD_TYPE.AP18, "AP00");
+        cmdMap.put(CMD_TYPE.BP18, "BP18");
+        cmdMap.put(CMD_TYPE.AP21, "AP21");
+        cmdMap.put(CMD_TYPE.BP21, "BP21");
+        cmdMap.put(CMD_TYPE.AP28, "AP28");
+        cmdMap.put(CMD_TYPE.BP28, "BP28");
+        cmdMap.put(CMD_TYPE.AP31, "AP31");
+        cmdMap.put(CMD_TYPE.BP31, "BP31");
+        cmdMap.put(CMD_TYPE.AP33, "AP33");
+        cmdMap.put(CMD_TYPE.BP33, "BP33");
+        cmdMap.put(CMD_TYPE.APXL, "APXL");
+        cmdMap.put(CMD_TYPE.BPXL, "BPXL");
+        cmdMap.put(CMD_TYPE.AP84, "AP84");
+        cmdMap.put(CMD_TYPE.BP84, "BP84");
+        cmdMap.put(CMD_TYPE.AP85, "AP85");
+        cmdMap.put(CMD_TYPE.BP85, "BP85");
+        cmdMap.put(CMD_TYPE.AP86, "AP86");
+        cmdMap.put(CMD_TYPE.BP86, "BP86");
+        cmdMap.put(CMD_TYPE.AP89, "AP89");
+        cmdMap.put(CMD_TYPE.BP89, "BP89");
     }
-    public protocolAPIHelper(){
-
 
+    public protocolAPIHelper(CmdHandler handler) {
 
+        cmdHandler=handler;
     }
 
-    private StringBuffer cmdbuf=new StringBuffer();
+    private StringBuffer cmdbuf = new StringBuffer();
+
     /*
     输入的字符串，如果有完整命令，返回 true
     否则返回 false
      */
-    public boolean isCmdStr(String msg){
-        int head_index=msg.indexOf(CMDHEADER);
-        if (head_index>=0){
-            int end_index=msg.indexOf("#",head_index);
-            if (end_index>=0)
-            {
+    public boolean isCmdStr(String msg) {
+        int head_index = msg.indexOf(CMDHEADER);
+        if (head_index >= 0) {
+            int end_index = msg.indexOf("#", head_index);
+            if (end_index >= 0) {
                 return true;
             }
         }
         return false;
     }
+
     private void log(String msg) {
-        Logger.log(TAG,msg);
+        Logger.log(TAG, msg);
     }
 
-    private void log(String function,String msg) {
-        Logger.log(TAG,function,msg);
+    private void log(String function, String msg) {
+        Logger.log(TAG, function, msg);
     }
+
     /*
     返回true 表示 cmd 全部解析成功
     返回false表示 cmd至少有一条解析失败，失败的数据归入buffer，下一次识别接着使用
     字符串通过#号进行识别。
     每个字符串如果发现 #，却又没有Header，“IW”则会被丢弃
      */
-    public boolean parserCmd(String cmd_msgbuf){
-        boolean iscmdComplete=false;
-        boolean ret=true;
-        String last_inCompletecmd="";
+    public boolean parserCmd(String cmd_msgbuf) {
+        boolean iscmdComplete = false;
+        boolean ret = true;
+        String last_inCompletecmd = "";
         cmdbuf.append(cmd_msgbuf);
         /*
         如果不是 #结尾，就认为 接收数据不全，置位。
          */
-        if (cmdbuf.toString().endsWith(CMDEND)){
-            iscmdComplete=true;
+        if (cmdbuf.toString().endsWith(CMDEND)) {
+            iscmdComplete = true;
         }
-        String [] cmdlist = cmd_msgbuf.split(CMDEND);
-        int listlen=cmdlist.length;
+        String[] cmdlist = cmd_msgbuf.split(CMDEND);
+        int listlen = cmdlist.length;
         /*
         如果解析出来的cmdlist不是空，且数据不是完整cmd则保留 最后一条数据到last_inCompletecmd
          */
-        if (cmdlist.length>0 && iscmdComplete==false){
-            listlen -=1;
+        if (cmdlist.length > 0 && iscmdComplete == false) {
+            listlen -= 1;
             last_inCompletecmd = cmdlist[listlen];
-            log("cmd not complete , "+last_inCompletecmd);
+            log("cmd not complete , " + last_inCompletecmd);
         }
-        for (int i = 0; i< listlen ; i++){
-            for(CMD_TYPE key: cmdMap.keySet()){
-               if ( cmdlist[i].startsWith(CMDHEADER+cmdMap.get(key))){
-                log("found cmd keyid=" + key+" ,keyname="+cmdMap.get(key)+" ,  "+cmdlist[i]);
-                if(key == CMD_TYPE.BP28){
-                    //如果是BP28则 后面的数据是音频，需要保留
-                    if ((i+1)<cmdlist.length) {
-                        //如果i+1 cmdlist确实在数组范围内，则可以进行数据处理
-                        handleCmd(key, cmdlist[i] + "#" + cmdlist[i + 1]);
-                        i++;
-                    }
+        for (int i = 0; i < listlen; i++) {
+            for (CMD_TYPE key : cmdMap.keySet()) {
+                if (cmdlist[i].startsWith(CMDHEADER + cmdMap.get(key))) {
+                    log("found cmd keyid=" + key + " ,keyname=" + cmdMap.get(key) + " ,  " + cmdlist[i]);
+                    if (key == CMD_TYPE.BP28) {
+                        //如果是BP28则 后面的数据是音频，需要保留
+                        if ((i + 1) < cmdlist.length) {
+                            //如果i+1 cmdlist确实在数组范围内，则可以进行数据处理
+                            if (cmdHandler!=null) cmdHandler.handleCmd(key, cmdlist[i] + "#" + cmdlist[i + 1]);
+                            i++;
+                        }
 
-                }else{
-                    handleCmd(key,cmdlist[i]);
+                    } else {
+                        if (cmdHandler!=null) cmdHandler.handleCmd(key, cmdlist[i]);
+                    }
                 }
-               }
             }
         }
 
-        cmdbuf=new StringBuffer().append(last_inCompletecmd);
+        cmdbuf = new StringBuffer().append(last_inCompletecmd);
         return ret;
     }
 
     /*登录*/
-    public static String AP00(Runtime ds){
+    public static String AP00(Runtime ds) {
         //示例数据：IWAP00867155030001063#
         return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP00)).append(ds.IMEI()).append(CMDEND).toString();
     }
-    public static String AP03(Runtime ds){
+
+    public static String AP03(Runtime ds) {
         //示例数据：IWAP03,06000908000102,5555,30#
         return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP03)).append(CMDSPLIT).append(ds.getSignalStrength())
                 .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0")
@@ -212,7 +218,7 @@ public class protocolAPIHelper {
                 .append(ds.getTotalStepCount()).append(CMDSPLIT).append(0/*rolltime*/).append(CMDEND).toString();
     }
 
-    public static String AP01(Runtime ds){
+    public static String AP01(Runtime ds) {
         //示例数据：IWAP01080524A2232.9806N11404.9355E000.1061830323.8706000908000102,
         // 460,0,9520,3671,
         // Home|74-DE-2B-44-88-8C|97& Home1|74-DE-2B-44-88-8C|97&Home2|74-DE-2B-44-88-8C|97& Home3|74-DE-2B-44-88-8C|97#
@@ -223,7 +229,8 @@ public class protocolAPIHelper {
                 .append(ds.getProtection()).append(ds.getWorkMode()).append(CMDSPLIT)
                 .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiInfo()).append(CMDEND).toString();
     }
-    public static String AP28(String name,String msg,int packagecount,int currentpackageindex,int received_success){
+
+    public static String AP28(String name, String msg, int packagecount, int currentpackageindex, int received_success) {
         //示例数据：IWAP28,D3590D54,xxxx,6,1,1#
         return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP28))
                 .append(CMDSPLIT).append(name)
@@ -234,28 +241,11 @@ public class protocolAPIHelper {
                 .append(CMDEND).toString();
     }
 
-    private boolean handleCmd(CMD_TYPE type,String cmd)
+    public interface CmdHandler
     {
-        boolean ret=true;
-
-        switch (type){
-            case BP00:
-                handleBP00(cmd);
-                break;
-            case BP01:
-                handleBP01(cmd);
-                break;
-            case BP03:
-                handleBP03(cmd);
-                break;
-            case BP28:
-                handleBP28(cmd);
-                break;
-
-        }
 
+         boolean handleCmd(CMD_TYPE type, String cmd);
 
-        return ret;
     }
 
     //处理 登录 BP00
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 354b1f7f..94123cec 100644
--- a/app/src/main/java/com/ic/protocol/bean/Runtime.java
+++ b/app/src/main/java/com/ic/protocol/bean/Runtime.java
@@ -55,7 +55,9 @@ public class Runtime {
   private String haveTry;
   
   private String host = "watch.jiai.pro";
-  
+
+  private String srvIP = "39.98.94.164";
+
   private String imei = "867155030001063";
   
   private String imei_cid = "";
@@ -84,7 +86,7 @@ public class Runtime {
   
   private String mccAndMnc;
   
-  private int port = 8090;
+  private int port = 20048;//8888;//8090;
   
   public String preCdmaInfo;
   
@@ -96,7 +98,7 @@ public class Runtime {
   
   private boolean shutdown;
   
-  private boolean testServerProp;
+  private boolean testServerProp=true;
   
   private long timestamp;
   
@@ -150,7 +152,7 @@ public class Runtime {
   
   public String getHaveTry() { return this.haveTry; }
   
-  public String getHost() { return this.testServerProp ? "121.42.192.174" : this.host; }
+  public String getHost() { return this.testServerProp ? srvIP : this.host; }
   
   public String getKey() { return this.key; }
   
diff --git a/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java b/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java
index 12c7ec00..a2950762 100644
--- a/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java
+++ b/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java
@@ -13,7 +13,7 @@ public class heartRateStatus {
         HEARTRATE_TEST_FAILED,
     } ;
 
-    public boolean isHeartr8ateExists(){
+    public boolean isHeartrRateExists(){
         return true;
     }
 
diff --git a/app/src/main/java/com/ic/protocol/service/CheckSIM.java b/app/src/main/java/com/ic/protocol/service/CheckSIM.java
index 2d78532d..3742c753 100644
--- a/app/src/main/java/com/ic/protocol/service/CheckSIM.java
+++ b/app/src/main/java/com/ic/protocol/service/CheckSIM.java
@@ -11,6 +11,10 @@ import com.ic.protocol.bean.StringMessage;
 import com.ic.protocol.service.base.AbstractConnectionService;
 import com.ic.protocol.utils.Connection;
 
+import static android.telephony.TelephonyManager.SIM_STATE_ABSENT;
+import static android.telephony.TelephonyManager.SIM_STATE_READY;
+import static android.telephony.TelephonyManager.SIM_STATE_UNKNOWN;
+
 public class CheckSIM extends AbstractConnectionService {
   private static final String ACTION_SIM_STATE_CHANGED = "android.intent.action.SIM_STATE_CHANGED";
   
@@ -30,17 +34,18 @@ public class CheckSIM extends AbstractConnectionService {
   int[] simState = { 0, 0, 0, 0 };
   
   private boolean hasSimCard() {
-    int i = ((TelephonyManager)(this.mRuntime.getContextProxy()).context.getSystemService(Context.TELEPHONY_SERVICE)).getSimState();
-    boolean bool = false;
-    switch (i) {
-      default:
-        bool = true;
-        break;
-      case 0:
-      case 1:
-        break;
-    } 
-    return bool;
+//    int i = ((TelephonyManager)(this.mRuntime.getContextProxy()).context.getSystemService(Context.TELEPHONY_SERVICE)).getSimState();
+//    boolean bool = false;
+//    switch (i) {
+//      default:
+//        bool = true;
+//        break;
+//      case SIM_STATE_ABSENT:
+//      case SIM_STATE_UNKNOWN:
+//        break;
+//    }
+//    return bool;
+    return (((TelephonyManager)(this.mRuntime.getContextProxy()).context.getSystemService(Context.TELEPHONY_SERVICE)).getSimState() == SIM_STATE_READY);
   }
   @Override
   public void onAlarmClock(Connection paramConnection, Runtime paramRuntime) {
diff --git a/app/src/main/java/com/ic/protocol/service/Deliver.java b/app/src/main/java/com/ic/protocol/service/Deliver.java
index 8b8fad0a..04aab36b 100644
--- a/app/src/main/java/com/ic/protocol/service/Deliver.java
+++ b/app/src/main/java/com/ic/protocol/service/Deliver.java
@@ -132,9 +132,9 @@ public class Deliver extends AbstractConnectionService {
     String[] arrayOfString1;
     this.mConnection = paramConnection;
     this.mRuntime = paramRuntime;
-    String str5 = paramStringMessage.cmd();
-    if (str5.startsWith("SmsSet")) {
-      arrayOfString4 = str5.split(":");
+    String cmd = paramStringMessage.cmd();
+    if (cmd.startsWith("SmsSet")) {
+      arrayOfString4 = cmd.split(":");
       if (arrayOfString4.length > 1) {
 //        paramConnection.send(API.H13(paramRuntime, arrayOfString4[1]));
         if ("1".equals(arrayOfString4[1])) {
@@ -183,7 +183,7 @@ public class Deliver extends AbstractConnectionService {
       } 
       return true;
     } 
-    if (str5.equals("PUSH")) {
+    if (cmd.equals("PUSH")) {
       stringBuilder2 = new StringBuilder();
       stringBuilder2.append("response=");
 //      stringBuilder2.append(arrayOfString4.toString());
@@ -196,77 +196,77 @@ public class Deliver extends AbstractConnectionService {
 //          });
       return true;
     } 
-    switch (str5.hashCode()) {
+    switch (cmd.hashCode()) {
       default:
         i = -1;
         break;
       case 2010452830:
-        if (str5.equals("NewPicture")) {
+        if (cmd.equals("NewPicture")) {
           i = 5;
           break;
         } 
       case 1965687765:
-        if (str5.equals("Location")) {
+        if (cmd.equals("Location")) {
           i = 9;
           break;
         } 
       case 1474607358:
-        if (str5.equals("Check_bill")) {
+        if (cmd.equals("Check_bill")) {
           i = 3;
           break;
         } 
       case 1433513874:
-        if (str5.equals("NewVoice")) {
+        if (cmd.equals("NewVoice")) {
           i = 4;
           break;
         } 
       case 750870555:
-        if (str5.equals("RemoteWifiRate")) {
+        if (cmd.equals("RemoteWifiRate")) {
           i = 11;
           break;
         } 
       case 613936256:
-        if (str5.equals("RemoteHeartRate")) {
+        if (cmd.equals("RemoteHeartRate")) {
           i = 10;
           break;
         } 
       case 411981707:
-        if (str5.equals("Videojufenglogin")) {
+        if (cmd.equals("Videojufenglogin")) {
           i = 8;
           break;
         } 
       case -355520725:
-        if (str5.equals("RemoteCamera")) {
+        if (cmd.equals("RemoteCamera")) {
           i = 2;
           break;
         } 
       case -811859232:
-        if (str5.equals("GetVideoId")) {
+        if (cmd.equals("GetVideoId")) {
           i = 7;
           break;
         } 
       case -1391156271:
-        if (str5.equals("RemoteSetWifiRate")) {
+        if (cmd.equals("RemoteSetWifiRate")) {
           i = 12;
           break;
         } 
       case -1393994438:
-        if (str5.equals("Monitor")) {
+        if (cmd.equals("Monitor")) {
           i = 1;
           break;
         } 
       case -1754979095:
-        if (str5.equals("Update")) {
+        if (cmd.equals("Update")) {
           i = 0;
           break;
         } 
       case -1882613593:
-        if (str5.equals("OssFileDowload")) {
+        if (cmd.equals("OssFileDowload")) {
           i = 13;
           break;
         } 
       case -1893234925:
-        if (str5.equals("UrlDownloadPic")) {
+        if (cmd.equals("UrlDownloadPic")) {
           i = 6;
           break;
         } 
diff --git a/app/src/main/java/com/ic/protocol/service/Initialize.java b/app/src/main/java/com/ic/protocol/service/Initialize.java
new file mode 100644
index 00000000..38f7a1cb
--- /dev/null
+++ b/app/src/main/java/com/ic/protocol/service/Initialize.java
@@ -0,0 +1,108 @@
+package com.ic.protocol.service;
+
+import android.database.Cursor;
+
+import com.ic.protocol.Config;
+import com.ic.protocol.ICContentProvider;
+import com.ic.protocol.adapter.protocolAPIHelper;
+import com.ic.protocol.bean.StringMessage;
+import com.ic.protocol.service.base.AbstractConnectionService;
+import com.ic.protocol.utils.Connection;
+import com.ic.protocol.bean.Runtime;
+import com.ic.protocol.utils.DeviceInfoUtil;
+import com.ic.protocol.utils.Logger;
+import com.ic.protocol.utils.SharPreferenceUtil;
+import com.ic.protocol.utils.SimSignalUtil;
+
+import org.json.JSONObject;
+import org.json.JSONTokener;
+
+public class Initialize extends AbstractConnectionService {
+  private boolean hasChange = false;
+  
+  private SimSignalUtil mInstance;
+  
+  private int netWorkFlag;
+  private boolean initOK=false;
+  private int weatherOutTime = 30;
+  
+  public static boolean hasContacts(Runtime paramRuntime) {
+    Cursor cursor = (paramRuntime.getContextProxy()).context.getContentResolver().query(ICContentProvider.CONTACT_URI, null, null, null, null);
+    if (cursor != null) {
+      if (cursor.moveToNext()) {
+        cursor.close();
+        return true;
+      } 
+      cursor.close();
+    } 
+    return false;
+  }
+  
+  public void onAlarmClock(Connection paramConnection, Runtime paramRuntime) {
+    if (this.netWorkFlag > 5 && !this.hasChange) {
+      this.hasChange = true;
+      this.netWorkFlag = 0;
+    } else {
+      this.netWorkFlag++;
+    } 
+//    if (paramRuntime.getVideoID() == null)
+//      paramConnection.send(API.H139(paramRuntime));
+  }
+  
+  public void onAttach(Connection paramConnection, Runtime paramRuntime) { this.mInstance = SimSignalUtil.getInstance((paramRuntime.getContextProxy()).context); }
+  
+  public boolean onConnectionClose(Connection paramConnection, Runtime paramRuntime) { return this.initOK ^ true; }
+  
+  public boolean onConnectionOpen(Connection paramConnection, Runtime paramRuntime) {
+    if (this.initOK)
+      return false; 
+    if (paramRuntime.IMSI() != null && !paramRuntime.IMSI().startsWith("46001"))
+      paramRuntime.IMSI().startsWith("46006"); 
+    int i = SharPreferenceUtil.getPrefInt((paramRuntime.getContextProxy()).context, "lacation_mode", 2);
+    int j = SharPreferenceUtil.getPrefInt((paramRuntime.getContextProxy()).context, "lacation_cycle", 3);
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append(i);
+    stringBuilder.append("@");
+    stringBuilder.append(j);
+    Config.work_mode = stringBuilder.toString();
+    stringBuilder = new StringBuilder();
+    stringBuilder.append(" antioff =");
+    stringBuilder.append(Config.antioff);
+    Logger.i(stringBuilder.toString());
+    Config.sw_release_no = DeviceInfoUtil.getCustomId();
+    StringMessage stringMessage=new StringMessage(new String[]{protocolAPIHelper.AP00(paramRuntime)});
+    paramConnection.send(stringMessage);
+    return true;
+  }
+  
+  public void onDetach(Connection paramConnection, Runtime paramRuntime) { this.initOK = false; }
+  
+  public boolean onReceive(StringMessage paramStringMessage, Connection paramConnection, Runtime paramRuntime) {
+    if (this.initOK)
+      return false; 
+    if (paramStringMessage.cmd().equals("Init")) {
+      this.initOK = true;
+//      try {
+//        paramRuntime.setKey(((JSONObject)(new JSONTokener(paramStringMessage.all()[1])).nextValue()).getString("KEY"));
+//      } catch (Exception e) {
+//        e.printStackTrace();
+//      }
+      if (!hasContacts(paramRuntime)) {
+//        paramConnection.send(API.H06(paramRuntime));
+        Logger.i("没有联系人");
+      } else {
+        Logger.i("有联系人");
+      } 
+//      EqcAlgorithmNative.native_EqcAlgorithmMethod3(1);
+      StringBuilder stringBuilder = new StringBuilder();
+      stringBuilder.append("imei_cid_key =");
+      stringBuilder.append(paramRuntime.IMEI_CID_KEY());
+      Logger.i(stringBuilder.toString());
+//      paramConnection.send(API.H139(paramRuntime));
+      this.nextService.processConnectionOpen(paramConnection, paramRuntime);
+    } 
+    return true;
+  }
+}
+
+
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 789261f9..6efb605a 100644
--- a/app/src/main/java/com/ic/protocol/service/KeepAlive.java
+++ b/app/src/main/java/com/ic/protocol/service/KeepAlive.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.SystemClock;
+import android.util.Log;
 
 import com.eiot.watch_lib.LauncherCtrl;
 import com.ic.protocol.adapter.protocolAPIHelper;
@@ -22,7 +23,7 @@ import rx.functions.Action1;
 
 public class KeepAlive extends AbstractConnectionService {
   private static final long HEARTBEAT_TIMEOUT = 660000L;
-  
+  private static String TAG = KeepAlive.class.getSimpleName();
   public static boolean connectionError = false;
   
   public static boolean isConnected = false;
@@ -281,6 +282,7 @@ public class KeepAlive extends AbstractConnectionService {
 
   public boolean onReceive(StringMessage paramStringMessage, Connection paramConnection, Runtime paramRuntime) {
     this.idleTimeMillis = SystemClock.elapsedRealtime();
+    Log.i(TAG,paramStringMessage.cmd());
     if ("heart".equals(paramStringMessage.cmd()) || "Link:OK".equals(paramStringMessage.cmd()) || "Shutdown:OK".equals(paramStringMessage.cmd()) || "Sport:OK".equals(paramStringMessage.cmd())) {
       if ("Shutdown:OK".equals(paramStringMessage.cmd()))
         paramRuntime.getContextProxy().shutdown(); 
@@ -297,7 +299,7 @@ public class KeepAlive extends AbstractConnectionService {
     public void onReceive(Context param1Context, Intent param1Intent) {
       boolean bool = param1Intent.getBooleanExtra("reboot", false);
       if (KeepAlive.this.mRuntime.getBatteryLow() && !KeepAlive.this.mRuntime.getBatterychanging() && !bool && !KeepAlive.this.mRuntime.isShutdown()){
-        //        KeepAlive.this.connection.send(API.H11(KeepAlive.this.mRuntime, "3"));
+//                KeepAlive.this.connection.send(new StringMessage(protocolAPIHelper.AP00(KeepAlive.this.mRuntime)));
       }
 
     }
diff --git a/app/src/main/java/com/ic/protocol/service/SynchronousTime.java b/app/src/main/java/com/ic/protocol/service/SynchronousTime.java
new file mode 100644
index 00000000..014fc1f4
--- /dev/null
+++ b/app/src/main/java/com/ic/protocol/service/SynchronousTime.java
@@ -0,0 +1,87 @@
+package com.ic.protocol.service;
+
+import android.os.SystemClock;
+
+import com.ic.protocol.adapter.protocolAPIHelper;
+import com.ic.protocol.bean.Runtime;
+import com.ic.protocol.bean.StringMessage;
+import com.ic.protocol.service.base.AbstractConnectionService;
+import com.ic.protocol.utils.Connection;
+import com.ic.protocol.utils.Logger;
+import com.ic.protocol.utils.NettyConnection;
+import com.ic.protocol.utils.TimeUtil;
+import  com.ic.protocol.bean.Runtime;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.TimeZone;
+
+public class SynchronousTime extends AbstractConnectionService {
+  private boolean synchronousTimeOK = false;
+  
+  private void getCoder() {
+//    if (CoderFactory.getCoderFactoryInstance().getCoder() != null)
+//      Logger.i("成功获取");
+  }
+  
+  private void setDateAndTime(long paramLong) {
+    SystemClock.setCurrentTimeMillis(paramLong);
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append("设置时间");
+    stringBuilder.append(TimeUtil.getSystemTime());
+    Logger.i(stringBuilder.toString());
+  }
+  
+  public void onAlarmClock(Connection paramConnection, Runtime paramRuntime) {}
+  
+  public void onAttach(Connection paramConnection, Runtime paramRuntime) {}
+  
+  public boolean onConnectionClose(Connection paramConnection, Runtime paramRuntime) { return this.synchronousTimeOK ^ true; }
+
+  @Override
+  public boolean onConnectionOpen(Connection paramConnection, Runtime paramRuntime) {
+    if (this.synchronousTimeOK)
+      return false; 
+    StringMessage stringMessage = new StringMessage( protocolAPIHelper.AP00(paramRuntime));
+//    byte[] arrayOfByte = (new StringMessageSocketEngine(paramRuntime.getHost(), paramRuntime.getPort() - 2)).request(stringMessage);
+    paramConnection.sendBlocking(stringMessage);
+//    if (arrayOfByte != null) {
+//      this.synchronousTimeOK = true;
+//      str = new String(arrayOfByte);
+//      StringBuilder stringBuilder = new StringBuilder();
+//      stringBuilder.append("成功返回");
+//      stringBuilder.append(str);
+//      Logger.i(stringBuilder.toString());
+//      str = str.substring(5);
+//      str = str.substring(0, str.length() - 1);
+//      SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd,HH:mm:ss");
+//      simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT+08:00"));
+//      try {
+//        long l1 = simpleDateFormat.parse(str).getTime();
+//        long l2 = System.currentTimeMillis();
+//        StringBuilder stringBuilder1 = new StringBuilder();
+//        stringBuilder1.append("serviceTime=");
+//        stringBuilder1.append(l1);
+//        stringBuilder1.append("---localTime=");
+//        stringBuilder1.append(l2);
+//        Logger.i(stringBuilder1.toString());
+//        if (Math.abs(l1 - l2) > 60000L) {
+//          setDateAndTime(l1);
+//          return false;
+//        }
+//      } catch (ParseException str) {
+//        str.printStackTrace();
+//      }
+//      return false;
+//    }
+    return true;
+  }
+  
+  public void onDetach(Connection paramConnection, Runtime paramRuntime) {}
+  
+  public boolean onReceive(StringMessage paramStringMessage, Connection paramConnection, Runtime paramRuntime) { return !this.synchronousTimeOK; }
+
+
+
+}
+
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 ec1f2284..57d731ae 100644
--- a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
+++ b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
@@ -15,8 +15,10 @@ import android.os.Message;
 import android.os.Messenger;
 import android.os.PowerManager;
 import android.os.SystemClock;
+import android.util.Log;
 import android.widget.Toast;
 
+import com.ic.protocol.Constants;
 import com.ic.protocol.LocationClient;
 import com.ic.protocol.adapter.LBSHelper;
 import com.ic.protocol.adapter.protocolAPIHelper;
@@ -53,6 +55,10 @@ import java.util.TimerTask;
 
 import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 import static com.ic.protocol.Constants.ACTION_EQC_ALARM;
+import static com.ic.protocol.Constants.HEART_ALARM;
+import static com.ic.protocol.Constants.SLEEP_ALARM;
+import static com.ic.protocol.Constants.WAKE_ALARM;
+import static com.ic.protocol.Constants.WEATHER_ALARM;
 
 public class protocolMainServer extends Service {
 
@@ -164,7 +170,7 @@ public class protocolMainServer extends Service {
 
     LocationClient locationClient;
 
-//    private Deliver mDeliver;
+    private Deliver mDeliver;
 
     private boolean mHaveSetWeatherAlarm;
 
@@ -190,6 +196,7 @@ public class protocolMainServer extends Service {
                 if (is_in_sleep_mode) {
 //                    CoreService.access$402(false);
 //                    CoreService.access$502(0);
+                    /*屏幕亮起时，如果在sleep模式，则唤醒各个进程*/
                     protocolMainServer.is_in_sleep_mode=false;
                     protocolMainServer.is_allowed_in_sleep_mode=0;
                     if (protocolMainServer.this.mKeepAlive != null)
@@ -198,9 +205,9 @@ public class protocolMainServer extends Service {
                 }
                 if (is_wifi_network_ok) {
 //                    CoreService.access$302(false);
+                    /*屏幕亮起时，如果wifi开启，则开启wifi*/
                     protocolMainServer.is_in_sleep_mode=false;
                     Util.turnOnWifiForConnect((protocolMainServer.this.runtime.getContextProxy()).context, protocolMainServer.this.runtime);
-                    return;
                 }
             } else if ("android.intent.action.SCREEN_OFF".equals(param1Intent.getAction()) && Util.isWifiIsOpen((protocolMainServer.this.runtime.getContextProxy()).context, protocolMainServer.this.runtime)) {
 //                CoreService.access$302(true);
@@ -220,18 +227,19 @@ public class protocolMainServer extends Service {
 
     private AbstractConnectionService getConnectionServiceChain() {
 //        DNS dNS = new DNS();
-//        SynchronousTime synchronousTime = new SynchronousTime();
+        SynchronousTime synchronousTime = new SynchronousTime();
 //        new ProcessEncryptionService();
-//        Initialize initialize = new Initialize();
-//        CheckSIM checkSIM = new CheckSIM();
+        Initialize initialize = new Initialize();
+        CheckSIM checkSIM = new CheckSIM();
         this.mKeepAlive = new KeepAlive();
-//        this.mDeliver = new Deliver();
+        this.mDeliver = new Deliver();
 //        dNS.setNext(synchronousTime);
-//        synchronousTime.setNext(initialize);
-//        initialize.setNext(checkSIM);
-//        checkSIM.setNext(this.mKeepAlive);
-//        this.mKeepAlive.setNext(this.mDeliver);
-        return mKeepAlive;
+        synchronousTime.setNext(initialize);
+        initialize.setNext(checkSIM);
+        checkSIM.setNext(this.mKeepAlive);
+        this.mKeepAlive.setNext(this.mDeliver);
+
+        return synchronousTime;
     }
 
     private void getDBFile() {
@@ -267,13 +275,20 @@ public class protocolMainServer extends Service {
         AlarmHelper.setCleanStepCountAlarm(this, 23, 59, "com.enqualcomm.support.ACTION_STEP_COUNT_ALARM");
     }
 
-    private void setSleepAlarm() {}
+    private void setSleepAlarm() {
+        /*每5分左右 休眠*/
+        AlarmHelper.setTimeAlarm(this, 0, 5, SLEEP_ALARM);
+    }
 
-    private void setWakeAlarm() {}
+    private void setWakeAlarm() {
+
+        /*每1 左右 唤醒自己*/
+        AlarmHelper.setTimeAlarm(this, 0, 1, WAKE_ALARM);
+    }
 
     private void setWeatherAlarm() {
         /*每6小时20分左右 更新一次 weather*/
-        AlarmHelper.setTimeAlarm(this, 6, (new Random()).nextInt(40) + 20, "com.enqualcomm.support.ACTION_WEATHER_ALARM");
+        AlarmHelper.setTimeAlarm(this, 6, (new Random()).nextInt(40) + 20, WEATHER_ALARM);
     }
 
     private void wakeUpFromSleep() {
@@ -389,7 +404,7 @@ public class protocolMainServer extends Service {
             stringBuilder.append(" paramInt2=");
             stringBuilder.append(paramInt2);
             Logger.i(stringBuilder.toString());
-            if ("com.enqualcomm.support.ACTION_ALARM".equals(paramIntent.getAction())) {
+            if (ACTION_ALARM.equals(paramIntent.getAction())) {
                 if (cmcm_call_eiot_into_powersave_mode() == 1) {
                     Logger.i("2 into powersave return");
                     return Service.START_NOT_STICKY;
@@ -400,15 +415,17 @@ public class protocolMainServer extends Service {
                     alarmCycle = SharPreferenceUtil.getPrefInt((this.runtime.getContextProxy()).context, "lacation_cycle", 3);
                 }
                 AlarmWakeUp.setAlarmWakeUpTime();
-                boolean bool = ((PowerManager)getSystemService(POWER_SERVICE)).isScreenOn();
-                if (!bool)
+                boolean screenon = ((PowerManager)getSystemService(POWER_SERVICE)).isScreenOn();
+                if (!screenon)
                     send_at_to_update_lbs();
-                if (Util.isConnectWifi((this.runtime.getContextProxy()).context) && !bool) {
+                if (Util.isConnectWifi((this.runtime.getContextProxy()).context) && !screenon) {
                     is_wifi_network_ok = true;
                     Util.turnOffWifiForSleep((this.runtime.getContextProxy()).context, this.runtime);
                 }
                 setAlarm(alarmCycle);
-                this.runtime.getContextProxy().sendBroadcast("com.enqualcomm.support.ACTION_EQC_ALARM", this.runtime);
+
+                //发送心跳间隔广播给其他应用
+                this.runtime.getContextProxy().sendBroadcast(ACTION_EQC_ALARM, this.runtime);
                 this.locationClient.onAlarm(getWakeLock(alarmCycle));
                 this.connectionServiceChain.processAlarmClock(this.connection, this.runtime);
                 this.invokeHandlerServiceChain.processAlarmClock(this.connection, this.runtime);
@@ -419,7 +436,7 @@ public class protocolMainServer extends Service {
                 }
             } else {
                 StringBuilder stringBuilder1;
-                if ("com.enqualcomm.support.SLEEP_ALARM".equals(paramIntent.getAction())) {
+                if (Constants.SLEEP_ALARM.equals(paramIntent.getAction())) {
                     Logger.i("SLEEP_ALARM");
                     is_allowed_in_sleep_mode = 1;
                     FileOutputUtil.fileOutput(this, "alarmCycle", "SLEEP_ALARM  alarmCycle");
@@ -437,7 +454,7 @@ public class protocolMainServer extends Service {
                         return Service.START_STICKY;
                     }
                 } else {
-                    if ("com.enqualcomm.support.WAKE_ALARM".equals(paramIntent.getAction())) {
+                    if (Constants.WAKE_ALARM.equals(paramIntent.getAction())) {
                         if (is_in_sleep_mode) {
                             is_in_sleep_mode = false;
                             FileOutputUtil.fileOutput(this, "alarmCycle", "WAKE_ALARM  alarmCycle");
@@ -449,18 +466,18 @@ public class protocolMainServer extends Service {
                         setWakeAlarm();
                         return Service.START_STICKY;
                     }
-                    if ("com.enqualcomm.support.HEART_ALARM".equals(paramIntent.getAction())) {
+                    if (HEART_ALARM.equals(paramIntent.getAction())) {
                         if (this.mKeepAlive != null) {
                             this.mKeepAlive.onHeartAlarm(this.connection, this.runtime);
                             return Service.START_STICKY;
                         }
                     } else {
-                        if ("com.enqualcomm.support.ACTION_WEATHER_ALARM".equals(paramIntent.getAction())) {
+                        if (WEATHER_ALARM.equals(paramIntent.getAction())) {
 //                            this.mSendPairMessage.resetDownLoadConfig();
 //                            this.mSendPairMessage.startDownLoad(this.runtime, false);
                             return Service.START_STICKY;
                         }
-                        if ("com.enqualcomm.support.ADD_DATAPOINTS".equals(paramIntent.getAction())) {
+                        if (Constants.ACTION_ALARM_ADD_DATAPOINTS.equals(paramIntent.getAction())) {
                             setUpLocationDataAlarm(28800000L);
                             if (this.upLoadDataPoints != null) {
                                 this.upLoadDataPoints.uploadCurrentLocation();
@@ -469,7 +486,7 @@ public class protocolMainServer extends Service {
                             Logger.i("upLoadDataPoints=null");
                             return Service.START_STICKY;
                         }
-                        if ("com.enqualcomm.support.ACTION_STWORKMODE_ALARM".equals(paramIntent.getAction())) {
+                        if (Constants.STWORKMODE_ALARM.equals(paramIntent.getAction())) {
                             if (this.startAlarmCount >= 5) {
                                 alarmCycle = paramIntent.getIntExtra("lacation_cycle", 3);
                                 setAlarm(alarmCycle);
@@ -480,12 +497,8 @@ public class protocolMainServer extends Service {
                             FileOutputUtil.fileOutput(this, "alarmCycle", stringBuilder1.toString());
                             return Service.START_STICKY;
                         }
-                        if ("com.enqualcomm.support.UPDATE_SECRET_KEY".equals(paramIntent.getAction())) {
-//                            setUpdateSecretKeyAlarm();
-//                            this.invokeHandlerServiceChain.processUserRequest(paramIntent, this.connection, this.runtime);
-                            return Service.START_STICKY;
-                        }
-                        if ("com.enqualcomm.support.PASS_DATA".equals(paramIntent.getAction())) {
+
+                        if (Constants.ACTION_PASS_DATA_TO_CM_SERVICES.equals(paramIntent.getAction())) {
                             deliverDataToCmApp(paramIntent.getIntExtra("cmdId", 0), paramIntent.getStringExtra("cmdJsonData"));
                             return Service.START_STICKY;
                         }
@@ -536,7 +549,7 @@ public class protocolMainServer extends Service {
             i = 3;
         AlarmManager alarmManager = (AlarmManager)getSystemService(ALARM_SERVICE);
         Intent intent = new Intent(this, protocolMainServer.class);
-        intent.setAction("com.enqualcomm.support.ACTION_ALARM");
+        intent.setAction(ACTION_ALARM);
         PendingIntent pendingIntent = PendingIntent.getService(this, 0, intent, FLAG_UPDATE_CURRENT);
         alarmManager.cancel(pendingIntent);
         long l = SystemClock.elapsedRealtime();
@@ -558,12 +571,25 @@ public class protocolMainServer extends Service {
         }
     }
 
-    public void setHeartAlarm() {}
+    public void setHeartAlarm() {
+        AlarmManager alarmManager = (AlarmManager)getSystemService(ALARM_SERVICE);
+        Intent intent = new Intent(this, protocolMainServer.class);
+        intent.setAction(ACTION_ALARM);
+        PendingIntent pendingIntent = PendingIntent.getService(this, 0, intent, FLAG_UPDATE_CURRENT);
+        alarmManager.cancel(pendingIntent);
+        long l = SystemClock.elapsedRealtime();
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("setHeartAlarm 20秒");
+        Logger.i(stringBuilder.toString());
+        int sleeptime=20;
+        Log.i(TAG,"setHeartAlarm");
+        alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + ( sleeptime * 1000), pendingIntent);
+    }
 
     public void setUpLocationDataAlarm(long paramLong) {
         AlarmManager alarmManager = (AlarmManager)getSystemService(ALARM_SERVICE);
         Intent intent = new Intent(this, protocolMainServer.class);
-        intent.setAction("com.enqualcomm.support.ADD_DATAPOINTS");
+        intent.setAction(Constants.ACTION_ALARM_ADD_DATAPOINTS);
         PendingIntent pendingIntent = PendingIntent.getService(this, 0, intent, FLAG_UPDATE_CURRENT);
         alarmManager.cancel(pendingIntent);
         alarmManager.setExact(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + paramLong, pendingIntent);
@@ -612,7 +638,7 @@ public class protocolMainServer extends Service {
     private WifiManager mWifiManager=null;
     private Config mConfig=null;
     private static Runtime mDevStat=null;
-    private protocolAPIHelper mProtocolAPI=null;
+//    private protocolAPIHelper mProtocolAPI=null;
 
 
     private void log(String msg) {
@@ -663,7 +689,7 @@ public class protocolMainServer extends Service {
             mDevStat =new Runtime();
             log("new mDevStat");
         }
-        if (mProtocolAPI == null) mProtocolAPI = new protocolAPIHelper();
+//        if (mProtocolAPI == null) mProtocolAPI = new protocolAPIHelper();
         if (mWifiManager == null) mWifiManager = (WifiManager)this.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         if (lbshelper==null) lbshelper = new LBSHelper(this,mWifiManager,mDevStat);
 
@@ -743,8 +769,8 @@ public class protocolMainServer extends Service {
     }
 
     public void testGpsData(){
-       mProtocolAPI.AP01(mDevStat);
-        log( mProtocolAPI.AP01(mDevStat));
+//       mProtocolAPI.AP01(mDevStat);
+//        log( mProtocolAPI.AP01(mDevStat));
     }
     private void stopTimer(){
         if (mTimer_keepalive !=null){
diff --git a/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java b/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java
index 5f4b8a5e..1885ff01 100644
--- a/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java
+++ b/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java
@@ -4,6 +4,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.SystemClock;
+import android.util.Log;
 
 import com.ic.protocol.bean.Runtime;
 
@@ -23,6 +24,7 @@ public class AlarmWakeUp {
       stringBuilder.append(l);
       stringBuilder.append("---lastAlarmTime=");
       stringBuilder.append(lastAlarmTime);
+      Log.i("AlarmWakeUp",stringBuilder.toString());
       FileOutputUtil.fileOutput(context, "alarmWakeUp", stringBuilder.toString());
     } 
   }
diff --git a/app/src/main/java/com/ic/protocol/utils/CameraUtil.java b/app/src/main/java/com/ic/protocol/utils/CameraUtil.java
new file mode 100644
index 00000000..276f867f
--- /dev/null
+++ b/app/src/main/java/com/ic/protocol/utils/CameraUtil.java
@@ -0,0 +1,209 @@
+package com.ic.protocol.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Matrix;
+import android.graphics.SurfaceTexture;
+import android.hardware.Camera;
+import android.media.ToneGenerator;
+import android.os.Environment;
+import android.os.StatFs;
+import android.view.SurfaceView;
+import android.view.WindowManager;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+
+public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener {
+  Context context;
+  
+  private Camera.PictureCallback jpegCallback = new Camera.PictureCallback() {
+      public void onPictureTaken(byte[] param1ArrayOfByte, Camera param1Camera) {
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("format=");
+        stringBuilder.append(CameraUtil.this.mPs.getPictureFormat());
+        Logger.i(stringBuilder.toString());
+        if (CameraUtil.this.mPs.getPictureFormat() == 256) {
+          String str = CameraUtil.this.savePicture(param1ArrayOfByte);
+          if (str != null) {
+            Intent intent = new Intent(CameraUtil.this.context, com.ic.protocol.service.protocolMainServer.class);
+            intent.setAction("com.enqualcomm.support.ACTION_REMOTE_CAMERA");
+            intent.putExtra("filepath", str);
+            intent.putExtra("number", CameraUtil.this.mNumber);
+            CameraUtil.this.context.startService(intent);
+          } else {
+            Logger.i("空间不足,保存失败");
+          } 
+        } 
+        CameraUtil.this.releaseCamera();
+      }
+    };
+  
+  private Camera mCamera;
+  
+  String mNumber;
+  
+  private int mOrientation;
+  
+  private Camera.Parameters mPs;
+  
+  private Camera.ShutterCallback shutterCallback = new Camera.ShutterCallback() {
+      public void onShutter() { Logger.i("shutterCallback"); }
+    };
+  
+  private SurfaceTexture surfaceTexture;
+  
+  private ToneGenerator tone;
+  
+  public CameraUtil(Context paramContext) { this.context = paramContext; }
+  
+  private Camera openFacingBackCamera() {
+    Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+    int i = Camera.getNumberOfCameras();
+    Camera camera = null;
+    byte b = 0;
+    while (b < i) {
+      Camera.getCameraInfo(b, cameraInfo);
+
+      if (cameraInfo.facing == 0) {
+        try {
+          camera = Camera.open(b);
+        } catch (RuntimeException e) {
+          e.printStackTrace();
+        }
+      }
+      b++;
+    } 
+    return camera;
+  }
+  
+  private void releaseCamera() {
+    if (this.mCamera != null)
+      try {
+        if (this.surfaceTexture != null)
+          this.surfaceTexture.setOnFrameAvailableListener(null); 
+        this.mCamera.setPreviewTexture(null);
+        this.mCamera.stopPreview();
+      } catch (Exception exception) {
+        exception.printStackTrace();
+      }  
+    this.mCamera.release();
+  }
+  
+  private String savePicture(byte[] paramArrayOfByte) {
+    String str = null;
+    try {
+      if (Environment.getExternalStorageState().equals("mounted")) {
+        if ((new StatFs(Environment.getExternalStorageDirectory().toString())).getAvailableBytes() < paramArrayOfByte.length)
+          return null; 
+        str = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath();
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append(str);
+        stringBuilder.append("/RemoteCamera.jpg");
+        str = stringBuilder.toString();
+        Bitmap bitmap2 = BitmapFactory.decodeByteArray(paramArrayOfByte, 0, paramArrayOfByte.length);
+        Bitmap bitmap1 = bitmap2;
+        if ((this.context.getResources().getConfiguration()).orientation == 1) {
+          Matrix matrix = new Matrix();
+          matrix.reset();
+          matrix.postRotate(this.mOrientation);
+          bitmap1 = Bitmap.createBitmap(bitmap2, 0, 0, bitmap2.getWidth(), bitmap2.getHeight(), matrix, true);
+        } 
+        File file = new File(str);
+        if (!file.exists())
+          file.createNewFile(); 
+        BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(file));
+        bitmap1.compress(Bitmap.CompressFormat.JPEG, 100, bufferedOutputStream);
+        bufferedOutputStream.flush();
+        bufferedOutputStream.close();
+      } 
+      return str;
+    } catch (Exception e) {
+      e.printStackTrace();
+      return null;
+    } 
+  }
+  
+  private void takePicture(Context paramContext) {
+    if (this.mCamera != null) {
+      SurfaceView surfaceView = new SurfaceView(paramContext);
+      try {
+        this.mCamera.setPreviewDisplay(surfaceView.getHolder());
+        this.mPs = this.mCamera.getParameters();
+        this.mPs.setPictureSize(640, 480);
+        Logger.i("CameraUtil---setCameraDisplayOrientation");
+        setCameraDisplayOrientation(paramContext, 0, this.mCamera);
+        this.mCamera.setParameters(this.mPs);
+        Logger.i("CameraUtil---startPreview");
+        this.surfaceTexture = new SurfaceTexture(10);
+        this.surfaceTexture.setOnFrameAvailableListener(this);
+        this.mCamera.setPreviewTexture(this.surfaceTexture);
+        this.mCamera.startPreview();
+        this.mCamera.enableShutterSound(false);
+        (new Thread(new Runnable() {
+              public void run() {
+                try {
+                  CameraUtil.this.mCamera.takePicture(CameraUtil.this.shutterCallback, null, CameraUtil.this.jpegCallback);
+                  Thread.sleep(5000L);
+                  return;
+                } catch (Exception exception) {
+                  exception.printStackTrace();
+                  CameraUtil.this.releaseCamera();
+                  return;
+                } 
+              }
+            })).start();
+        return;
+      } catch (Exception e) {
+        e.printStackTrace();
+        releaseCamera();
+      } 
+    } 
+  }
+  
+  public int getDisplayRotation(Context paramContext) {
+    int i = ((WindowManager)paramContext.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation();
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append("getDisplayRotation rotation=");
+    stringBuilder.append(i);
+    Logger.i(stringBuilder.toString());
+    switch (i) {
+      default:
+        return 0;
+      case 3:
+        return 270;
+      case 2:
+        return 180;
+      case 1:
+        return 90;
+      case 0:
+        break;
+    } 
+    return 0;
+  }
+  
+  public void getPictur(String paramString) {
+    this.mCamera = openFacingBackCamera();
+    takePicture(this.context);
+    this.mNumber = paramString;
+  }
+  
+  public void onFrameAvailable(SurfaceTexture paramSurfaceTexture) { Logger.i("onFrameAvailable"); }
+  
+  public void setCameraDisplayOrientation(Context paramContext, int paramInt, Camera paramCamera) {
+    Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+    Camera.getCameraInfo(paramInt, cameraInfo);
+    paramInt = getDisplayRotation(paramContext);
+    if (cameraInfo.facing == 1) {
+      paramInt = (360 - (cameraInfo.orientation + paramInt) % 360) % 360;
+    } else {
+      paramInt = (cameraInfo.orientation - paramInt + 360) % 360;
+    } 
+    paramCamera.setDisplayOrientation(paramInt);
+    this.mOrientation = paramInt;
+  }
+}
+
diff --git a/app/src/main/java/com/ic/protocol/utils/ContextProxy.java b/app/src/main/java/com/ic/protocol/utils/ContextProxy.java
index 619f06f3..5ed8a981 100644
--- a/app/src/main/java/com/ic/protocol/utils/ContextProxy.java
+++ b/app/src/main/java/com/ic/protocol/utils/ContextProxy.java
@@ -106,74 +106,74 @@ public class ContextProxy {
   }
   
   private void initAlarmAndSilent() {
-//    Calendar calendar2 = Calendar.getInstance();
-//    calendar2.set(13, 0);
-//    long l = System.currentTimeMillis();
-//    Cursor cursor2 = this.context.getContentResolver().query(EQCContentProvider.ALARM_URI, null, null, null, null);
-//    byte b2 = 3;
-//    byte b1 = 5;
-//    char c = '\002';
-//    if (cursor2 != null) {
-//      while (cursor2.moveToNext()) {
-//        if ("ON".equals(cursor2.getString(4))) {
-//          String str2 = cursor2.getString(1);
-//          String str1 = cursor2.getString(c);
-//          String str3 = cursor2.getString(b2);
-//          String str4 = cursor2.getString(b1);
-//          calendar2.set(11, Integer.parseInt(str2.substring(c, 4)));
-//          calendar2.set(12, Integer.parseInt(str2.substring(b1, 7)));
-//          char[] arrayOfChar = str1.toCharArray();
-//          int i = arrayOfChar.length;
-//          byte b = 1;
-//          while (b < i) {
-//            c = arrayOfChar[b] - '/';
-//            calendar2.set(7, c);
-//            long l1 = calendar2.getTimeInMillis();
-//            if (l1 <= l)
-//              l1 += 604800000L;
-//            PendingIntent pendingIntent = getPendingIntent(str2, str1, str3, str4, c);
-//            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
-//            b++;
-//            c = '\002';
-//            b1 = 5;
-//            b2 = 3;
-//          }
-//        }
-//      }
-//      cursor2.close();
-//    }
-//    Calendar calendar1 = Calendar.getInstance();
-//    calendar1.set(13, 0);
-//    Cursor cursor1 = this.context.getContentResolver().query(EQCContentProvider.NOTICE_URL, null, null, null, null);
-//    if (cursor1 != null) {
-//      while (cursor1.moveToNext()) {
-//        String str1 = cursor1.getString(1);
-//        String str2 = cursor1.getString(2);
-//        String str3 = cursor1.getString(3);
-//        String str4 = cursor1.getString(4);
-//        String str5 = cursor1.getString(5);
-//        String str6 = cursor1.getString(6);
-//        String str7 = cursor1.getString(6);
-//        if (str1 != null) {
-//          String str8 = str1.substring(0, 4);
-//          String str9 = str1.substring(4, 6);
-//          String str10 = str1.substring(6, 8);
-//          String str11 = str1.substring(8, 10);
-//          String str12 = str1.substring(10, 12);
-//          calendar1.set(1, Integer.valueOf(str8).intValue());
-//          calendar1.set(2, Integer.valueOf(str9).intValue());
-//          calendar1.set(5, Integer.valueOf(str10).intValue());
-//          calendar1.set(11, Integer.valueOf(str11).intValue());
-//          calendar1.set(12, Integer.valueOf(str12).intValue());
-//          long l1 = calendar1.getTimeInMillis();
-//          if (l1 > l) {
-//            PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, str5, str6, str7);
-//            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
-//          }
-//        }
-//      }
-//      cursor1.close();
-//    }
+    Calendar calendar2 = Calendar.getInstance();
+    calendar2.set(Calendar.SECOND, 0);
+    long l = System.currentTimeMillis();
+    Cursor cursor2 = this.context.getContentResolver().query(ICContentProvider.ALARM_URI, null, null, null, null);
+    byte b2 = 3;
+    byte b1 = 5;
+    char c = '\002';
+    if (cursor2 != null) {
+      while (cursor2.moveToNext()) {
+        if ("ON".equals(cursor2.getString(4))) {
+          String str2 = cursor2.getString(1);
+          String str1 = cursor2.getString(c);
+          String str3 = cursor2.getString(b2);
+          String str4 = cursor2.getString(b1);
+          calendar2.set(Calendar.HOUR_OF_DAY, Integer.parseInt(str2.substring(c, 4)));
+          calendar2.set(Calendar.MINUTE, Integer.parseInt(str2.substring(b1, 7)));
+          char[] arrayOfChar = str1.toCharArray();
+          int i = arrayOfChar.length;
+          byte b = 1;
+          while (b < i) {
+            c = (char)(arrayOfChar[b] - '/');
+            calendar2.set(Calendar.DAY_OF_WEEK, c);
+            long l1 = calendar2.getTimeInMillis();
+            if (l1 <= l)
+              l1 += 604800000L;
+            PendingIntent pendingIntent = getPendingIntent(str2, str1, str3, str4, c);
+            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
+            b++;
+            c = '\002';
+            b1 = 5;
+            b2 = 3;
+          }
+        }
+      }
+      cursor2.close();
+    }
+    Calendar calendar1 = Calendar.getInstance();
+    calendar1.set(Calendar.SECOND, 0);
+    Cursor cursor1 = this.context.getContentResolver().query(ICContentProvider.NOTICE_URL, null, null, null, null);
+    if (cursor1 != null) {
+      while (cursor1.moveToNext()) {
+        String str1 = cursor1.getString(1);
+        String str2 = cursor1.getString(2);
+        String str3 = cursor1.getString(3);
+        String str4 = cursor1.getString(4);
+        String str5 = cursor1.getString(5);
+        String str6 = cursor1.getString(6);
+        String str7 = cursor1.getString(6);
+        if (str1 != null) {
+          String year = str1.substring(0, 4);
+          String month = str1.substring(4, 6);
+          String str10 = str1.substring(6, 8);
+          String str11 = str1.substring(8, 10);
+          String str12 = str1.substring(10, 12);
+          calendar1.set(Calendar.YEAR, Integer.valueOf(year).intValue());
+          calendar1.set(Calendar.MONTH, Integer.valueOf(month).intValue());
+          calendar1.set(Calendar.DAY_OF_MONTH, Integer.valueOf(str10).intValue());
+          calendar1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(str11).intValue());
+          calendar1.set(Calendar.MINUTE, Integer.valueOf(str12).intValue());
+          long l1 = calendar1.getTimeInMillis();
+          if (l1 > l) {
+            PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, str5, str6, str7);
+            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
+          }
+        }
+      }
+      cursor1.close();
+    }
   }
   
   public LocationManager getLocationManager() { return this.locationManager; }
@@ -199,219 +199,219 @@ public class ContextProxy {
   }
   
   public void resolverAlarm(ArrayList<Alarm> paramArrayList) {
-//    Cursor cursor = this.context.getContentResolver().query(ICContentProvider.ALARM_URI, null, null, null, null);
-//    char c = '\001';
-//    if (cursor != null) {
-//      while (cursor.moveToNext()) {
-//        if ("ON".equals(cursor.getString(4))) {
-//          String str1 = cursor.getString(c);
-//          String str2 = cursor.getString(2);
-//          String str3 = cursor.getString(3);
-//          String str4 = cursor.getString(5);
-//          char[] arrayOfChar = str2.toCharArray();
-//          int i = arrayOfChar.length;
-//          byte b = 1;
-//          while (b < i) {
-//            c = arrayOfChar[b];
-//            this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, c - '/'));
-//            b++;
-//            c = '\001';
-//          }
-//        }
-//      }
-//      cursor.close();
-//    }
-//    Calendar calendar = Calendar.getInstance();
-//    calendar.set(13, 0);
-//    long l = System.currentTimeMillis();
-//    for (Alarm alarm : paramArrayList) {
-//      long l1 = l;
-//      if ("ON".equals(alarm.status)) {
-//        int i = Integer.parseInt(alarm.time.substring(2, 4));
-//        int j = Integer.parseInt(alarm.time.substring(5, 7));
-//        calendar.set(11, i);
-//        calendar.set(12, j);
-//        char[] arrayOfChar = alarm.week.toCharArray();
-//        i = arrayOfChar.length;
-//        j = 1;
-//        while (true) {
-//          l1 = l;
-//          if (j < i) {
-//            c = arrayOfChar[j] - '/';
-//            calendar.set(7, c);
-//            long l2 = calendar.getTimeInMillis();
-//            l1 = l2;
-//            if (l2 <= l)
-//              l1 = l2 + 604800000L;
-//            PendingIntent pendingIntent = getPendingIntent(alarm.time, alarm.week, alarm.ring, alarm.name, c);
-//            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
-//            j++;
-//            continue;
-//          }
-//          break;
-//        }
-//      }
-//      l = l1;
-//    }
+    Cursor cursor = this.context.getContentResolver().query(ICContentProvider.ALARM_URI, null, null, null, null);
+    char c = '\001';
+    if (cursor != null) {
+      while (cursor.moveToNext()) {
+        if ("ON".equals(cursor.getString(4))) {
+          String str1 = cursor.getString(c);
+          String str2 = cursor.getString(2);
+          String str3 = cursor.getString(3);
+          String str4 = cursor.getString(5);
+          char[] arrayOfChar = str2.toCharArray();
+          int i = arrayOfChar.length;
+          byte b = 1;
+          while (b < i) {
+            c = arrayOfChar[b];
+            this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, c - '/'));
+            b++;
+            c = '\001';
+          }
+        }
+      }
+      cursor.close();
+    }
+    Calendar calendar = Calendar.getInstance();
+    calendar.set(Calendar.SECOND, 0);
+    long l = System.currentTimeMillis();
+    for (Alarm alarm : paramArrayList) {
+      long l1 = l;
+      if ("ON".equals(alarm.status)) {
+        int i = Integer.parseInt(alarm.time.substring(2, 4));
+        int j = Integer.parseInt(alarm.time.substring(5, 7));
+        calendar.set(Calendar.HOUR_OF_DAY, i);
+        calendar.set(Calendar.MINUTE, j);
+        char[] arrayOfChar = alarm.week.toCharArray();
+        i = arrayOfChar.length;
+        j = 1;
+        while (true) {
+          l1 = l;
+          if (j < i) {
+            c = ( char)(arrayOfChar[j] - '/');
+            calendar.set(Calendar.DAY_OF_WEEK, c);
+            long l2 = calendar.getTimeInMillis();
+            l1 = l2;
+            if (l2 <= l)
+              l1 = l2 + 604800000L;
+            PendingIntent pendingIntent = getPendingIntent(alarm.time, alarm.week, alarm.ring, alarm.name, c);
+            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
+            j++;
+            continue;
+          }
+          break;
+        }
+      }
+      l = l1;
+    }
   }
   
   public void resolverNotice(ArrayList<NoticeContent> paramArrayList) {
-//    Cursor cursor = this.context.getContentResolver().query(EQCContentProvider.NOTICE_URL, null, null, null, null);
-//    if (cursor != null) {
-//      while (cursor.moveToNext()) {
-//        String str1 = cursor.getString(1);
-//        String str2 = cursor.getString(2);
-//        String str3 = cursor.getString(3);
-//        String str4 = cursor.getString(4);
-//        String str5 = cursor.getString(5);
-//        String str6 = cursor.getString(6);
-//        String str7 = cursor.getString(6);
-//        this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, str5, str6, str7));
-//      }
-//      cursor.close();
-//    }
-//    for (NoticeContent noticeContent : paramArrayList) {
-//      String str1 = noticeContent.noticeTime;
-//      String str2 = noticeContent.noticeName;
-//      String str3 = noticeContent.noticeNumber;
-//      String str4 = noticeContent.noticeID;
-//      String str5 = noticeContent.noticeCategory;
-//      String str6 = noticeContent.noticeFrequency;
-//      String str7 = noticeContent.noticeContent;
-//      Calendar calendar = Calendar.getInstance();
-//      long l = System.currentTimeMillis();
-//      calendar.set(13, 0);
-//      if (str1 != null) {
-//        String str8 = str1.substring(0, 4);
-//        String str9 = str1.substring(4, 6);
-//        String str10 = str1.substring(6, 8);
-//        String str11 = str1.substring(8, 10);
-//        String str12 = str1.substring(10, 12);
-//        calendar.set(1, Integer.valueOf(str8).intValue());
-//        calendar.set(2, Integer.valueOf(str9).intValue() - 1);
-//        calendar.set(5, Integer.valueOf(str10).intValue());
-//        calendar.set(11, Integer.valueOf(str11).intValue());
-//        calendar.set(12, Integer.valueOf(str12).intValue());
-//        long l1 = calendar.getTimeInMillis();
-//        if (l1 >= l) {
-//          PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, str5, str6, str7);
-//          AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
-//        }
-//      }
-//    }
+    Cursor cursor = this.context.getContentResolver().query(ICContentProvider.NOTICE_URL, null, null, null, null);
+    if (cursor != null) {
+      while (cursor.moveToNext()) {
+        String str1 = cursor.getString(1);
+        String str2 = cursor.getString(2);
+        String str3 = cursor.getString(3);
+        String str4 = cursor.getString(4);
+        String str5 = cursor.getString(5);
+        String str6 = cursor.getString(6);
+        String str7 = cursor.getString(6);
+        this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, str5, str6, str7));
+      }
+      cursor.close();
+    }
+    for (NoticeContent noticeContent : paramArrayList) {
+      String str1 = noticeContent.noticeTime;
+      String str2 = noticeContent.noticeName;
+      String str3 = noticeContent.noticeNumber;
+      String str4 = noticeContent.noticeID;
+      String str5 = noticeContent.noticeCategory;
+      String str6 = noticeContent.noticeFrequency;
+      String str7 = noticeContent.noticeContent;
+      Calendar calendar = Calendar.getInstance();
+      long l = System.currentTimeMillis();
+      calendar.set(Calendar.SECOND, 0);
+      if (str1 != null) {
+        String str8 = str1.substring(0, 4);
+        String str9 = str1.substring(4, 6);
+        String str10 = str1.substring(6, 8);
+        String str11 = str1.substring(8, 10);
+        String str12 = str1.substring(10, 12);
+        calendar.set(Calendar.YEAR, Integer.valueOf(str8).intValue());
+        calendar.set(Calendar.MONTH, Integer.valueOf(str9).intValue() - 1);
+        calendar.set(Calendar.DAY_OF_MONTH, Integer.valueOf(str10).intValue());
+        calendar.set(Calendar.HOUR_OF_DAY, Integer.valueOf(str11).intValue());
+        calendar.set(Calendar.MINUTE, Integer.valueOf(str12).intValue());
+        long l1 = calendar.getTimeInMillis();
+        if (l1 >= l) {
+          PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, str5, str6, str7);
+          AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
+        }
+      }
+    }
   }
   
   public void resolverSilent(ArrayList<Silent> paramArrayList) {
-//    Calendar calendar1 = Calendar.getInstance();
-//    calendar1.set(13, 0);
-//    Calendar calendar2 = Calendar.getInstance();
-//    calendar2.set(13, 0);
-//    long l = System.currentTimeMillis();
-//    Cursor cursor = this.context.getContentResolver().query(EQCContentProvider.SILENT_URI, null, null, null, null);
-//    char c = '\013';
-//    int j = 5;
-//    int k = 4;
-//    if (cursor != null) {
-//      char c1 = Character.MIN_VALUE;
-//      while (cursor.moveToNext()) {
-//        if ("ON".equals(cursor.getString(k))) {
-//          String str1 = cursor.getString(1);
-//          String str2 = cursor.getString(2);
-//          String str3 = cursor.getString(3);
-//          if (!c1) {
-//            int n = Integer.parseInt(str1.substring(2, k));
-//            int i1 = Integer.parseInt(str1.substring(j, 7));
-//            calendar1.set(c, n);
-//            calendar1.set(12, i1);
-//            n = Integer.parseInt(str2.substring(2, k));
-//            i1 = Integer.parseInt(str2.substring(j, 7));
-//            calendar2.set(c, n);
-//            calendar2.set(12, i1);
-//          }
-//          char[] arrayOfChar = str3.toCharArray();
-//          int m = arrayOfChar.length;
-//          byte b = 1;
-//          char c2 = k;
-//          k = j;
-//          j = c;
-//          while (b < m) {
-//            j = arrayOfChar[b] - '/';
-//            this.alarmManager.cancel(getPendingIntent(str1, str2, str3, j));
-//            c = c1;
-//            if (c1 == Character.MIN_VALUE) {
-//              calendar1.set(7, j);
-//              long l1 = calendar1.getTimeInMillis();
-//              calendar2.set(7, j);
-//              long l2 = calendar2.getTimeInMillis();
-//              c = c1;
-//              if (l1 <= l) {
-//                c = c1;
-//                if (l2 > l)
-//                  c = '\001';
-//              }
-//            }
-//            b++;
-//            j = 11;
-//            k = 5;
-//            c2 = '\004';
-//            c1 = c;
-//          }
-//          c = j;
-//          j = k;
-//          k = c2;
-//        }
-//      }
-//      cursor.close();
-//      c = c1;
-//    } else {
-//      c = Character.MIN_VALUE;
-//    }
-//    Iterator iterator = paramArrayList.iterator();
-//    int i;
-//    for (i = 0; iterator.hasNext(); i = k) {
-//      Silent silent = (Silent)iterator.next();
-//      k = i;
-//      if ("ON".equals(silent.status)) {
-//        j = Integer.parseInt(silent.start.substring(2, 4));
-//        k = Integer.parseInt(silent.start.substring(5, 7));
-//        calendar1.set(11, j);
-//        calendar1.set(12, k);
-//        j = Integer.parseInt(silent.end.substring(2, 4));
-//        k = Integer.parseInt(silent.end.substring(5, 7));
-//        calendar2.set(11, j);
-//        calendar2.set(12, k);
-//        char[] arrayOfChar = silent.week.toCharArray();
-//        int m = arrayOfChar.length;
-//        j = 1;
-//        while (true) {
-//          k = i;
-//          if (j < m) {
-//            k = arrayOfChar[j] - '/';
-//            calendar1.set(7, k);
-//            long l1 = calendar1.getTimeInMillis();
-//            calendar2.set(7, k);
-//            long l2 = calendar2.getTimeInMillis();
-//            if (l1 <= l)
-//              if (l2 <= l) {
-//                l1 += 604800000L;
-//              } else {
-//                i = 1;
-//              }
-//            PendingIntent pendingIntent = getPendingIntent(silent.start, silent.end, silent.week, k);
-//            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
-//            j++;
-//            continue;
-//          }
-//          break;
-//        }
-//      }
-//    }
-//    if (c != '\000' && i == 0) {
-//      Intent intent = new Intent(this.context, com.enqualcomm.support.CoreService.class);
-//      intent.setAction("com.enqualcomm.icare.ACTION_ISSILENCE");
-//      intent.putExtra("SilentData", "silent:cancel");
-//      this.context.startService(intent);
-//    }
+    Calendar calendar1 = Calendar.getInstance();
+    calendar1.set(Calendar.SECOND, 0);
+    Calendar calendar2 = Calendar.getInstance();
+    calendar2.set(Calendar.SECOND, 0);
+    long l = System.currentTimeMillis();
+    Cursor cursor = this.context.getContentResolver().query(ICContentProvider.SILENT_URI, null, null, null, null);
+    char c = '\013';
+    int j = 5;
+    int k = 4;
+    if (cursor != null) {
+      char c1 = Character.MIN_VALUE;
+      while (cursor.moveToNext()) {
+        if ("ON".equals(cursor.getString(k))) {
+          String str1 = cursor.getString(1);
+          String str2 = cursor.getString(2);
+          String str3 = cursor.getString(3);
+          if (!(c1==Character.MIN_VALUE)) {
+            int n = Integer.parseInt(str1.substring(2, k));
+            int i1 = Integer.parseInt(str1.substring(j, 7));
+            calendar1.set(c, n);
+            calendar1.set(Calendar.MINUTE, i1);
+            n = Integer.parseInt(str2.substring(2, k));
+            i1 = Integer.parseInt(str2.substring(j, 7));
+            calendar2.set(c, n);
+            calendar2.set(Calendar.MINUTE, i1);
+          }
+          char[] arrayOfChar = str3.toCharArray();
+          int m = arrayOfChar.length;
+          byte b = 1;
+          char c2 = (char)k;
+          k = j;
+          j = c;
+          while (b < m) {
+            j = arrayOfChar[b] - '/';
+            this.alarmManager.cancel(getPendingIntent(str1, str2, str3, j));
+            c = c1;
+            if (c1 == Character.MIN_VALUE) {
+              calendar1.set(Calendar.DAY_OF_WEEK, j);
+              long l1 = calendar1.getTimeInMillis();
+              calendar2.set(Calendar.DAY_OF_WEEK, j);
+              long l2 = calendar2.getTimeInMillis();
+              c = c1;
+              if (l1 <= l) {
+                c = c1;
+                if (l2 > l)
+                  c = '\001';
+              }
+            }
+            b++;
+            j = 11;
+            k = 5;
+            c2 = '\004';
+            c1 = c;
+          }
+          c = (char)j;
+          j = k;
+          k = c2;
+        }
+      }
+      cursor.close();
+      c = c1;
+    } else {
+      c = Character.MIN_VALUE;
+    }
+    Iterator iterator = paramArrayList.iterator();
+    int i;
+    for (i = 0; iterator.hasNext(); i = k) {
+      Silent silent = (Silent)iterator.next();
+      k = i;
+      if ("ON".equals(silent.status)) {
+        j = Integer.parseInt(silent.start.substring(2, 4));
+        k = Integer.parseInt(silent.start.substring(5, 7));
+        calendar1.set(Calendar.HOUR_OF_DAY, j);
+        calendar1.set(Calendar.MINUTE, k);
+        j = Integer.parseInt(silent.end.substring(2, 4));
+        k = Integer.parseInt(silent.end.substring(5, 7));
+        calendar2.set(Calendar.HOUR_OF_DAY, j);
+        calendar2.set(Calendar.MINUTE, k);
+        char[] arrayOfChar = silent.week.toCharArray();
+        int m = arrayOfChar.length;
+        j = 1;
+        while (true) {
+          k = i;
+          if (j < m) {
+            k = arrayOfChar[j] - '/';
+            calendar1.set(Calendar.DAY_OF_WEEK, k);
+            long l1 = calendar1.getTimeInMillis();
+            calendar2.set(Calendar.DAY_OF_WEEK, k);
+            long l2 = calendar2.getTimeInMillis();
+            if (l1 <= l)
+              if (l2 <= l) {
+                l1 += 604800000L;
+              } else {
+                i = 1;
+              }
+            PendingIntent pendingIntent = getPendingIntent(silent.start, silent.end, silent.week, k);
+            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
+            j++;
+            continue;
+          }
+          break;
+        }
+      }
+    }
+    if (c != '\000' && i == 0) {
+      Intent intent = new Intent(this.context, com.ic.protocol.service.protocolMainServer.class);
+      intent.setAction("com.enqualcomm.icare.ACTION_ISSILENCE");
+      intent.putExtra("SilentData", "silent:cancel");
+      this.context.startService(intent);
+    }
   }
   
   public void sendBroadcast(String cmd, Runtime dev) {
diff --git a/app/src/main/java/com/ic/protocol/utils/CustomDialog.java b/app/src/main/java/com/ic/protocol/utils/CustomDialog.java
new file mode 100644
index 00000000..1cc16445
--- /dev/null
+++ b/app/src/main/java/com/ic/protocol/utils/CustomDialog.java
@@ -0,0 +1,178 @@
+package com.ic.protocol.utils;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+public class CustomDialog extends Dialog {
+  public CustomDialog(Context paramContext) { super(paramContext); }
+  
+  public CustomDialog(Context paramContext, int paramInt) { super(paramContext, paramInt); }
+  
+  public static class Builder {
+    private int app_id;
+    
+    private View contentView;
+    
+    private Context context;
+    
+    private CustomDialog mDialog;
+    
+    private String message;
+    
+    private OnClickListener negativeButtonClickListener;
+
+    private String negativeButtonText;
+
+    private OnClickListener positiveButtonClickListener;
+
+    private String positiveButtonText;
+
+    private String title;
+
+    public Builder(Context param1Context) { this.context = param1Context; }
+
+    private CustomDialog getDialogInstance() {
+//      this.mDialog = new CustomDialog(this.context, 2131689630);
+//      View view = (LayoutInflater)this.context.getSystemService("layout_inflater");
+//      if (this.app_id == 2) {
+//        view = view.inflate(2131361824, null);
+//      } else {
+//        view = view.inflate(2131361825, null);
+//      }
+//      this.mDialog.addContentView(view, new ViewGroup.LayoutParams(-1, -2));
+//      ((TextView)view.findViewById(2131230876)).setText(this.title);
+//      if (this.positiveButtonText != null) {
+//        if (this.app_id != 2) {
+//          ((ImageButton)view.findViewById(2131230836)).setImageResource(2131165276);
+//          if (this.positiveButtonClickListener != null) {
+//            final CustomDialog finalDialog1 = this.mDialog;
+//            ((ImageButton)view.findViewById(2131230836)).setOnClickListener(new View.OnClickListener() {
+//                  public void onClick(View param2View) { CustomDialog.Builder.this.positiveButtonClickListener.onClick(finalDialog, -1); }
+//                });
+//          }
+//        } else if (this.positiveButtonClickListener != null) {
+//          final CustomDialog finalDialog1 = this.mDialog;
+//          ((Button)view.findViewById(2131230836)).setOnClickListener(new View.OnClickListener() {
+//                public void onClick(View param2View) { CustomDialog.Builder.this.positiveButtonClickListener.onClick(finalDialog, -1); }
+//              });
+//        }
+//      } else {
+//        view.findViewById(2131230836).setVisibility(8);
+//      }
+//      if (this.negativeButtonText != null) {
+//        ((ImageButton)view.findViewById(2131230825)).setImageResource(2131165273);
+//        if (this.negativeButtonClickListener != null) {
+//          final CustomDialog finalDialog1 = this.mDialog;
+//          ((ImageButton)view.findViewById(2131230825)).setOnClickListener(new View.OnClickListener() {
+//                public void onClick(View param2View) { CustomDialog.Builder.this.negativeButtonClickListener.onClick(finalDialog1, -2); }
+//              });
+//        }
+//      } else {
+//        view.findViewById(2131230825).setVisibility(8);
+//      }
+//      if (this.message != null) {
+//        ((TextView)view.findViewById(2131230822)).setText(this.message);
+//      } else if (this.contentView != null) {
+//        ((LinearLayout)view.findViewById(2131230793)).removeAllViews();
+//        ((LinearLayout)view.findViewById(2131230793)).addView(this.contentView, new ViewGroup.LayoutParams(-1, -1));
+//      }
+//      this.mDialog.setContentView(view);
+      return this.mDialog;
+    }
+    
+    public CustomDialog create() { // Byte code:
+      //   0: aload_0
+      //   1: getfield mDialog : Lcom/enqualcomm/support/util/CustomDialog;
+      //   4: ifnonnull -> 37
+      //   7: ldc com/enqualcomm/support/util/CustomDialog
+      //   9: monitorenter
+      //   10: aload_0
+      //   11: getfield mDialog : Lcom/enqualcomm/support/util/CustomDialog;
+      //   14: ifnonnull -> 25
+      //   17: aload_0
+      //   18: aload_0
+      //   19: invokespecial getDialogInstance : ()Lcom/enqualcomm/support/util/CustomDialog;
+      //   22: putfield mDialog : Lcom/enqualcomm/support/util/CustomDialog;
+      //   25: ldc com/enqualcomm/support/util/CustomDialog
+      //   27: monitorexit
+      //   28: goto -> 37
+      //   31: astore_1
+      //   32: ldc com/enqualcomm/support/util/CustomDialog
+      //   34: monitorexit
+      //   35: aload_1
+      //   36: athrow
+      //   37: aload_0
+      //   38: getfield mDialog : Lcom/enqualcomm/support/util/CustomDialog;
+      //   41: areturn
+      // Exception table:
+      //   from	to	target	type
+      //   10	25	31	finally
+      //   25	28	31	finally
+      //   32	35	31	finally }
+      return mDialog;
+    }
+    public Builder setApp(int param1Int) {
+      this.app_id = param1Int;
+      return this;
+    }
+    
+    public Builder setContentView(View param1View) {
+      this.contentView = param1View;
+      return this;
+    }
+    
+    public Builder setMessage(int param1Int) {
+      this.message = (String)this.context.getText(param1Int);
+      return this;
+    }
+    
+    public Builder setMessage(String param1String) {
+      this.message = param1String;
+      return this;
+    }
+    
+    public Builder setNegativeButton(int param1Int, DialogInterface.OnClickListener param1OnClickListener) {
+      this.negativeButtonText = (String)this.context.getText(param1Int);
+      this.negativeButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setNegativeButton(String param1String, DialogInterface.OnClickListener param1OnClickListener) {
+      this.negativeButtonText = param1String;
+      this.negativeButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setPositiveButton(int param1Int, DialogInterface.OnClickListener param1OnClickListener) {
+      this.positiveButtonText = (String)this.context.getText(param1Int);
+      this.positiveButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setPositiveButton(String param1String, DialogInterface.OnClickListener param1OnClickListener) {
+      this.positiveButtonText = param1String;
+      this.positiveButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setTitle(int param1Int) {
+      this.title = (String)this.context.getText(param1Int);
+      return this;
+    }
+    
+    public Builder setTitle(String param1String) {
+      this.title = param1String;
+      return this;
+    }
+  }
+
+}
+
diff --git a/app/src/main/java/com/ic/protocol/utils/CustomNotification.java b/app/src/main/java/com/ic/protocol/utils/CustomNotification.java
new file mode 100644
index 00000000..5092852a
--- /dev/null
+++ b/app/src/main/java/com/ic/protocol/utils/CustomNotification.java
@@ -0,0 +1,216 @@
+package com.ic.protocol.utils;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+public class CustomNotification extends Dialog {
+  public CustomNotification(Context paramContext) { super(paramContext); }
+  
+  public CustomNotification(Context paramContext, int paramInt) { super(paramContext, paramInt); }
+  
+  public static class Builder {
+    private View contentView;
+    
+    private String content_messgae;
+    
+    private Context context;
+    
+    private CustomNotification mDialog;
+    
+    private String message;
+    
+    private int msg_count;
+    
+    private OnClickListener negativeButtonClickListener;
+
+    private String negativeButtonText;
+
+    private OnClickListener positiveButtonClickListener;
+
+    private String positiveButtonText;
+
+    private int time;
+
+    private String title;
+
+    private int titleImg;
+
+    private View.OnTouchListener viewOnTouchListener;
+
+    public Builder(Context param1Context) { this.context = param1Context; }
+
+    private CustomNotification getDialogInstance() {
+//      this.mDialog = new CustomNotification(this.context, 2131689630);
+//      View view = ((LayoutInflater)this.context.getSystemService("layout_inflater")).inflate(2131361841, null);
+//      this.mDialog.addContentView(view, new ViewGroup.LayoutParams(-1, -2));
+//      ((ImageView)view.findViewById(2131230809)).setImageResource(this.titleImg);
+//      ((TextView)view.findViewById(2131230876)).setText(this.title);
+//      if (this.time <= 0) {
+//        ((TextView)view.findViewById(2131230875)).setText(this.context.getText(2131624052));
+//      } else {
+//        StringBuilder stringBuilder = new StringBuilder();
+//        stringBuilder.append(String.valueOf(this.time));
+//        stringBuilder.append(this.context.getText(2131624054));
+//        String str = stringBuilder.toString();
+//        ((TextView)view.findViewById(2131230875)).setText(str);
+//      }
+//      if (this.positiveButtonText != null) {
+//        ((ImageButton)view.findViewById(2131230836)).setImageResource(2131165276);
+//        if (this.positiveButtonClickListener != null) {
+//          final CustomNotification finalDialog1 = this.mDialog;
+//          ((ImageButton)view.findViewById(2131230836)).setOnClickListener(new View.OnClickListener() {
+//                public void onClick(View param2View) { CustomNotification.Builder.this.positiveButtonClickListener.onClick(finalDialog, -1); }
+//              });
+//        }
+//      } else {
+//        view.findViewById(2131230836).setVisibility(View.GONE);
+//      }
+//      if (this.negativeButtonText != null) {
+//        ((ImageButton)view.findViewById(2131230825)).setImageResource(2131165273);
+//        if (this.negativeButtonClickListener != null) {
+//          final CustomNotification finalDialog1 = this.mDialog;
+//          ((ImageButton)view.findViewById(2131230825)).setOnClickListener(new View.OnClickListener() {
+//                public void onClick(View param2View) { CustomNotification.Builder.this.negativeButtonClickListener.onClick(finalDialog1, -2); }
+//              });
+//        }
+//      } else {
+//        view.findViewById(2131230825).setVisibility(8);
+//      }
+//      if (this.message != null)
+//        if (this.msg_count > 0) {
+//          StringBuilder stringBuilder = new StringBuilder();
+//          stringBuilder.append(this.message);
+//          stringBuilder.append("(");
+//          stringBuilder.append(String.valueOf(this.msg_count));
+//          stringBuilder.append(")");
+//          String str = stringBuilder.toString();
+//          ((TextView)view.findViewById(2131230822)).setText(str);
+//        } else {
+//          ((TextView)view.findViewById(2131230822)).setText(this.message);
+//        }
+//      if (this.content_messgae != null)
+//        ((TextView)view.findViewById(2131230793)).setText(this.content_messgae);
+//      if (this.viewOnTouchListener != null)
+//        view.setOnTouchListener(new View.OnTouchListener() {
+//              public boolean onTouch(View param2View, MotionEvent param2MotionEvent) {
+//                CustomNotification.Builder.this.viewOnTouchListener.onTouch(param2View, param2MotionEvent);
+//                return true;
+//              }
+//            });
+//      this.mDialog.setContentView(view);
+      return this.mDialog;
+    }
+    
+    public CustomNotification create() { // Byte code:
+      //   0: aload_0
+      //   1: getfield mDialog : Lcom/enqualcomm/support/util/CustomNotification;
+      //   4: ifnonnull -> 37
+      //   7: ldc com/enqualcomm/support/util/CustomNotification
+      //   9: monitorenter
+      //   10: aload_0
+      //   11: getfield mDialog : Lcom/enqualcomm/support/util/CustomNotification;
+      //   14: ifnonnull -> 25
+      //   17: aload_0
+      //   18: aload_0
+      //   19: invokespecial getDialogInstance : ()Lcom/enqualcomm/support/util/CustomNotification;
+      //   22: putfield mDialog : Lcom/enqualcomm/support/util/CustomNotification;
+      //   25: ldc com/enqualcomm/support/util/CustomNotification
+      //   27: monitorexit
+      //   28: goto -> 37
+      //   31: astore_1
+      //   32: ldc com/enqualcomm/support/util/CustomNotification
+      //   34: monitorexit
+      //   35: aload_1
+      //   36: athrow
+      //   37: aload_0
+      //   38: getfield mDialog : Lcom/enqualcomm/support/util/CustomNotification;
+      //   41: areturn
+      // Exception table:
+      //   from	to	target	type
+      //   10	25	31	finally
+      //   25	28	31	finally
+      //   32	35	31	finally }
+      return mDialog;
+    }
+    public Builder setContentMessage(String param1String) {
+      this.content_messgae = param1String;
+      return this;
+    }
+    
+    public Builder setContentView(View param1View) {
+      this.contentView = param1View;
+      return this;
+    }
+    
+    public Builder setLayoutViewClick(View.OnTouchListener param1OnTouchListener) {
+      this.viewOnTouchListener = param1OnTouchListener;
+      return this;
+    }
+    
+    public Builder setMessage(int param1Int) {
+      this.message = (String)this.context.getText(param1Int);
+      return this;
+    }
+    
+    public Builder setMessage(String param1String) {
+      this.message = param1String;
+      return this;
+    }
+    
+    public Builder setMessage(String param1String, int param1Int) {
+      this.message = param1String;
+      this.msg_count = param1Int;
+      return this;
+    }
+    
+    public Builder setNegativeButton(int param1Int, DialogInterface.OnClickListener param1OnClickListener) {
+      this.negativeButtonText = (String)this.context.getText(param1Int);
+      this.negativeButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setNegativeButton(String param1String, DialogInterface.OnClickListener param1OnClickListener) {
+      this.negativeButtonText = param1String;
+      this.negativeButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setPositiveButton(int param1Int, DialogInterface.OnClickListener param1OnClickListener) {
+      this.positiveButtonText = (String)this.context.getText(param1Int);
+      this.positiveButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setPositiveButton(String param1String, DialogInterface.OnClickListener param1OnClickListener) {
+      this.positiveButtonText = param1String;
+      this.positiveButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setTitle(int param1Int) {
+      this.title = (String)this.context.getText(param1Int);
+      return this;
+    }
+    
+    public Builder setTitle(int param1Int1, int param1Int2, int param1Int3) {
+      this.titleImg = param1Int1;
+      this.title = (String)this.context.getText(param1Int2);
+      this.time = param1Int3;
+      return this;
+    }
+    
+    public Builder setTitle(String param1String) {
+      this.title = param1String;
+      return this;
+    }
+  }
+}
+
diff --git a/app/src/main/java/com/ic/protocol/utils/Logger.java b/app/src/main/java/com/ic/protocol/utils/Logger.java
index f8a974fb..93cb87ad 100644
--- a/app/src/main/java/com/ic/protocol/utils/Logger.java
+++ b/app/src/main/java/com/ic/protocol/utils/Logger.java
@@ -33,7 +33,7 @@ public class Logger {
   }
 
   public static void i(Object var0) {
-    if (DEBUG) {
+    if (DEBUG && var0 !=null) {
       String var1 = getFunctionName();
       if (var1 != null) {
         StringBuilder sb = new StringBuilder();
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 25c12988..f6db7c14 100644
--- a/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
+++ b/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
@@ -3,6 +3,7 @@ package com.ic.protocol.utils;
 import android.os.SystemClock;
 
 
+import com.ic.protocol.adapter.protocolAPIHelper;
 import com.ic.protocol.bean.StringMessage;
 
 import java.net.InetAddress;
@@ -14,20 +15,56 @@ import java.util.concurrent.Executors;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
+import static com.ic.protocol.utils.RxSocket.SocketStatus.CONNECTED;
+import static com.ic.protocol.utils.RxSocket.SocketStatus.DIS_CONNECT;
 
-public class NettyConnection implements Connection {
+
+public class NettyConnection implements Connection ,RxSocket.SocketConnectionListener{
   private static long realtime_old;
   private static final String TAG = NettyConnection.class.getSimpleName();
 
   ExecutorService executorService = Executors.newSingleThreadExecutor();
-  
-  private final ConnectionListener listener;
+
+  private protocolAPIHelper API=null;
+  private ConnectionListener listener=null;
   
   private int timeout = 60;
   
   public NettyConnection(ConnectionListener paramConnectionListener) {
     this.listener = paramConnectionListener;
-
+    RxSocket.getInstance().setConnectionListener(this);
+    if (API == null) API=new protocolAPIHelper(
+            new protocolAPIHelper.CmdHandler() {
+                @Override
+                public boolean handleCmd(protocolAPIHelper.CMD_TYPE type, String cmd) {
+
+                        boolean ret=true;
+
+                        switch (type){
+                            case BP00:
+//              API.handleBP00(cmd);
+                                handle_cmd("Link:OK",cmd);
+                                break;
+                            case BP01:
+//              API.handleBP01(cmd);
+                                handle_cmd("定位AP01",cmd);
+                                break;
+                            case BP03:
+//              API.handleBP03(cmd);
+                                handle_cmd("heart",cmd);
+                                break;
+                            case BP28:
+//              API.handleBP28(cmd);
+                                handle_cmd("语音BP28",cmd);
+                                break;
+
+                        }
+
+                        return ret;
+
+                }
+            }
+    );
   }
   
   private void connectImpl(String host, int port) {
@@ -36,8 +73,8 @@ public class NettyConnection implements Connection {
   }
   
   public void close() {
-
-
+      listener =null;
+      RxSocket.getInstance().setConnectionListener(null);
   }
   
   public void connect(final String host, final int port) {
@@ -45,8 +82,8 @@ public class NettyConnection implements Connection {
     if (l - realtime_old < 3000L)
       return; 
     realtime_old = l;
-    Logger.i("connect1");
-    disconnect();
+    Logger.i("connect1 "+host+":"+port);
+//    disconnect();
     this.executorService.execute(new Runnable() {
           public void run() {
             NettyConnection.this.connectImpl(host, port);
@@ -133,12 +170,12 @@ public class NettyConnection implements Connection {
 
 
   public boolean isServerConnected(){
-    return (RxSocket.getInstance().getSocketStatus()==RxSocket.SocketStatus.CONNECTED)?true:false;
+    return (RxSocket.getInstance().getSocketStatus()== CONNECTED)?true:false;
   }
   public boolean sendMsg(String  cmd) {
 
 
-    if(!isServerConnected())
+    if(!isServerConnected()|| cmd==null || cmd.isEmpty())
     {
       return false;
     }
@@ -161,9 +198,17 @@ public class NettyConnection implements Connection {
     return true;
   }
 
-
   public int getTimeout() { return this.timeout; }
-  
+
+
+  private void handle_cmd(String cmd,String msg){
+      if (NettyConnection.this.listener!=null){
+          String[] msgArr=new String[]{cmd,msg};
+          StringMessage stringMessage=new StringMessage(msgArr);
+          stringMessage.refresh(msg);
+          NettyConnection.this.listener.onReceive(stringMessage );
+      }
+  }
   public void open() {
 
       //监听Socket的收包
@@ -175,11 +220,9 @@ public class NettyConnection implements Connection {
                           //这里，应该去处理这个消息
                           String msg=new String(bytes);
                           log("get Msg :"+msg+" (size)" + bytes.length);
-                          if (NettyConnection.this.listener!=null){
-                              NettyConnection.this.listener.onReceive(
-                                      new StringMessage(msg)
-                              );
-                          }
+
+                          API.parserCmd(msg);
+
                       },
                       throwable -> {
 
@@ -195,6 +238,15 @@ public class NettyConnection implements Connection {
               .observeOn(AndroidSchedulers.mainThread())
               .subscribe(socketStatus -> {
                   log("socketStatus:" + socketStatus.name());
+                  if (socketStatus.name().equals("CONNECTED")){
+                      if (NettyConnection.this.listener!=null){
+                          NettyConnection.this.listener.onConnectionOpen();
+                      }
+                  }else if (socketStatus.name().equals("DIS_CONNECT")) {
+                      if (NettyConnection.this.listener!=null){
+                          NettyConnection.this.listener.onConnectionClose();
+                      }
+                  }
               });
 
   }
@@ -207,10 +259,25 @@ public class NettyConnection implements Connection {
   }
   
   public boolean sendBlocking(StringMessage paramStringMessage) {
-    Logger.i(paramStringMessage.toString());
+    Logger.i(paramStringMessage.isFromCache());
+      sendMsg(paramStringMessage.isFromCache());
     return true;
     }
   
   public void setTimeout(int paramInt) { this.timeout = paramInt; }
+
+    @Override
+    public void onConnectionClose(String errMsg) {
+//        if (NettyConnection.this.listener!=null){
+//            NettyConnection.this.listener.onConnectionClose();
+//        }
+    }
+
+    @Override
+    public void onConnectionOpen() {
+//        if (NettyConnection.this.listener!=null){
+//            NettyConnection.this.listener.onConnectionOpen();
+//        }
+    }
 }
 
diff --git a/app/src/main/java/com/ic/protocol/utils/NetworkObservable.java b/app/src/main/java/com/ic/protocol/utils/NetworkObservable.java
index 929a8c46..ab0a27b6 100644
--- a/app/src/main/java/com/ic/protocol/utils/NetworkObservable.java
+++ b/app/src/main/java/com/ic/protocol/utils/NetworkObservable.java
@@ -26,30 +26,42 @@ public class NetworkObservable {
           stringBuilder.append(",network_is_from_no_to_yes=");
           stringBuilder.append(NetworkObservable.this.network_is_from_no_to_yes);
           Logger.i(stringBuilder.toString());
+
+          // 如果 服务器socket没有连接，且 网络没有变化
           if (!KeepAlive.isConnected && !NetworkObservable.this.network_is_from_no_to_yes) {
+
+            //如果网络关闭 则 检查执行下一个网络对象，此时没有转换网络状态
             if (NetworkObservable.this.network_is_down) {
               NetworkObservable.this.objectPublishSubject.onNext(Integer.valueOf(3));
 //              NetworkObservable.access$002(NetworkObservable.this, false);
               NetworkObservable.this.network_is_from_no_to_yes=false;
             } else {
+
+              //如果网络已经开启，则设置网络状态从关闭到开启，并检查执行下一个网络对象
               NetworkObservable.this.objectPublishSubject.onNext(Integer.valueOf(2));
 //              NetworkObservable.access$002(NetworkObservable.this, true);
               NetworkObservable.this.network_is_from_no_to_yes=true;
             } 
-          } else if (NetworkObservable.this.network_is_from_no_to_yes) {
+          } else if (!KeepAlive.isConnected && NetworkObservable.this.network_is_from_no_to_yes) {
+
+            //如果网络转换已经成功，则只需检查执行下一个网络对象
             NetworkObservable.this.objectPublishSubject.onNext(Integer.valueOf(1));
           } else if (KeepAlive.isConnected) {
+            //如果 网络服务器已经连接，则无需转换网络
 //            NetworkObservable.access$002(NetworkObservable.this, false);
             NetworkObservable.this.network_is_from_no_to_yes=false;
-          } 
+          }
+
+          //所有检测都通过，就证明网络连接成功，network_is_down 自然就是false
 //          NetworkObservable.access$102(NetworkObservable.this, false);
           NetworkObservable.this.network_is_down=false;
-          return;
-        } 
-        Logger.i("网络断开");
+
+        } else {
+          Logger.i("网络断开");
 //        NetworkObservable.access$102(NetworkObservable.this, true);
-        NetworkObservable.this.network_is_down=true;
-        NetworkObservable.this.objectPublishSubject.onNext(Integer.valueOf(0));
+          NetworkObservable.this.network_is_down = true;
+          NetworkObservable.this.objectPublishSubject.onNext(Integer.valueOf(0));
+        }
       }
     };
   
diff --git a/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java b/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java
index 579d8434..4669f455 100644
--- a/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java
@@ -17,6 +17,7 @@ import android.view.MotionEvent;
 import android.view.View;
 
 
+import com.ic.protocol.R;
 import com.ic.protocol.bean.Contact;
 import com.ic.protocol.service.AudioService;
 
@@ -27,6 +28,9 @@ import rx.Subscriber;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
+import static android.os.PowerManager.ACQUIRE_CAUSES_WAKEUP;
+import static android.os.PowerManager.SCREEN_DIM_WAKE_LOCK;
+
 public class ProcessReceiver extends BroadcastReceiver {
   private static final int MICRO_CHAT = 2;
   
@@ -121,11 +125,11 @@ public class ProcessReceiver extends BroadcastReceiver {
   }
   
   private void screenOn(Context paramContext) {
-//    final PowerManager.WakeLock wakelock = ((PowerManager)paramContext.getSystemService(Context.POWER_SERVICE)).newWakeLock(268435462, "target");
-//    wakeLock.acquire();
-//    Observable.timer(5000L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {
-//          public void call(Long param1Long) { wakelock.release(); }
-//        });
+    final PowerManager.WakeLock wakelock = ((PowerManager)paramContext.getSystemService(Context.POWER_SERVICE)).newWakeLock(ACQUIRE_CAUSES_WAKEUP| SCREEN_DIM_WAKE_LOCK, "target");
+    wakelock.acquire();
+    Observable.timer(5000L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {
+          public void call(Long param1Long) { wakelock.release(); }
+        });
   }
   
   public void initCustomNotification(final Context context, final Contact contact, final String content_msg, int paramInt) {
@@ -303,79 +307,79 @@ public class ProcessReceiver extends BroadcastReceiver {
   }
   
   public void initNotification(Contact paramContact, Context paramContext) {
-//    String str = paramContact.name;
-//    Uri uri = RingtoneManager.getDefaultUri(2);
-//    NotificationCompat.Builder builder = (new NotificationCompat.Builder(paramContext)).setSmallIcon(2131165361).setContentTitle(paramContext.getString(2131624065)).setWhen(System.currentTimeMillis()).setAutoCancel(true);
-//    StringBuilder stringBuilder = new StringBuilder();
-//    stringBuilder.append(paramContext.getString(2131624074));
-//    stringBuilder.append("  ");
-//    stringBuilder.append(str);
-//    stringBuilder.append(paramContext.getString(2131624075));
-//    Notification notification = builder.setContentText(stringBuilder.toString()).setTicker(paramContext.getString(2131624069)).setSound(uri).build();
-//    this.mNotificationManager = (NotificationManager)paramContext.getSystemService("notification");
-//    this.mNotificationManager.notify(1, notification);
+    String str = paramContact.name;
+    Uri uri = RingtoneManager.getDefaultUri(2);
+    NotificationCompat.Builder builder = (new NotificationCompat.Builder(paramContext)).setSmallIcon(R.drawable.toast_error).setContentTitle(paramContext.getString(R.string.app_name)).setWhen(System.currentTimeMillis()).setAutoCancel(true);
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append(paramContext.getString(R.string.app_name));
+    stringBuilder.append("  ");
+    stringBuilder.append(str);
+    stringBuilder.append(paramContext.getString(R.string.app_name));
+    Notification notification = builder.setContentText(stringBuilder.toString()).setTicker(paramContext.getString(R.string.app_name)).setSound(uri).build();
+    this.mNotificationManager = (NotificationManager)paramContext.getSystemService(Context.NOTIFICATION_SERVICE);
+    this.mNotificationManager.notify(1, notification);
   }
   
   public void onReceive(Context paramContext, Intent paramIntent) {
-//    Contact contact;
-//    String str = paramIntent.getAction();
-//    StringBuilder stringBuilder = new StringBuilder();
-//    stringBuilder.append("action==");
-//    stringBuilder.append(str);
-//    Logger.i(stringBuilder.toString());
-//    if ("com.enqualcomm.support.ACTION_STEP_COUNT_ALARM".equals(str)) {
+    Contact contact;
+    String str = paramIntent.getAction();
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append("action==");
+    stringBuilder.append(str);
+    Logger.i(stringBuilder.toString());
+    if ("com.enqualcomm.support.ACTION_STEP_COUNT_ALARM".equals(str)) {
 //      EqcAlgorithmNative.native_EqcAlgorithm_Gsensor_clear_step();
-//      AlarmHelper.setCleanStepCountAlarm(paramContext, 23, 59, "com.enqualcomm.support.ACTION_STEP_COUNT_ALARM");
-//      return;
-//    }
-//    if ("com.enqualcomm.imessage.RESUME_ACTION".equals(str)) {
-//      SharPreferenceUtil.setPrefBoolean(paramContext, "key_is_resume", paramIntent.getBooleanExtra("is_resume", false));
-//      return;
-//    }
-//    if ("com.enqualcomm.support.DIALOG".equals(str)) {
-//      contact = (Contact)paramIntent.getParcelableExtra("contact");
-//      SharPreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-//      boolean bool = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
-//      if (contact != null && !bool) {
-//        if (!DeviceInfoUtil.isTopActivity(paramContext)) {
-//          initMyDialog(paramContext, contact, 1);
-//          playNotificationVoice(paramContext);
-//        }
-//        screenOn(paramContext);
-//        return;
-//      }
-//    } else if ("com.enqualcomm.imessage.SOS_ACTION".equals(str)) {
-//      if (contact.getIntExtra("sos_end", 0) == 0) {
+      AlarmHelper.setCleanStepCountAlarm(paramContext, 23, 59, "com.enqualcomm.support.ACTION_STEP_COUNT_ALARM");
+      return;
+    }
+    if ("com.enqualcomm.imessage.RESUME_ACTION".equals(str)) {
+      SharPreferenceUtil.setPrefBoolean(paramContext, "key_is_resume", paramIntent.getBooleanExtra("is_resume", false));
+      return;
+    }
+    if ("com.enqualcomm.support.DIALOG".equals(str)) {
+      contact = (Contact)paramIntent.getParcelableExtra("contact");
+      SharPreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
+      boolean bool = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+      if (contact != null && !bool) {
+        if (!DeviceInfoUtil.isTopActivity(paramContext)) {
+          initMyDialog(paramContext, contact, 1);
+          playNotificationVoice(paramContext);
+        }
+        screenOn(paramContext);
+        return;
+      }
+    } else if ("com.enqualcomm.imessage.SOS_ACTION".equals(str)) {
+      if (paramIntent.getIntExtra("sos_end", 0) == 0) {
 //        EqcAlgorithmNative.native_EqcAlgorithmMethod3(8);
-//        sendStheartRateBroadcast(paramContext, "com.eqc.heartrate.action.SILENT_START", 3);
-//        return;
-//      }
-//    } else {
-//      String str1;
-//      if ("com.enqualcomm.support.ACTION_REMOTE_CAMERA".equals(contact.getAction())) {
-//        str1 = contact.getStringExtra("key_remote_number");
-//        (new CameraUtil(paramContext)).getPictur(str1);
-//        return;
-//      }
-//      if ("com.enqualcomm.support.CloseUnreadMsg".equals(str1.getAction()) || "android.intent.action.BATTERY_LOW".equals(str1.getAction())) {
+        sendStheartRateBroadcast(paramContext, "com.eqc.heartrate.action.SILENT_START", 3);
+        return;
+      }
+    } else {
+      String str1;
+      if ("com.enqualcomm.support.ACTION_REMOTE_CAMERA".equals(paramIntent.getAction())) {
+        str1 = paramIntent.getStringExtra("key_remote_number");
+        (new CameraUtil(paramContext)).getPictur(str1);
+        return;
+      }
+      if ("com.enqualcomm.support.CloseUnreadMsg".equals(paramIntent.getAction()) || "android.intent.action.BATTERY_LOW".equals(paramIntent.getAction())) {
 //        if (mCustomDialog != null && mCustomDialog.isShowing())
 //          mCustomDialog.dismiss();
 //        if (this.mCustomNotification != null && this.mCustomNotification.isShowing())
 //          this.mCustomNotification.dismiss();
-//        return;
-//      }
-//      if ("com.enqualcomm.support.ACTION_MISSED_CALL_GET".equals(str)) {
-//        Contact contact1 = (Contact)str1.getParcelableExtra("contact");
-//        contact1.extra = str1.getStringExtra("date");
-//        boolean bool = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
-//        if (contact1 != null && !bool) {
-//          initMyDialog(paramContext, contact1, 2);
-//          playNotificationVoice(paramContext);
-//          screenOn(paramContext);
-//          return;
-//        }
-//      }
-//    }
+        return;
+      }
+      if ("com.enqualcomm.support.ACTION_MISSED_CALL_GET".equals(str)) {
+        Contact contact1 = (Contact)paramIntent.getParcelableExtra("contact");
+        contact1.extra = paramIntent.getStringExtra("date");
+        boolean bool = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+        if (contact1 != null && !bool) {
+          initMyDialog(paramContext, contact1, 2);
+          playNotificationVoice(paramContext);
+          screenOn(paramContext);
+          return;
+        }
+      }
+    }
   }
   
   public void sendStheartRateBroadcast(Context paramContext, String paramString, int paramInt) {
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 82c797cb..9fd0e85f 100644
--- a/app/src/main/java/com/ic/protocol/utils/RxSocket.java
+++ b/app/src/main/java/com/ic/protocol/utils/RxSocket.java
@@ -72,6 +72,7 @@ public class RxSocket {
     private ReadThread readThread = null;
     private boolean isReadThreadAlive = true;
     private SocketReconnectCallback socketReconnectCallback = null;
+    private SocketConnectionListener conectionListener = null;
 
     /*  方法
     * */
@@ -83,6 +84,9 @@ public class RxSocket {
         return connectStatus;
     }
 
+    public void setConnectionListener(SocketConnectionListener callback){
+        conectionListener=callback;
+    }
     /**
      * 建立Socket连接，只是尝试建立一次
      * @param ip    IP or 域名
@@ -131,10 +135,11 @@ public class RxSocket {
                         isReadThreadAlive = true;
                         readThread = new ReadThread(ip,port);
                         readThread.start();
+
                         socketReconnectCallback = new SocketReconnectCallback() {
                             @Override
                             public void onSuccess() {
-                                LogUtils.i(OpenLog,TAG,"connectRx:"+"CONNECTED");
+                                LogUtils.i(OpenLog, TAG, "connectRx:" + "CONNECTED");
                                 socketStatus = SocketStatus.CONNECTED;
                                 subscriber.onNext(true);
                                 subscriber.onCompleted();
@@ -142,11 +147,12 @@ public class RxSocket {
 
                             @Override
                             public void onFail(String msg) {
-                                LogUtils.i(OpenLog,TAG,"connectRx:"+msg);
+                                LogUtils.i(OpenLog, TAG, "connectRx:" + msg);
                                 subscriber.onNext(false);
                                 subscriber.onCompleted();
                             }
                         };
+
                     }
                 })
                 .subscribeOn(Schedulers.newThread())
@@ -298,6 +304,10 @@ public class RxSocket {
                         LogUtils.e(OpenLog, TAG, "ReadThread:init:" + e.getMessage());
                         if (socketReconnectCallback!=null)
                             socketReconnectCallback.onFail("SocketConnectFail1");
+
+//                        if( conectionListener !=null) {
+//                            conectionListener.onConnectionClose("SocketConnectFail");
+//                        }
                     }
                 }
                 //读取
@@ -317,6 +327,10 @@ public class RxSocket {
                                         socketChannel.register(selector, SelectionKey.OP_READ);
                                         if (socketReconnectCallback!=null)
                                             socketReconnectCallback.onSuccess();
+
+                                        if( conectionListener !=null) {
+                                            conectionListener.onConnectionOpen();
+                                        }
                                     } catch (Exception e) {
                                         isReadThreadAlive = false;
                                         socketStatus = SocketStatus.DIS_CONNECT;
@@ -324,6 +338,10 @@ public class RxSocket {
                                         LogUtils.e(OpenLog, TAG, "ReadThread:finish:" + e.getMessage());
                                         if (socketReconnectCallback!=null)
                                             socketReconnectCallback.onFail("SocketConnectFail2");
+
+//                                        if( conectionListener !=null) {
+//                                            conectionListener.onConnectionClose("SocketConnectFail2");
+//                                        }
                                     }
                                 }
                             } else if (key.isReadable()) {
@@ -336,6 +354,10 @@ public class RxSocket {
                                     connectStatus.onNext(SocketStatus.DIS_CONNECT);
                                     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];
@@ -354,6 +376,10 @@ public class RxSocket {
                         LogUtils.e(OpenLog, TAG, "ReadThread:read:" + e.getMessage());
                         if (socketReconnectCallback!=null)
                             socketReconnectCallback.onFail("SocketConnectFail4");
+
+//                        if( conectionListener !=null) {
+//                            conectionListener.onConnectionClose("SocketConnectFail4");
+//                        }
                     }
                 }
             }
@@ -370,4 +396,10 @@ public class RxSocket {
         void onSuccess();
         void onFail(String msg);
     }
+
+    public interface SocketConnectionListener {
+        void onConnectionClose(String errMsg);
+
+        void onConnectionOpen();
+    }
 }
diff --git a/library/build.gradle b/library/build.gradle
index bb3252b5..e25ddfe4 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -14,6 +14,9 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            debuggable = false
+        }
+        compileOptions {
         }
     }
 }