add download progress monitor

Author: CPPAlien

app/src/main/java/cn/hadcn/davinci_example/MainActivity.java

@@ -7,6 +7,7 @@
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 
@@ -75,7 +76,7 @@ public void onClick(View v) {
         JSONObject jsonObject = new JSONObject();
         try {
             JSONObject header = new JSONObject();
-            header.put("tokenId", "6240e6e5-10d1-4d1f-83bf-39910870583c");
+            header.put("tokenId", "0e5495fb-da46-4b28-95ea-e9f6aec1d69a");
             jsonObject.put("_header_", header);
         } catch (JSONException e) {
             e.printStackTrace();
@@ -96,12 +97,14 @@ public void onVinciUploadFailed(String reason) {
         DaVinci.with().addThreadPool("one", 1);
         DaVinci.with().tag("one").getImageLoader().load("http://y3.ifengimg.com/fashion_spider/dci_2012/02/20a78c36cc31225b1a7efa89f566f591.jpg").into(image3);
 
-        OutputStream out = null;
+        OutputStream out;
         try {
             out = new FileOutputStream(Environment.getExternalStorageDirectory() + "/download/" + "a.txt");
         } catch (FileNotFoundException e) {
             e.printStackTrace();
+            return;
         }
+        final TextView tv = (TextView)findViewById(R.id.test_text);
         DaVinci.with().getDownloader().body(jsonObject.toString()).download("http://ec2-52-192-96-229.ap-northeast-1.compute.amazonaws.com:12821/ecp/openapi/qs/file/download/p/2016/07/06/03/f5d28e3065244ab9952858f991838246.txt"
                 , out, new OnVinciDownloadListener() {
                     @Override
@@ -113,6 +116,13 @@ public void onVinciDownloadSuccess() {
                     public void onVinciDownloadFailed(String reason) {
 
                     }
+
+                    @Override
+                    public void onVinciDownloadProgress(int progress) {
+                        VinciLog.e("progress = " + progress);
+
+                        tv.setText(String.valueOf(progress));
+                    }
                 });
     }
 

app/src/main/res/layout/activity_main.xml

@@ -53,5 +53,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
     </LinearLayout>
-
+    <TextView
+        android:id="@+id/test_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"/>
 </RelativeLayout>

davinci/src/main/java/cn/hadcn/davinci/image/base/ByteRequest.java

@@ -16,6 +16,9 @@
 
 package cn.hadcn.davinci.image.base;
 
+import android.os.Handler;
+import android.os.Looper;
+
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 
@@ -34,32 +37,28 @@ public class ByteRequest extends Request<ByteBuffer> {
     protected static final String PROTOCOL_CHARSET = "utf-8";
 
     private final Response.Listener<ByteBuffer> mListener;
+    private Response.ProgressListener mProgressListener;
+
+    private Handler mHandler = new Handler(Looper.getMainLooper());
 
     /** Decoding lock so that we don't decode more than one image at a time (to avoid OOM's) */
     private static final Object sDecodeLock = new Object();
 
     private final String mRequestBody;
 
-    /**
-     * Creates a new image request, decoding to a maximum specified width and
-     * height. If both width and height are zero, the image will be decoded to
-     * its natural size. If one of the two is nonzero, that dimension will be
-     * clamped and the other one will be set to preserve the image's aspect
-     * ratio. If both width and height are nonzero, the image will be decoded to
-     * be fit in the rectangle of dimensions width x height while keeping its
-     * aspect ratio.
-     *
-     * @param url URL of the image
-     * @param listener Listener to receive the decoded bitmap
-     * @param errorListener Error listener, or null to ignore errors
-     */
+
     public ByteRequest(int method, String url, String requestBody, Response.Listener<ByteBuffer> listener, Response.ErrorListener errorListener) {
         super(method, url, errorListener);
 
         mListener = listener;
         mRequestBody = requestBody;
     }
 
+    public ByteRequest(int method, String url, String requestBody, Response.Listener<ByteBuffer> listener, Response.ErrorListener errorListener, Response.ProgressListener progressListener) {
+        this(method, url, requestBody, listener, errorListener);
+        mProgressListener = progressListener;
+    }
+
     @Override
     public Priority getPriority() {
         return Priority.LOW;
@@ -99,4 +98,14 @@ protected Response<ByteBuffer> parseNetworkResponse(NetworkResponse response) {
     protected void deliverResponse(ByteBuffer response) {
         mListener.onResponse(response);
     }
+
+    @Override
+    public void progressUpdate(final int progress) {
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                mProgressListener.onProgressUpdate(progress);
+            }
+        });
+    }
 }

davinci/src/main/java/cn/hadcn/davinci/other/OnVinciDownloadListener.java

@@ -7,4 +7,5 @@
 public interface OnVinciDownloadListener {
     void onVinciDownloadSuccess();
     void onVinciDownloadFailed(String reason);
+    void onVinciDownloadProgress(int progress);
 }

davinci/src/main/java/cn/hadcn/davinci/other/impl/VinciDownload.java

@@ -47,13 +47,14 @@ public void onResponse(ByteBuffer response) {
             public void onErrorResponse(VolleyError error) {
                 listener.onVinciDownloadFailed("net failed");
             }
+        }, new Response.ProgressListener() {
+            @Override
+            public void onProgressUpdate(int progress) {
+                listener.onVinciDownloadProgress(progress);
+            }
         });
         request.setRetryPolicy(new DefaultRetryPolicy(4 * DefaultRetryPolicy.DEFAULT_TIMEOUT_MS,
                 DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT));
         mRequestQueue.add(request);
     }
-
-    public interface Listener {
-
-    }
 }

davinci/src/main/java/cn/hadcn/davinci/volley/Request.java

@@ -574,6 +574,14 @@ protected VolleyError parseNetworkError(VolleyError volleyError) {
      */
     abstract protected void deliverResponse(T response);
 
+    /**
+     * publish progress
+     * @param progress progress of http, how many bytes have already been downloaded
+     */
+    public void progressUpdate(int progress) {
+
+    }
+
     /**
      * Delivers error message to the ErrorListener that the Request was
      * initialized with.

davinci/src/main/java/cn/hadcn/davinci/volley/Response.java

@@ -38,6 +38,10 @@ public interface ErrorListener {
         void onErrorResponse(VolleyError error);
     }
 
+    public interface ProgressListener{
+        void onProgressUpdate(int progress);
+    }
+
     /** Returns a successful response containing the parsed result. */
     public static <T> Response<T> success(T result, Cache.Entry cacheEntry) {
         return new Response<T>(result, cacheEntry);

davinci/src/main/java/cn/hadcn/davinci/volley/toolbox/BasicNetwork.java

@@ -91,7 +91,7 @@ public NetworkResponse performRequest(Request<?> request) throws VolleyError {
             Map<String, String> responseHeaders = Collections.emptyMap();
             try {
                 // Gather headers.
-                Map<String, String> headers = new HashMap<String, String>();
+                Map<String, String> headers = new HashMap<>();
                 addCacheHeaders(headers, request.getCacheEntry());
                 httpResponse = mHttpStack.performRequest(request, headers);
                 StatusLine statusLine = httpResponse.getStatusLine();
@@ -120,7 +120,7 @@ public NetworkResponse performRequest(Request<?> request) throws VolleyError {
 
                 // Some responses such as 204s do not have content.  We must check.
                 if (httpResponse.getEntity() != null) {
-                  responseContents = entityToBytes(httpResponse.getEntity());
+                  responseContents = entityToBytes(httpResponse.getEntity(), request);
                 } else {
                   // Add 0 byte response as a way of honestly representing a
                   // no-content request.
@@ -234,7 +234,7 @@ protected void logError(String what, String url, long start) {
     }
 
     /** Reads the contents of HttpEntity into a byte[]. */
-    private byte[] entityToBytes(HttpEntity entity) throws IOException, ServerError {
+    private byte[] entityToBytes(HttpEntity entity, Request request) throws IOException, ServerError {
         PoolingByteArrayOutputStream bytes =
                 new PoolingByteArrayOutputStream(mPool, (int) entity.getContentLength());
         byte[] buffer = null;
@@ -244,9 +244,12 @@ private byte[] entityToBytes(HttpEntity entity) throws IOException, ServerError
                 throw new ServerError();
             }
             buffer = mPool.getBuf(1024);
+            int progress = 0;
             int count;
             while ((count = in.read(buffer)) != -1) {
                 bytes.write(buffer, 0, count);
+                progress += count;
+                request.progressUpdate(progress);
             }
             return bytes.toByteArray();
         } finally {