From 277b5e164e23ceac772f42f933bac4f6732607a0 Mon Sep 17 00:00:00 2001
From: Edwin Wu <edwin_wu05@126.com>
Date: Fri, 16 Jun 2017 15:03:30 +0800
Subject: [PATCH] Callback-75%

---
 .../why168/androidhttputils/HomeActivity.java | 80 +++++++++++----
 app/src/main/res/layout/activity_home.xml     | 14 ++-
 .../github/why168/http/BitmapCallback.java    | 10 +-
 .../java/com/github/why168/http/Callback.java | 13 ++-
 .../com/github/why168/http/FileCallback.java  | 13 +--
 .../com/github/why168/http/JsonCallback.java  | 13 +--
 .../com/github/why168/http/NickRunnable.java  |  4 +-
 .../java/com/github/why168/http/RealCall.java | 58 +++++++++--
 .../java/com/github/why168/http/Request.java  | 18 ++--
 .../java/com/github/why168/http/Response.java | 98 +++++++++++++++++++
 .../github/why168/http/StringCallback.java    | 12 +--
 11 files changed, 267 insertions(+), 66 deletions(-)
 create mode 100644 http-library/src/main/java/com/github/why168/http/Response.java

diff --git a/app/src/main/java/com/github/why168/androidhttputils/HomeActivity.java b/app/src/main/java/com/github/why168/androidhttputils/HomeActivity.java
index e4d167c..fb7ddb4 100644
--- a/app/src/main/java/com/github/why168/androidhttputils/HomeActivity.java
+++ b/app/src/main/java/com/github/why168/androidhttputils/HomeActivity.java
@@ -1,17 +1,21 @@
 package com.github.why168.androidhttputils;
 
+import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.github.why168.http.BitmapCallback;
 import com.github.why168.http.Call;
-import com.github.why168.http.Callback;
 import com.github.why168.http.HttpUtils;
+import com.github.why168.http.JsonCallback;
 import com.github.why168.http.Request;
+import com.github.why168.http.Response;
+import com.github.why168.http.StringCallback;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
@@ -22,6 +26,7 @@
 public class HomeActivity extends AppCompatActivity {
     private TextView tv_text;
     private HttpUtils goHttp;
+    private ImageView image;
 
     // 魂斗罗下载 http://124.193.230.12/imtt.dd.qq.com/16891/A1BFDC1BD905CEF01F3076509F920FD3.apk?mkey=59424b6446b6ee89&f=ae12&c=0&fsname=com.tencent.shootgame_1.2.33.7260_337260.apk&csr=1bbd&p=.apk
 
@@ -31,40 +36,48 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_home);
         tv_text = (TextView) findViewById(R.id.tv_text);
+        image = (ImageView) findViewById(R.id.image);
         goHttp = new HttpUtils();
 
     }
 
-    public void getHttp() {
+    public void onGetJSONObject() {
         Map<String, String> headers = new HashMap<>();
         headers.put("User-Agent", "ADX-SDK-GET");
         headers.put("Content-Type", "text/html;charset=utf-8;application/octet-stream;application/json");
 
         // http://jubi.com/api/v1/ticker?coin=mryc
-        Request request = new Request.Builder()
+        final Request request = new Request.Builder()
                 .url("http://www.jubi.com/api/v1/ticker?coin=mryc")
                 .method("GET")
                 .headers(headers)
                 .build();
 
         Call call = goHttp.newCall(request);
-        call.enqueue(new Callback() {
+        call.enqueue(new JsonCallback() {
             @Override
             public void onFailure(Exception e) {
                 tv_text.setText(e.toString());
             }
 
             @Override
-            public void onSuccessful(String results) throws IOException {
+            public void onSuccessful(Response response, JSONObject results) throws IOException {
                 try {
-                    JSONObject jsonObject = new JSONObject(results);
-                    String last = jsonObject.optString("last");
+                    String last = results.optString("last");
                     double i = Double.valueOf(last);
                     double def = 0.43;
 
                     Log.e("Edwin", "results = " + results + "\nlast = " + i + "\n"
                             + "百分比 = " + new BigDecimal(((i - def) / def) * 100).floatValue() + "%");
-                } catch (JSONException e) {
+
+                    Map<String, String> headers = response.getHeaders();
+                    for (Map.Entry<String, String> entry : headers.entrySet()) {
+                        System.out.println("headers----" + entry.getKey() + " : " + entry.getValue());
+                    }
+
+                    System.out.println("Code = " + response.getCode() + "\nMessage = " + response.getMessage());
+
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
@@ -86,7 +99,7 @@ public void postHttp() {
                 .build();
 
         Call call = goHttp.newCall(request);
-        call.enqueue(new Callback() {
+        call.enqueue(new StringCallback() {
             @Override
             public void onFailure(Exception e) {
                 String s = e.toString();
@@ -95,11 +108,10 @@ public void onFailure(Exception e) {
             }
 
             @Override
-            public void onSuccessful(String results) throws IOException {
+            public void onSuccessful(Response response, String results) throws IOException {
                 tv_text.setText("POST_" + results);
             }
         });
-
         //TODO 取消单个请求
 //        call.cancel();
 
@@ -117,25 +129,50 @@ public void getFileHttp() {
                 .headers(headers)
                 .build();
 
-
         Call call = goHttp.newCall(request);
-        call.enqueue(new Callback() {
+        call.enqueue(new StringCallback() {
             @Override
             public void onFailure(Exception e) {
                 tv_text.setText(e.toString());
             }
 
             @Override
-            public void onSuccessful(String results) throws IOException {
+            public void onSuccessful(Response response, String results) throws IOException {
                 tv_text.setText("GET_" + results);
             }
         });
+
     }
 
+    public void onGetBitmap() {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("User-Agent", "ADX-SDK-GET");
+        headers.put("Content-Type", "text/html;charset=utf-8;application/octet-stream;application/json");
+
+        // http://jubi.com/api/v1/ticker?coin=mryc
+        final Request request = new Request.Builder()
+                .url("http://f10.baidu.com/it/u=904003689,173509581&fm=76")
+                .method("GET")
+                .headers(headers)
+                .build();
+
+        Call call = goHttp.newCall(request);
+        call.enqueue(new BitmapCallback() {
+            @Override
+            public void onFailure(Exception e) {
+                System.out.println(e);
+            }
 
-    public void onGet(View view) {
-        Log.e("Edwin", "onGet");
-        getHttp();
+            @Override
+            public void onSuccessful(Response response, Bitmap results) throws IOException {
+                image.setImageBitmap(results);
+            }
+        });
+    }
+
+    public void onGetJSONObject(View view) {
+        Log.e("Edwin", "onGetJSONObject");
+        onGetJSONObject();
     }
 
     public void onPost(View view) {
@@ -151,5 +188,12 @@ public void onGetFile(View view) {
     public void onStop(View view) {
         Log.e("Edwin", "onStop");
         goHttp.getDispatcher().cancelAll();
+
     }
+
+    public void onGetBitmap(View view) {
+        onGetBitmap();
+    }
+
+
 }
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 704df36..59be5b8 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -16,12 +16,16 @@
             android:layout_height="wrap_content"
             android:text="Hello World!" />
     </ScrollView>
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:onClick="onGet"
-        android:text="get" />
+        android:onClick="onGetJSONObject"
+        android:text="onGetJSONObject" />
 
     <Button
         android:layout_width="wrap_content"
@@ -41,4 +45,10 @@
         android:onClick="onStop"
         android:text="取消所有请求" />
 
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="onGetBitmap"
+        android:text="请求图片" />
 </LinearLayout>
diff --git a/http-library/src/main/java/com/github/why168/http/BitmapCallback.java b/http-library/src/main/java/com/github/why168/http/BitmapCallback.java
index 6e80415..3889ee2 100644
--- a/http-library/src/main/java/com/github/why168/http/BitmapCallback.java
+++ b/http-library/src/main/java/com/github/why168/http/BitmapCallback.java
@@ -1,9 +1,17 @@
 package com.github.why168.http;
 
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
 /**
  * @author Edwin.Wu
  * @version 2017/6/15 22:57
  * @since JDK1.8
  */
-public class BitmapCallback {
+public abstract class BitmapCallback extends Callback<Bitmap> {
+    @Override
+    public Bitmap parseNetworkResponse(Response response) throws Exception {
+        byte[] body = response.getBody();
+        return BitmapFactory.decodeByteArray(body, 0, body.length);
+    }
 }
diff --git a/http-library/src/main/java/com/github/why168/http/Callback.java b/http-library/src/main/java/com/github/why168/http/Callback.java
index 715253f..c351479 100644
--- a/http-library/src/main/java/com/github/why168/http/Callback.java
+++ b/http-library/src/main/java/com/github/why168/http/Callback.java
@@ -7,8 +7,15 @@
  * @version 2017/6/13 16:18
  * @since JDK1.8
  */
-public interface Callback {
-    void onFailure(Exception e);
+public abstract class Callback<T> {
 
-    void onSuccessful(String results) throws IOException;
+    public abstract T parseNetworkResponse(Response response) throws Exception;
+
+    public abstract void onFailure(Exception e);
+
+    public abstract void onSuccessful(Response response, T results) throws IOException;
+
+    public void onProgress(long progress, long total) {
+
+    }
 }
diff --git a/http-library/src/main/java/com/github/why168/http/FileCallback.java b/http-library/src/main/java/com/github/why168/http/FileCallback.java
index 9427174..2a27ff2 100644
--- a/http-library/src/main/java/com/github/why168/http/FileCallback.java
+++ b/http-library/src/main/java/com/github/why168/http/FileCallback.java
@@ -1,20 +1,15 @@
 package com.github.why168.http;
 
-import java.io.IOException;
+import java.io.File;
 
 /**
  * @author Edwin.Wu
  * @version 2017/6/15 21:57
  * @since JDK1.8
  */
-public class FileCallback implements Callback {
+public abstract class FileCallback extends Callback<File> {
     @Override
-    public void onFailure(Exception e) {
-
-    }
-
-    @Override
-    public void onSuccessful(String results) throws IOException {
-
+    public File parseNetworkResponse(Response response) throws Exception {
+        return null;
     }
 }
diff --git a/http-library/src/main/java/com/github/why168/http/JsonCallback.java b/http-library/src/main/java/com/github/why168/http/JsonCallback.java
index a079280..189b7c4 100644
--- a/http-library/src/main/java/com/github/why168/http/JsonCallback.java
+++ b/http-library/src/main/java/com/github/why168/http/JsonCallback.java
@@ -1,20 +1,17 @@
 package com.github.why168.http;
 
-import java.io.IOException;
+import org.json.JSONObject;
 
 /**
  * @author Edwin.Wu
  * @version 2017/6/15 21:56
  * @since JDK1.8
  */
-public class JsonCallback implements Callback {
-    @Override
-    public void onFailure(Exception e) {
-
-    }
+public abstract class JsonCallback extends Callback<JSONObject> {
 
     @Override
-    public void onSuccessful(String results) throws IOException {
-
+    public JSONObject parseNetworkResponse(Response response) throws Exception {
+        String results = new String(response.getBody());
+        return new JSONObject(results);
     }
 }
diff --git a/http-library/src/main/java/com/github/why168/http/NickRunnable.java b/http-library/src/main/java/com/github/why168/http/NickRunnable.java
index d33170a..d6a03c7 100644
--- a/http-library/src/main/java/com/github/why168/http/NickRunnable.java
+++ b/http-library/src/main/java/com/github/why168/http/NickRunnable.java
@@ -8,10 +8,10 @@
  * @version 2017/6/13 16:15
  * @since JDK1.8
  */
-public abstract class NickRunnable implements Runnable {
+abstract class NickRunnable implements Runnable {
     protected final String name;
 
-    public NickRunnable(String format, Object... args) {
+    NickRunnable(String format, Object... args) {
         this.name = String.format(Locale.US, format, args);
     }
 
diff --git a/http-library/src/main/java/com/github/why168/http/RealCall.java b/http-library/src/main/java/com/github/why168/http/RealCall.java
index 7e16467..37c8e74 100644
--- a/http-library/src/main/java/com/github/why168/http/RealCall.java
+++ b/http-library/src/main/java/com/github/why168/http/RealCall.java
@@ -13,25 +13,26 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.InflaterInputStream;
 import java.util.zip.ZipInputStream;
 
-
 /**
  * @author Edwin.Wu
  * @version 2017/6/14 10:06
  * @since JDK1.8
  */
-public class RealCall implements Call {
+class RealCall implements Call {
     private final Request request;
     private final HttpUtils client;
     private boolean executed;
     private final AtomicBoolean isCancelled = new AtomicBoolean();
 
-    public RealCall(HttpUtils client, Request request) {
+    RealCall(HttpUtils client, Request request) {
         this.client = client;
         this.request = request;
         this.isCancelled.set(false);
@@ -127,7 +128,6 @@ private void postHttpRequest(Request request, HttpUtils httpUtils) {
                 bos.flush();
                 final int responseCode = connection.getResponseCode();
                 if (responseCode >= 200 && responseCode <= 300) {
-
                     // Log
                     Log.e("Edwin", "responseCode = " + responseCode + "\n" +
                             "contentLength = " + StringUtils.getPrintSize(connection.getContentLength()) + "\n" +
@@ -160,12 +160,34 @@ private void postHttpRequest(Request request, HttpUtils httpUtils) {
                         out.flush();
                     }
 
+                    Map<String, String> headers = new HashMap<>();
+
+                    Map<String, List<String>> headerFields = connection.getHeaderFields();
+                    for (Map.Entry<String, List<String>> entry : headerFields.entrySet()) {
+                        String key = entry.getKey();
+                        StringBuilder sb = new StringBuilder();
+                        for (String value : entry.getValue()) {
+                            sb.append(value).append(";");
+                        }
+                        headers.put(key, sb.toString());
+                    }
+
+                    final Response response = new Response.Builder()
+                            .request(request)
+                            .body(out.toByteArray())
+                            .code(responseCode)
+                            .header(headers)
+                            .message("成功:" + connection.getResponseMessage())
+                            .build();
+
                     final String result = new String(out.toByteArray(), Charset.forName("UTF-8"));
+                    final Object o = responseCallback.parseNetworkResponse(response);
+
                     HandlerExecutor.getInstance().execute(new Runnable() {
                         @Override
                         public void run() {
                             try {
-                                responseCallback.onSuccessful(result);
+                                responseCallback.onSuccessful(response, o);
                             } catch (IOException e) {
                                 e.printStackTrace();
                             }
@@ -175,6 +197,7 @@ public void run() {
                     HandlerExecutor.getInstance().execute(new Runnable() {
                         @Override
                         public void run() {
+
                             responseCallback.onFailure(new RuntimeException("error code = " + responseCode));
                         }
                     });
@@ -255,12 +278,35 @@ private void getHttpRequest(Request request, HttpUtils httpUtils) {
                         out.write(buffer, 0, len);
                         out.flush();
                     }
+
+                    Map<String, String> headers = new HashMap<>();
+
+                    Map<String, List<String>> headerFields = connection.getHeaderFields();
+                    for (Map.Entry<String, List<String>> entry : headerFields.entrySet()) {
+                        String key = entry.getKey();
+                        StringBuilder sb = new StringBuilder();
+                        for (String value : entry.getValue()) {
+                            sb.append(value).append(";");
+                        }
+                        headers.put(key, sb.toString());
+                    }
+
+                    final Response response = new Response.Builder()
+                            .request(request)
+                            .body(out.toByteArray())
+                            .code(status)
+                            .header(headers)
+                            .message("成功:" + connection.getResponseMessage())
+                            .build();
+
                     final String result = new String(out.toByteArray(), Charset.forName("UTF-8"));
+                    final Object o = responseCallback.parseNetworkResponse(response);
+
                     HandlerExecutor.getInstance().execute(new Runnable() {
                         @Override
                         public void run() {
                             try {
-                                responseCallback.onSuccessful(result);
+                                responseCallback.onSuccessful(response, o);
                             } catch (IOException e) {
                                 e.printStackTrace();
                             }
diff --git a/http-library/src/main/java/com/github/why168/http/Request.java b/http-library/src/main/java/com/github/why168/http/Request.java
index b02d82b..05d0878 100644
--- a/http-library/src/main/java/com/github/why168/http/Request.java
+++ b/http-library/src/main/java/com/github/why168/http/Request.java
@@ -4,6 +4,8 @@
 import java.util.Map;
 
 /**
+ * 请求体
+ *
  * @author Edwin.Wu
  * @version 2017/6/13 16:32
  * @since JDK1.8
@@ -11,15 +13,15 @@
 public final class Request {
     private final String url;
     private final String method;
-    private Map<String, String> headers;
-    private byte[] bodys;
+    private final Map<String, String> headers;
+    private final byte[] body;
 
 
     private Request(Builder builder) {
         this.url = builder.url;
         this.method = builder.method;
         this.headers = builder.headers;
-        this.bodys = builder.bodys;
+        this.body = builder.body;
     }
 
     public String getUrl() {
@@ -35,14 +37,14 @@ public Map<String, String> getHeaders() {
     }
 
     public byte[] getBody() {
-        return bodys;
+        return body;
     }
 
     public static class Builder {
         private String url;
         private String method;
         private Map<String, String> headers;
-        private byte[] bodys;
+        private byte[] body;
 
 
         public Builder() {
@@ -68,8 +70,8 @@ public Builder headers(Map<String, String> headers) {
         }
 
         public Builder bodys(byte[] bodys) {
-            if (bodys == null) throw new NullPointerException("bodys == null");
-            this.bodys = bodys;
+            if (bodys == null) throw new NullPointerException("body == null");
+            this.body = bodys;
             return this;
         }
 
@@ -86,7 +88,7 @@ public String toString() {
                 "url='" + url + '\'' +
                 ", method='" + method + '\'' +
                 ", headers=" + headers +
-                ", bodys=" + Arrays.toString(bodys) +
+                ", body=" + Arrays.toString(body) +
                 '}';
     }
 }
diff --git a/http-library/src/main/java/com/github/why168/http/Response.java b/http-library/src/main/java/com/github/why168/http/Response.java
new file mode 100644
index 0000000..42c106f
--- /dev/null
+++ b/http-library/src/main/java/com/github/why168/http/Response.java
@@ -0,0 +1,98 @@
+package com.github.why168.http;
+
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * 响应体
+ *
+ * @author Edwin.Wu
+ * @version 2017/6/16 14:12
+ * @since JDK1.8
+ */
+public class Response {
+    private final Request request;
+    private final int code;
+    private final String message;
+    private final Map<String, String> headers;
+    private final byte[] body;
+
+    public Response(Builder builder) {
+        request = builder.request;
+        code = builder.code;
+        message = builder.message;
+        headers = builder.headers;
+        body = builder.body;
+    }
+
+    public static class Builder {
+        private Request request;
+        private int code = -1;
+        private String message;
+        private Map<String, String> headers;
+        private byte[] body;
+
+        public Builder() {
+        }
+
+        public Builder request(Request request) {
+            this.request = request;
+            return this;
+        }
+
+        public Builder code(int code) {
+            this.code = code;
+            return this;
+        }
+
+        public Builder message(String message) {
+            this.message = message;
+            return this;
+        }
+
+        public Builder header(Map<String, String> headers) {
+            this.headers = headers;
+            return this;
+        }
+
+        public Builder body(byte[] body) {
+            this.body = body;
+            return this;
+        }
+
+        public Response build() {
+            return new Response(this);
+        }
+    }
+
+    public Request getRequest() {
+        return request;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public Map<String, String> getHeaders() {
+        return headers;
+    }
+
+    public byte[] getBody() {
+        return body;
+    }
+
+    @Override
+    public String toString() {
+        return "Response{" +
+                "request=" + request +
+                ", code=" + code +
+                ", message='" + message + '\'' +
+                ", headers=" + headers +
+                ", body=" + Arrays.toString(body) +
+                '}';
+    }
+}
diff --git a/http-library/src/main/java/com/github/why168/http/StringCallback.java b/http-library/src/main/java/com/github/why168/http/StringCallback.java
index ef6bf7f..d72b427 100644
--- a/http-library/src/main/java/com/github/why168/http/StringCallback.java
+++ b/http-library/src/main/java/com/github/why168/http/StringCallback.java
@@ -1,20 +1,14 @@
 package com.github.why168.http;
 
-import java.io.IOException;
-
 /**
  * @author Edwin.Wu
  * @version 2017/6/15 21:56
  * @since JDK1.8
  */
-public class StringCallback implements Callback {
-    @Override
-    public void onFailure(Exception e) {
-
-    }
+public abstract class StringCallback extends Callback<String> {
 
     @Override
-    public void onSuccessful(String results) throws IOException {
-
+    public String parseNetworkResponse(Response response) throws Exception {
+        return new String(response.getBody());
     }
 }