Merge pull request #89 from longbai/proxy

增加代理支持

Author: longbai

library/src/main/java/com/qiniu/android/http/HttpManager.java

@@ -20,13 +20,19 @@ public final class HttpManager {
     private static final String userAgent = getUserAgent();
     private AsyncHttpClient client;
 
-
-    public HttpManager() {
+    public HttpManager(Proxy proxy) {
         client = new AsyncHttpClient();
         client.setConnectTimeout(Config.CONNECT_TIMEOUT);
         client.setResponseTimeout(Config.RESPONSE_TIMEOUT);
         client.setUserAgent(userAgent);
         client.setEnableRedirects(false);
+        if (proxy != null){
+            client.setProxy(proxy.hostAddress, proxy.port, proxy.user, proxy.password);
+        }
+    }
+
+    public HttpManager() {
+        this(null);
     }
 
     private static String genId() {

library/src/main/java/com/qiniu/android/http/Proxy.java

@@ -0,0 +1,26 @@
+package com.qiniu.android.http;
+
+/**
+ * http 代理
+ */
+public class Proxy {
+
+    public final String hostAddress;
+    public final int port;
+    public final String user;
+    public final String password;
+
+    /**
+     *
+     * @param hostAddress 服务器域名或IP，比如proxy.com, 192.168.1.1
+     * @param port 端口
+     * @param user 用户名，无则填null
+     * @param password 用户密码，无则填null
+     */
+    public Proxy(String hostAddress, int port, String user, String password) {
+        this.hostAddress = hostAddress;
+        this.port = port;
+        this.user = user;
+        this.password = password;
+    }
+}

library/src/main/java/com/qiniu/android/storage/KeyGenerator.java

@@ -3,8 +3,14 @@
 import java.io.File;
 
 /**
- * Created by bailong on 14/10/21.
+ * 本地持久化上传纪录key生成工具
  */
 public interface KeyGenerator {
+    /**
+     * 根据服务器的key和本地文件名生成持久化纪录的key
+     * @param key 服务器的key
+     * @param file 本地文件名
+     * @return 持久化上传纪录的key
+     */
     String gen(String key, File file);
 }

library/src/main/java/com/qiniu/android/storage/UploadManager.java

@@ -2,6 +2,7 @@
 
 import com.qiniu.android.common.Config;
 import com.qiniu.android.http.HttpManager;
+import com.qiniu.android.http.Proxy;
 import com.qiniu.android.http.ResponseInfo;
 import com.qiniu.android.utils.AsyncRun;
 
@@ -19,17 +20,27 @@ public final class UploadManager {
     private final KeyGenerator keyGen;
 
     public UploadManager() {
-        this(null, null);
+        this(null, null, null);
     }
 
     public UploadManager(Recorder recorder, KeyGenerator keyGen) {
+        this(recorder, keyGen, null);
+    }
+
+    /**
+     *
+      * @param recorder 本地持久化断点上传纪录的类
+     * @param keyGen 本地持久化断点上传纪录时需要的key生成器
+     * @param proxy http 代理
+     */
+    public UploadManager(Recorder recorder, KeyGenerator keyGen, Proxy proxy) {
         this.recorder = recorder;
-        this.httpManager = new HttpManager();
+        this.httpManager = new HttpManager(proxy);
         this.keyGen = keyGen;
     }
 
     public UploadManager(Recorder recorder) {
-        this(recorder, null);
+        this(recorder, null, null);
     }
 
     private static boolean areInvalidArg(final String key, byte[] data, File f, String token, final UpCompletionHandler completionHandler) {