From 56d77d69763331f1cf0bd66d41582332327c6737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=98=8A?= <xuhao@mucang.cn>
Date: Wed, 27 Dec 2017 13:15:27 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 24dd562bbc3810d5833330399a5a750a1bd6405b.
---
 app/build.gradle                              |   2 +-
 server/.idea/workspace.xml                    | 318 +++++++++++++++---
 .../libsocket/impl/AbsConnectionManager.java  |   2 +-
 .../android/libsocket/impl/PulseManager.java  |   6 +-
 .../libsocket/impl/blockio/io/Writer.java     |   2 +-
 .../{sdk/bean => interfaces}/IPulse.java      |   2 +-
 .../bean => interfaces}/IPulseSendable.java   |   4 +-
 .../libsocket/sdk/OkSocketOptions.java        |  33 +-
 .../libsocket/sdk/SocketActionAdapter.java    |   2 +-
 .../connection/AbsReconnectionManager.java    |   2 +-
 .../interfacies/ISocketActionListener.java    |   2 +-
 .../sdk/protocol/DefaultHeaderProtocol.java   |  26 --
 .../sdk/protocol/NoneHeaderProtocol.java      |  22 --
 13 files changed, 319 insertions(+), 104 deletions(-)
 rename socket/src/main/java/com/xuhao/android/libsocket/{sdk/bean => interfaces}/IPulse.java (75%)
 rename socket/src/main/java/com/xuhao/android/libsocket/{sdk/bean => interfaces}/IPulseSendable.java (53%)
 delete mode 100644 socket/src/main/java/com/xuhao/android/libsocket/sdk/protocol/DefaultHeaderProtocol.java
 delete mode 100644 socket/src/main/java/com/xuhao/android/libsocket/sdk/protocol/NoneHeaderProtocol.java

diff --git a/app/build.gradle b/app/build.gradle
index 11758bf..51b6a6a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,5 +27,5 @@ dependencies {
     compile 'com.android.support:appcompat-v7:26.1.0'
     compile 'com.android.support:design:26.1.0'
     compile 'com.google.code.gson:gson:2.8.0'
-    compile 'com.tonystark.android:socket:1.0.1'
+    compile project(':socket')
 }
diff --git a/server/.idea/workspace.xml b/server/.idea/workspace.xml
index cf21b83..624fca9 100644
--- a/server/.idea/workspace.xml
+++ b/server/.idea/workspace.xml
@@ -17,10 +17,88 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="MsgBean.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/bean/MsgBean.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="60">
+              <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PluseBean.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/bean/PluseBean.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="60">
+              <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="MsgDispatcher.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/MsgDispatcher.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="178">
+              <caret line="59" column="0" lean-forward="true" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ConcurrentHashMap.java" pinned="false" current-in-tab="false">
+        <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/util/concurrent/ConcurrentHashMap.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="15225">
+              <caret line="1096" column="18" lean-forward="false" selection-start-line="1096" selection-start-column="18" selection-end-line="1096" selection-end-column="18" />
+              <folding>
+                <element signature="e#48122#48123#0" expanded="true" />
+                <element signature="e#48173#48174#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="InetAddress.java" pinned="false" current-in-tab="false">
+        <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/net/InetAddress.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="7230">
+              <caret line="558" column="59" lean-forward="false" selection-start-line="558" selection-start-column="59" selection-end-line="558" selection-end-column="59" />
+              <folding>
+                <element signature="e#24417#24418#0" expanded="true" />
+                <element signature="e#24445#24446#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AccessController.java" pinned="false" current-in-tab="false">
+        <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/security/AccessController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="3570">
+              <caret line="263" column="19" lean-forward="false" selection-start-line="263" selection-start-column="19" selection-end-line="263" selection-end-column="19" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PrivilegedExceptionAction.java" pinned="false" current-in-tab="false">
+        <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/security/PrivilegedExceptionAction.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="315">
+              <caret line="44" column="17" lean-forward="false" selection-start-line="44" selection-start-column="17" selection-end-line="44" selection-end-column="17" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="349">
+            <state relative-caret-position="1005">
               <caret line="67" column="0" lean-forward="false" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -48,8 +126,8 @@
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="262" />
-    <option name="y" value="135" />
+    <option name="x" value="17" />
+    <option name="y" value="40" />
     <option name="width" value="1406" />
     <option name="height" value="806" />
   </component>
@@ -68,10 +146,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
       <pane id="Scope" />
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -118,13 +193,15 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scratches" />
+      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.0" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -259,8 +336,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="262" y="135" width="1406" height="806" extended-state="0" />
-    <editor active="true" />
+    <frame x="17" y="40" width="1406" height="806" extended-state="0" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -274,7 +350,7 @@
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24633431" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24633431" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -312,22 +388,60 @@
     </watches-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/Main.java">
+    <entry file="file://$PROJECT_DIR$/src/bean/MsgBean.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="60">
+          <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/bean/PluseBean.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/util/concurrent/ConcurrentHashMap.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16440">
+          <caret line="1096" column="18" lean-forward="false" selection-start-line="1096" selection-start-column="18" selection-end-line="1096" selection-end-column="18" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#48122#48123#0" expanded="true" />
+            <element signature="e#48173#48174#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/bean/MsgBean.java" />
-    <entry file="file://$PROJECT_DIR$/src/bean/PluseBean.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/util/concurrent/ConcurrentHashMap.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/net/InetAddress.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/security/AccessController.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/security/PrivilegedExceptionAction.java" />
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/net/InetAddress.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="7230">
+          <caret line="558" column="59" lean-forward="true" selection-start-line="558" selection-start-column="59" selection-end-line="558" selection-end-column="59" />
+          <folding>
+            <element signature="e#24417#24418#0" expanded="true" />
+            <element signature="e#24445#24446#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/security/AccessController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3570">
+          <caret line="263" column="19" lean-forward="false" selection-start-line="263" selection-start-column="19" selection-end-line="263" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/security/PrivilegedExceptionAction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="44" column="17" lean-forward="false" selection-start-line="44" selection-start-column="17" selection-end-line="44" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/Main.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1005">
@@ -338,11 +452,50 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/MsgDispatcher.java" />
-    <entry file="file://$PROJECT_DIR$/src/bean/MsgBean.java" />
-    <entry file="file://$PROJECT_DIR$/src/MsgDispatcher.java" />
-    <entry file="file://$PROJECT_DIR$/src/bean/PluseBean.java" />
-    <entry file="file://$PROJECT_DIR$/src/utils/PortCheck.java" />
+    <entry file="file://$PROJECT_DIR$/src/MsgDispatcher.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="810">
+          <caret line="67" column="0" lean-forward="false" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/bean/MsgBean.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/MsgDispatcher.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="870">
+          <caret line="58" column="42" lean-forward="false" selection-start-line="58" selection-start-column="42" selection-end-line="58" selection-end-column="42" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/bean/PluseBean.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/utils/PortCheck.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/Main.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="750">
@@ -353,19 +506,99 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/bean/MsgBean.java" />
-    <entry file="file://$PROJECT_DIR$/src/bean/PluseBean.java" />
-    <entry file="file://$PROJECT_DIR$/src/MessageQueue.java" />
-    <entry file="file://$PROJECT_DIR$/src/utils/PortCheck.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/security/PrivilegedExceptionAction.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/security/AccessController.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/net/Socket.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/net/Inet4Address.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/net/InetAddress.java" />
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/util/concurrent/ConcurrentHashMap.java" />
+    <entry file="file://$PROJECT_DIR$/src/bean/MsgBean.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/bean/PluseBean.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/MessageQueue.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="11" column="36" lean-forward="false" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/utils/PortCheck.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="19" column="31" lean-forward="true" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/security/PrivilegedExceptionAction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="44" column="17" lean-forward="false" selection-start-line="44" selection-start-column="17" selection-end-line="44" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/security/AccessController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3570">
+          <caret line="263" column="19" lean-forward="false" selection-start-line="263" selection-start-column="19" selection-end-line="263" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/net/Socket.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="950" column="23" lean-forward="false" selection-start-line="950" selection-start-column="23" selection-end-line="950" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/net/Inet4Address.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3855">
+          <caret line="327" column="26" lean-forward="false" selection-start-line="327" selection-start-column="26" selection-end-line="327" selection-end-column="26" />
+          <folding>
+            <element signature="e#10941#10942#0" expanded="false" />
+            <element signature="e#10997#10998#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/net/InetAddress.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="7230">
+          <caret line="558" column="59" lean-forward="false" selection-start-line="558" selection-start-column="59" selection-end-line="558" selection-end-column="59" />
+          <folding>
+            <element signature="e#24417#24418#0" expanded="true" />
+            <element signature="e#24445#24446#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/src.zip!/java/util/concurrent/ConcurrentHashMap.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15225">
+          <caret line="1096" column="18" lean-forward="false" selection-start-line="1096" selection-start-column="18" selection-end-line="1096" selection-end-column="18" />
+          <folding>
+            <element signature="e#48122#48123#0" expanded="true" />
+            <element signature="e#48173#48174#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="349">
+        <state relative-caret-position="1005">
           <caret line="67" column="0" lean-forward="false" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -373,7 +606,16 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/MsgDispatcher.java" />
+    <entry file="file://$PROJECT_DIR$/src/MsgDispatcher.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="59" column="0" lean-forward="true" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/socket/src/main/java/com/xuhao/android/libsocket/impl/AbsConnectionManager.java b/socket/src/main/java/com/xuhao/android/libsocket/impl/AbsConnectionManager.java
index 98b949d..933f4f1 100644
--- a/socket/src/main/java/com/xuhao/android/libsocket/impl/AbsConnectionManager.java
+++ b/socket/src/main/java/com/xuhao/android/libsocket/impl/AbsConnectionManager.java
@@ -6,7 +6,7 @@
 import android.content.IntentFilter;
 
 import com.xuhao.android.libsocket.impl.abilities.IConnectionSwitchListener;
-import com.xuhao.android.libsocket.sdk.bean.IPulseSendable;
+import com.xuhao.android.libsocket.interfaces.IPulseSendable;
 import com.xuhao.android.libsocket.sdk.ConnectionInfo;
 import com.xuhao.android.libsocket.sdk.bean.ISendable;
 import com.xuhao.android.libsocket.sdk.bean.OriginalData;
diff --git a/socket/src/main/java/com/xuhao/android/libsocket/impl/PulseManager.java b/socket/src/main/java/com/xuhao/android/libsocket/impl/PulseManager.java
index fdf1a16..feeaf09 100644
--- a/socket/src/main/java/com/xuhao/android/libsocket/impl/PulseManager.java
+++ b/socket/src/main/java/com/xuhao/android/libsocket/impl/PulseManager.java
@@ -5,8 +5,8 @@
 import android.os.Message;
 
 import com.xuhao.android.libsocket.impl.exceptions.DogDeadException;
-import com.xuhao.android.libsocket.sdk.bean.IPulse;
-import com.xuhao.android.libsocket.sdk.bean.IPulseSendable;
+import com.xuhao.android.libsocket.interfaces.IPulse;
+import com.xuhao.android.libsocket.interfaces.IPulseSendable;
 import com.xuhao.android.libsocket.sdk.OkSocketOptions;
 import com.xuhao.android.libsocket.sdk.connection.IConnectionManager;
 
@@ -156,6 +156,4 @@ protected void setOkOptions(OkSocketOptions okOptions) {
             pulse();
         }
     }
-
-
 }
diff --git a/socket/src/main/java/com/xuhao/android/libsocket/impl/blockio/io/Writer.java b/socket/src/main/java/com/xuhao/android/libsocket/impl/blockio/io/Writer.java
index 1e7dccc..4c6115a 100644
--- a/socket/src/main/java/com/xuhao/android/libsocket/impl/blockio/io/Writer.java
+++ b/socket/src/main/java/com/xuhao/android/libsocket/impl/blockio/io/Writer.java
@@ -2,7 +2,7 @@
 
 import com.xuhao.android.libsocket.impl.abilities.IWriter;
 import com.xuhao.android.libsocket.impl.exceptions.WriteException;
-import com.xuhao.android.libsocket.sdk.bean.IPulseSendable;
+import com.xuhao.android.libsocket.interfaces.IPulseSendable;
 import com.xuhao.android.libsocket.sdk.OkSocketOptions;
 import com.xuhao.android.libsocket.sdk.bean.ISendable;
 import com.xuhao.android.libsocket.sdk.connection.abilities.IStateSender;
diff --git a/socket/src/main/java/com/xuhao/android/libsocket/sdk/bean/IPulse.java b/socket/src/main/java/com/xuhao/android/libsocket/interfaces/IPulse.java
similarity index 75%
rename from socket/src/main/java/com/xuhao/android/libsocket/sdk/bean/IPulse.java
rename to socket/src/main/java/com/xuhao/android/libsocket/interfaces/IPulse.java
index 54d4b36..8d228b9 100644
--- a/socket/src/main/java/com/xuhao/android/libsocket/sdk/bean/IPulse.java
+++ b/socket/src/main/java/com/xuhao/android/libsocket/interfaces/IPulse.java
@@ -1,4 +1,4 @@
-package com.xuhao.android.libsocket.sdk.bean;
+package com.xuhao.android.libsocket.interfaces;
 
 /**
  * Created by xuhao on 2017/5/18.
diff --git a/socket/src/main/java/com/xuhao/android/libsocket/sdk/bean/IPulseSendable.java b/socket/src/main/java/com/xuhao/android/libsocket/interfaces/IPulseSendable.java
similarity index 53%
rename from socket/src/main/java/com/xuhao/android/libsocket/sdk/bean/IPulseSendable.java
rename to socket/src/main/java/com/xuhao/android/libsocket/interfaces/IPulseSendable.java
index fda17b7..7deaeb9 100644
--- a/socket/src/main/java/com/xuhao/android/libsocket/sdk/bean/IPulseSendable.java
+++ b/socket/src/main/java/com/xuhao/android/libsocket/interfaces/IPulseSendable.java
@@ -1,4 +1,6 @@
-package com.xuhao.android.libsocket.sdk.bean;
+package com.xuhao.android.libsocket.interfaces;
+
+import com.xuhao.android.libsocket.sdk.bean.ISendable;
 
 /**
  * 心跳标记接口
diff --git a/socket/src/main/java/com/xuhao/android/libsocket/sdk/OkSocketOptions.java b/socket/src/main/java/com/xuhao/android/libsocket/sdk/OkSocketOptions.java
index d0f819b..d147eb2 100644
--- a/socket/src/main/java/com/xuhao/android/libsocket/sdk/OkSocketOptions.java
+++ b/socket/src/main/java/com/xuhao/android/libsocket/sdk/OkSocketOptions.java
@@ -1,11 +1,9 @@
 package com.xuhao.android.libsocket.sdk;
 
-import com.xuhao.android.libsocket.impl.PulseManager;
-import com.xuhao.android.libsocket.sdk.bean.IPulse;
 import com.xuhao.android.libsocket.sdk.bean.IHeaderProtocol;
 import com.xuhao.android.libsocket.sdk.connection.AbsReconnectionManager;
 import com.xuhao.android.libsocket.sdk.connection.DefaultReconnectManager;
-import com.xuhao.android.libsocket.sdk.protocol.DefaultHeaderProtocol;
+import com.xuhao.android.libsocket.utils.BytesUtils;
 
 import java.nio.ByteOrder;
 
@@ -80,10 +78,9 @@ public class OkSocketOptions {
      */
     private int mMaxReadDataMB;
     /**
-     * 心跳(脉搏)管理器
-     * 默认会使用{@link PulseManager}
+     * 是否使用阻塞Socket(不可修改,暂不提供修改方法)
      */
-    private IPulse mPulseManager;
+    private boolean isBlockSocket;
     /**
      * 重新连接管理器
      */
@@ -308,6 +305,9 @@ public ByteOrder getReadByteOrder() {
         return mReadByteOrder;
     }
 
+    public boolean isBlockSocket() {
+        return isBlockSocket;
+    }
 
     public int getPulseFeedLoseTimes() {
         return mPulseFeedLoseTimes;
@@ -333,6 +333,7 @@ public static OkSocketOptions getDefault() {
         okOptions.mReadSingleTimeBufferBytes = 50;
         okOptions.mReadByteOrder = ByteOrder.BIG_ENDIAN;
         okOptions.mWriteOrder = ByteOrder.BIG_ENDIAN;
+        okOptions.isBlockSocket = true;
         okOptions.isConnectionHolden = true;
         okOptions.mPulseFeedLoseTimes = 5;
         okOptions.mReconnectionManager = new DefaultReconnectManager();
@@ -352,4 +353,24 @@ public enum IOThreadMode {
          */
         DUPLEX;
     }
+
+    private static class DefaultHeaderProtocol implements IHeaderProtocol {
+
+        @Override
+        public int getHeaderLength() {
+            return 4;
+        }
+
+        @Override
+        public int getBodyLength(byte[] header, ByteOrder byteOrder) {
+            if (header == null || header.length == 0) {
+                return 0;
+            }
+            if (ByteOrder.BIG_ENDIAN.toString().equals(byteOrder.toString())) {
+                return BytesUtils.bytesToInt2(header, 0);
+            } else {
+                return BytesUtils.bytesToInt(header, 0);
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/socket/src/main/java/com/xuhao/android/libsocket/sdk/SocketActionAdapter.java b/socket/src/main/java/com/xuhao/android/libsocket/sdk/SocketActionAdapter.java
index 6672ce8..da72e16 100644
--- a/socket/src/main/java/com/xuhao/android/libsocket/sdk/SocketActionAdapter.java
+++ b/socket/src/main/java/com/xuhao/android/libsocket/sdk/SocketActionAdapter.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 
-import com.xuhao.android.libsocket.sdk.bean.IPulseSendable;
+import com.xuhao.android.libsocket.interfaces.IPulseSendable;
 import com.xuhao.android.libsocket.sdk.bean.ISendable;
 import com.xuhao.android.libsocket.sdk.bean.OriginalData;
 import com.xuhao.android.libsocket.sdk.connection.interfacies.ISocketActionListener;
diff --git a/socket/src/main/java/com/xuhao/android/libsocket/sdk/connection/AbsReconnectionManager.java b/socket/src/main/java/com/xuhao/android/libsocket/sdk/connection/AbsReconnectionManager.java
index e089100..859deac 100644
--- a/socket/src/main/java/com/xuhao/android/libsocket/sdk/connection/AbsReconnectionManager.java
+++ b/socket/src/main/java/com/xuhao/android/libsocket/sdk/connection/AbsReconnectionManager.java
@@ -4,7 +4,7 @@
 import android.support.annotation.CallSuper;
 
 import com.xuhao.android.libsocket.impl.PulseManager;
-import com.xuhao.android.libsocket.sdk.bean.IPulseSendable;
+import com.xuhao.android.libsocket.interfaces.IPulseSendable;
 import com.xuhao.android.libsocket.sdk.ConnectionInfo;
 import com.xuhao.android.libsocket.sdk.bean.ISendable;
 import com.xuhao.android.libsocket.sdk.bean.OriginalData;
diff --git a/socket/src/main/java/com/xuhao/android/libsocket/sdk/connection/interfacies/ISocketActionListener.java b/socket/src/main/java/com/xuhao/android/libsocket/sdk/connection/interfacies/ISocketActionListener.java
index 0388694..f37237f 100644
--- a/socket/src/main/java/com/xuhao/android/libsocket/sdk/connection/interfacies/ISocketActionListener.java
+++ b/socket/src/main/java/com/xuhao/android/libsocket/sdk/connection/interfacies/ISocketActionListener.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 
-import com.xuhao.android.libsocket.sdk.bean.IPulseSendable;
+import com.xuhao.android.libsocket.interfaces.IPulseSendable;
 import com.xuhao.android.libsocket.sdk.ConnectionInfo;
 import com.xuhao.android.libsocket.sdk.bean.ISendable;
 import com.xuhao.android.libsocket.sdk.bean.OriginalData;
diff --git a/socket/src/main/java/com/xuhao/android/libsocket/sdk/protocol/DefaultHeaderProtocol.java b/socket/src/main/java/com/xuhao/android/libsocket/sdk/protocol/DefaultHeaderProtocol.java
deleted file mode 100644
index d0d3690..0000000
--- a/socket/src/main/java/com/xuhao/android/libsocket/sdk/protocol/DefaultHeaderProtocol.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.xuhao.android.libsocket.sdk.protocol;
-
-import com.xuhao.android.libsocket.sdk.bean.IHeaderProtocol;
-import com.xuhao.android.libsocket.utils.BytesUtils;
-
-import java.nio.ByteOrder;
-
-public class DefaultHeaderProtocol implements IHeaderProtocol {
-
-    @Override
-    public int getHeaderLength() {
-        return 4;
-    }
-
-    @Override
-    public int getBodyLength(byte[] header, ByteOrder byteOrder) {
-        if (header == null || header.length == 0) {
-            return 0;
-        }
-        if (ByteOrder.BIG_ENDIAN.toString().equals(byteOrder.toString())) {
-            return BytesUtils.bytesToInt2(header, 0);
-        } else {
-            return BytesUtils.bytesToInt(header, 0);
-        }
-    }
-}
\ No newline at end of file
diff --git a/socket/src/main/java/com/xuhao/android/libsocket/sdk/protocol/NoneHeaderProtocol.java b/socket/src/main/java/com/xuhao/android/libsocket/sdk/protocol/NoneHeaderProtocol.java
deleted file mode 100644
index 3682edd..0000000
--- a/socket/src/main/java/com/xuhao/android/libsocket/sdk/protocol/NoneHeaderProtocol.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.xuhao.android.libsocket.sdk.protocol;
-
-import com.xuhao.android.libsocket.sdk.bean.IHeaderProtocol;
-
-import java.nio.ByteOrder;
-
-/**
- * 无包头模式
- * Created by xuhao on 2017/12/22.
- */
-public class NoneHeaderProtocol implements IHeaderProtocol{
-    @Override
-    public int getHeaderLength() {
-        return 0;
-    }
-
-    @Override
-    public int getBodyLength(byte[] header, ByteOrder byteOrder) {
-        return -1;
-    }
-
-}