Revert "提交修改"

This reverts commit 24dd562.

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')
 }

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;

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();
         }
     }
-
-
 }

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;

socket/src/main/java/com/xuhao/android/libsocket/sdk/bean/IPulse.java → 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.

socket/src/main/java/com/xuhao/android/libsocket/sdk/bean/IPulseSendable.java → 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;
 
 /**
  * 心跳标记接口

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);
+            }
+        }
+    }
 }

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;

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;

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;