From eba85f1f058b971bb2077de2fd76bcc51dab9606 Mon Sep 17 00:00:00 2001
From: NortonAhu <hongyuahu@gmail.com>
Date: Tue, 1 Dec 2015 22:10:27 +0800
Subject: [PATCH] request/OkHttpRequest.java

---
 .idea/.name                                   |   2 +-
 .idea/gradle.xml                              |   2 +-
 .idea/misc.xml                                |  25 ++---
 .idea/modules.xml                             |   2 +-
 .idea/vcs.xml                                 |   2 +-
 build.gradle                                  |   8 +-
 gradle.properties                             |  17 ++-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 okhttputils/build.gradle                      |  33 +-----
 okhttputils/okhttputils.iml                   | 101 ------------------
 .../com/zhy/http/okhttp/RequestBodyUtils.java |  49 +++++++++
 .../http/okhttp/request/OkHttpRequest.java    |  12 ++-
 .../okhttp/request/OkHttpUploadRequest.java   |  30 +++++-
 sample-okhttp/build.gradle                    |   4 +-
 sample-okhttp/sample-okhttp.iml               | 100 -----------------
 .../com/zhy/sample_okhttp/MainActivity.java   |  81 +++++++++-----
 16 files changed, 170 insertions(+), 300 deletions(-)
 delete mode 100644 okhttputils/okhttputils.iml
 create mode 100644 okhttputils/src/main/java/com/zhy/http/okhttp/RequestBodyUtils.java
 delete mode 100644 sample-okhttp/sample-okhttp.iml

diff --git a/.idea/.name b/.idea/.name
index fcb0312..958dac6 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-OkHttpManager
\ No newline at end of file
+okhttp-utils
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a4dc0d6..3b7fbd8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.7" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index dae7a60..c537ee6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,13 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="mavenHome" value="Bundled (Maven 3)" />
+      </MavenGeneralSettings>
+    </option>
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -37,26 +44,10 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 06479d8..967548c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/OkHttpManager.iml" filepath="$PROJECT_DIR$/OkHttpManager.iml" />
+      <module fileurl="file://$PROJECT_DIR$/okhttp-utils.iml" filepath="$PROJECT_DIR$/okhttp-utils.iml" />
       <module fileurl="file://$PROJECT_DIR$/okhttputils/okhttputils.iml" filepath="$PROJECT_DIR$/okhttputils/okhttputils.iml" />
       <module fileurl="file://$PROJECT_DIR$/sample-okhttp/sample-okhttp.iml" filepath="$PROJECT_DIR$/sample-okhttp/sample-okhttp.iml" />
     </modules>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5cfc154..e1e1352 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,19 +1,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.0+'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0+'
+        classpath 'com.github.dcendents:android-maven-plugin:1.2+'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
-
 allprojects {
     repositories {
         jcenter()
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..5eb553a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,18 +1,17 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
+## Project-wide Gradle settings.
+#
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+#Tue Dec 01 15:45:05 CST 2015
+systemProp.http.proxyHost=127.0.0.1
+systemProp.http.proxyPort=1080
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e1d4236..2173914 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
diff --git a/okhttputils/build.gradle b/okhttputils/build.gradle
index bbc8e18..268af80 100644
--- a/okhttputils/build.gradle
+++ b/okhttputils/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 version = "1.0.2"
@@ -30,37 +29,7 @@ def siteUrl = 'https://github.com/hongyangAndroid/okhttp-utils'
 def gitUrl = 'https://github.com/hongyangAndroid/okhttp-utils.git'                     // #CONFIG# // project git
 group = "com.zhy"
 
-install {
-    repositories.mavenInstaller {
-        // This generates POM.xml with proper parameters
-        pom {
-            project {
-                packaging 'aar'
-                name 'okhttputils'                                   // #CONFIG# // project title
-                url siteUrl
-                // Set your license
-                licenses {
-                    license {
-                        name 'The Apache Software License, Version 2.0'
-                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    }
-                }
-                developers {
-                    developer {
-                        id 'hongyangAndroid'                                           // #CONFIG# // your user id (you can write your nickname)
-                        name 'ZhangHongyang'                                       // #CONFIG# // your user name
-                        email '623565791@qq.com'                               // #CONFIG# // your email
-                    }
-                }
-                scm {
-                    connection gitUrl
-                    developerConnection gitUrl
-                    url siteUrl
-                }
-            }
-        }
-    }
-}
+
 
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
diff --git a/okhttputils/okhttputils.iml b/okhttputils/okhttputils.iml
deleted file mode 100644
index cfe8fa7..0000000
--- a/okhttputils/okhttputils.iml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":okhttputils" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.zhy" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":okhttputils" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform (1)" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
-    <orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
-    <orderEntry type="library" exported="" name="gson-2.2.1" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/okhttputils/src/main/java/com/zhy/http/okhttp/RequestBodyUtils.java b/okhttputils/src/main/java/com/zhy/http/okhttp/RequestBodyUtils.java
new file mode 100644
index 0000000..8e6ba98
--- /dev/null
+++ b/okhttputils/src/main/java/com/zhy/http/okhttp/RequestBodyUtils.java
@@ -0,0 +1,49 @@
+package com.zhy.http.okhttp;
+
+import com.squareup.okhttp.MediaType;
+import com.squareup.okhttp.RequestBody;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import okio.BufferedSink;
+import okio.Okio;
+import okio.Source;
+
+/**
+ * create InputStream RequestBody
+ * Created by YUHONG on 2015/12/1.
+ *
+ * Email: hongyuahu@gmail.com
+ */
+public class RequestBodyUtils {
+
+    public static RequestBody create(final MediaType mediaType, final InputStream inputStream) {
+        return new RequestBody() {
+            @Override
+            public MediaType contentType() {
+                return mediaType;
+            }
+
+            @Override
+            public void writeTo(BufferedSink sink) throws IOException {
+                Source source = null;
+                try {
+                    source = Okio.source(inputStream);
+                    sink.writeAll(source);
+                } finally {
+
+                }
+            }
+
+            @Override
+            public long contentLength() throws IOException {
+                try {
+                    return inputStream.available();
+                } catch ( IOException e) {
+                    return 0;
+                }
+            }
+        };
+    }
+}
diff --git a/okhttputils/src/main/java/com/zhy/http/okhttp/request/OkHttpRequest.java b/okhttputils/src/main/java/com/zhy/http/okhttp/request/OkHttpRequest.java
index f7bb3e6..5c0b53d 100644
--- a/okhttputils/src/main/java/com/zhy/http/okhttp/request/OkHttpRequest.java
+++ b/okhttputils/src/main/java/com/zhy/http/okhttp/request/OkHttpRequest.java
@@ -13,6 +13,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.IdentityHashMap;
 import java.util.Map;
 
@@ -105,6 +106,7 @@ public static class Builder
         private Map<String, String> headers;
         private Map<String, String> params;
         private Pair<String, File>[] files;
+        private Pair<String, InputStream>[] inputStreams;
         private MediaType mediaType;
 
         private String destFileDir;
@@ -162,6 +164,12 @@ public Builder addHeader(String key, String val)
             return this;
         }
 
+        public Builder inputStreams(Pair<String, InputStream>... inputStreams)
+        {
+            this.inputStreams = inputStreams;
+            return this;
+        }
+
 
         public Builder files(Pair<String, File>... files)
         {
@@ -234,14 +242,14 @@ public OkHttpRequest post(ResultCallback callback)
 
         public OkHttpRequest upload(ResultCallback callback)
         {
-            OkHttpRequest request = new OkHttpUploadRequest(url, tag, params, headers, files);
+            OkHttpRequest request = new OkHttpUploadRequest(url, tag, params, headers, files, inputStreams);
             request.invokeAsyn(callback);
             return request;
         }
 
         public <T> T upload(Class<T> clazz) throws IOException
         {
-            OkHttpRequest request = new OkHttpUploadRequest(url, tag, params, headers, files);
+            OkHttpRequest request = new OkHttpUploadRequest(url, tag, params, headers, files, inputStreams);
             return request.invoke(clazz);
         }
 
diff --git a/okhttputils/src/main/java/com/zhy/http/okhttp/request/OkHttpUploadRequest.java b/okhttputils/src/main/java/com/zhy/http/okhttp/request/OkHttpUploadRequest.java
index 58c4f0f..6f0f957 100644
--- a/okhttputils/src/main/java/com/zhy/http/okhttp/request/OkHttpUploadRequest.java
+++ b/okhttputils/src/main/java/com/zhy/http/okhttp/request/OkHttpUploadRequest.java
@@ -6,8 +6,10 @@
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.MultipartBuilder;
 import com.squareup.okhttp.RequestBody;
+import com.zhy.http.okhttp.RequestBodyUtils;
 
 import java.io.File;
+import java.io.InputStream;
 import java.net.FileNameMap;
 import java.net.URLConnection;
 import java.util.Map;
@@ -19,19 +21,22 @@ public class OkHttpUploadRequest extends OkHttpPostRequest
 {
     private Pair<String, File>[] files;
 
+    private Pair<String, InputStream>[] inputStreams;
 
-    protected OkHttpUploadRequest(String url, Object tag, Map<String, String> params, Map<String, String> headers, Pair<String, File>[] files)
+
+    protected OkHttpUploadRequest(String url, Object tag, Map<String, String> params, Map<String, String> headers, Pair<String, File>[] files, Pair<String, InputStream>[] inputStreams)
     {
         super(url, tag, params, headers, null, null, null, null);
         this.files = files;
+        this.inputStreams = inputStreams;
     }
 
     @Override
     protected void validParams()
     {
-        if (params == null && files == null)
+        if (params == null && files == null && inputStreams == null)
         {
-            throw new IllegalArgumentException("params and files can't both null in upload request .");
+            throw new IllegalArgumentException("params and files or inputStreams can't both null in upload request .");
         }
     }
 
@@ -75,6 +80,10 @@ public RequestBody buildRequestBody()
                         fileBody);
             }
         }
+        if(inputStreams != null)
+        {
+            addInputStreamsPart(builder, inputStreams);
+        }
 
         return builder.build();
     }
@@ -91,4 +100,19 @@ private String guessMimeType(String path)
         return contentTypeFor;
     }
 
+    private void addInputStreamsPart(MultipartBuilder builder, Pair<String, InputStream>[] inputStreams)
+    {
+        RequestBody inputStreamBody = null;
+        for(int i = 0; i < inputStreams.length; i++)
+        {
+            Pair<String, InputStream> inputStreamPair = inputStreams[i];
+            String keyName = inputStreamPair.first;
+            InputStream inputStream = inputStreamPair.second;
+            inputStreamBody = RequestBodyUtils.create(null, inputStream);
+            builder.addPart(Headers.of("Content-Disposition",
+                            "form-data; name=\"" + keyName + "\""),
+                    inputStreamBody);
+        }
+    }
+
 }
diff --git a/sample-okhttp/build.gradle b/sample-okhttp/build.gradle
index f8680f1..466f172 100644
--- a/sample-okhttp/build.gradle
+++ b/sample-okhttp/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    buildToolsVersion '23.0.1'
 
     defaultConfig {
         applicationId "com.zhy.sample_okhttp"
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:22.2.1'
     compile project(':okhttputils')
 }
diff --git a/sample-okhttp/sample-okhttp.iml b/sample-okhttp/sample-okhttp.iml
deleted file mode 100644
index 509b787..0000000
--- a/sample-okhttp/sample-okhttp.iml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":sample-okhttp" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="OkHttpManager" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":sample-okhttp" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform (3)" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
-    <orderEntry type="module" module-name="okhttputils" exported="" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/sample-okhttp/src/main/java/com/zhy/sample_okhttp/MainActivity.java b/sample-okhttp/src/main/java/com/zhy/sample_okhttp/MainActivity.java
index b87259e..959ef3c 100644
--- a/sample-okhttp/src/main/java/com/zhy/sample_okhttp/MainActivity.java
+++ b/sample-okhttp/src/main/java/com/zhy/sample_okhttp/MainActivity.java
@@ -16,6 +16,9 @@
 import com.zhy.http.okhttp.request.OkHttpRequest;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -128,17 +131,14 @@ public void getUsers(View view)
         Map<String, String> params = new HashMap<String, String>();
         params.put("name", "zhy");
         String url = "https://raw.githubusercontent.com/hongyangAndroid/okhttp-utils/master/users.gson";
-        new OkHttpRequest.Builder().url(url).params(params).post(new MyResultCallback<List<User>>()
-        {
+        new OkHttpRequest.Builder().url(url).params(params).post(new MyResultCallback<List<User>>() {
             @Override
-            public void onError(Request request, Exception e)
-            {
+            public void onError(Request request, Exception e) {
                 Log.e("TAG", "onError , e = " + e.getMessage());
             }
 
             @Override
-            public void onResponse(List<User> users)
-            {
+            public void onResponse(List<User> users) {
                 Log.e("TAG", "onResponse , users = " + users);
                 mTv.setText(users.get(0).toString());
             }
@@ -152,17 +152,14 @@ public void getSimpleString(View view)
         String url = "https://raw.githubusercontent.com/hongyangAndroid/okhttp-utils/master/user.gson";
 
         new OkHttpRequest.Builder().url(url)
-                .get(new MyResultCallback<String>()
-                {
+                .get(new MyResultCallback<String>() {
                     @Override
-                    public void onError(Request request, Exception e)
-                    {
+                    public void onError(Request request, Exception e) {
                         Log.e("TAG", "onError , e = " + e.getMessage());
                     }
 
                     @Override
-                    public void onResponse(String response)
-                    {
+                    public void onResponse(String response) {
                         mTv.setText(response);
                     }
                 });
@@ -175,17 +172,14 @@ public void getHtml(View view)
         //https://kyfw.12306.cn/otn/
         //https://192.168.187.1:8443/
         String url = "http://www.csdn.net/";
-        new OkHttpRequest.Builder().url(url).get(new MyResultCallback<String>()
-        {
+        new OkHttpRequest.Builder().url(url).get(new MyResultCallback<String>() {
             @Override
-            public void onError(Request request, Exception e)
-            {
+            public void onError(Request request, Exception e) {
                 Log.e("TAG", "onError" + e.getMessage());
             }
 
             @Override
-            public void onResponse(String response)
-            {
+            public void onResponse(String response) {
                 mTv.setText(response);
             }
         });
@@ -194,17 +188,14 @@ public void onResponse(String response)
     public void getHttpsHtml(View view)
     {
         String url = "https://kyfw.12306.cn/otn/";
-        new OkHttpRequest.Builder().url(url).get(new MyResultCallback<String>()
-        {
+        new OkHttpRequest.Builder().url(url).get(new MyResultCallback<String>() {
             @Override
-            public void onError(Request request, Exception e)
-            {
+            public void onError(Request request, Exception e) {
                 Log.e("TAG", "onError" + e.getMessage());
             }
 
             @Override
-            public void onResponse(String response)
-            {
+            public void onResponse(String response) {
                 mTv.setText(response);
             }
         });
@@ -217,6 +208,48 @@ public void getImage(View view)
         new OkHttpRequest.Builder().url(url).imageView(mImageView).displayImage(null);
     }
 
+    public void uploadStream(View view)
+    {
+        File file = new File(Environment.getExternalStorageDirectory(), "messenger_01.png");
+        if (!file.exists())
+        {
+            Toast.makeText(MainActivity.this, "文件不存在，请修改文件路径", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        InputStream io = null;
+        try {
+            io = new FileInputStream(file);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+        if(io == null)
+        {
+            Toast.makeText(MainActivity.this, "文件不存在，请修改文件路径", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        Map<String, String> params = new HashMap<>();
+        params.put("username", "张鸿洋");
+        params.put("password", "123");
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put("APP-Key", "APP-Secret222");
+        headers.put("APP-Secret", "APP-Secret111");
+
+        String url = "http://192.168.56.1:8080/okHttpServer/fileUpload";
+        new OkHttpRequest.Builder()//
+                .url(url)//
+                .params(params)
+                .headers(headers)
+                .files(new Pair<String, File>("mFile", file))//
+                .upload(stringResultCallback);
+
+        new OkHttpRequest.Builder()
+                .url(url)
+                .params(params)
+                .inputStreams(new Pair<String, InputStream>("mInputstream", io))
+                .headers(headers)
+                .upload(stringResultCallback);
+    }
 
     public void uploadFile(View view)
     {