Merge branch 'dev' into v2.5.0

troyzhxu · troyzhxu · commit b0e9e45233e0 · 2020-12-24T13:50:38.000+08:00
diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/FilePara.java b/okhttps/src/main/java/com/ejlchina/okhttps/FilePara.java
@@ -0,0 +1,48 @@
+package com.ejlchina.okhttps;
+
+import java.io.File;
+
+/**
+ * @since 2.5.0 &#20174; HttpTask &#20013;&#20998;&#31163;
+ */
+public class FilePara {
+
+    String type;
+    String fileName;
+    byte[] content;
+    File file;
+
+    public FilePara(String type, String fileName, byte[] content) {
+        this.type = type;
+        this.fileName = fileName;
+        this.content = content;
+    }
+
+    public FilePara(String type, String fileName, File file) {
+        this.type = type;
+        this.fileName = fileName;
+        this.file = file;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public byte[] getContent() {
+        return content;
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    @Override
+    public String toString() {
+        return "FilePara{" + "type='" + type + "', fileName='" + fileName + "'}";
+    }
+
+}
diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/HttpTask.java b/okhttps/src/main/java/com/ejlchina/okhttps/HttpTask.java
@@ -523,42 +523,6 @@ public boolean cancel() {
         return false;
     }
 
-    public static class FilePara {
-
-        String type;
-        String fileName;
-        byte[] content;
-        File file;
-
-        FilePara(String type, String fileName, byte[] content) {
-            this.type = type;
-            this.fileName = fileName;
-            this.content = content;
-        }
-
-        FilePara(String type, String fileName, File file) {
-            this.type = type;
-            this.fileName = fileName;
-            this.file = file;
-        }
-
-        public String getType() {
-            return type;
-        }
-
-        public String getFileName() {
-            return fileName;
-        }
-
-        public byte[] getContent() {
-            return content;
-        }
-
-        public File getFile() {
-            return file;
-        }
-    }
-    
     protected void registeTagTask(Cancelable canceler) {
         if (tag != null && tagTask == null) {
             tagTask = httpClient.addTagTask(tag, canceler, this);
