Branch：master

ghc · ghc · commit 6d0bdef122a2 · 2019-07-29T10:12:50.000+08:00
1.修改mimetype获取方式
diff --git a/EvolvingNet/src/main/java/com/codingcoderscode/lib/net/request/entity/CCFile.java b/EvolvingNet/src/main/java/com/codingcoderscode/lib/net/request/entity/CCFile.java
@@ -1,12 +1,8 @@
 package com.codingcoderscode.lib.net.request.entity;
 
 
-import android.text.TextUtils;
+import com.codingcoderscode.lib.net.util.CCFileUtils;
 
-import java.net.FileNameMap;
-import java.net.URLConnection;
-
-import okhttp3.MediaType;
 import okhttp3.RequestBody;
 
 /**
@@ -22,21 +18,9 @@ public class CCFile {
      */
     private String fileName;
 
-    public CCFile(String url){
+    public CCFile(String url) {
         this.url = url;
-
-        if (TextUtils.isEmpty(url)){
-            this.mimeType = "multipart/form-data;";
-        }else {
-            FileNameMap fileNameMap = URLConnection.getFileNameMap();
-            //url = url.replace("#", "");   //解决文件名中含有#号异常的问题
-            String contentType = fileNameMap.getContentTypeFor(url.replace("#", ""));
-            if (contentType == null) {
-                this.mimeType =  MediaType.parse("application/octet-stream").toString();
-            }
-            this.mimeType =   MediaType.parse(contentType).toString();
-        }
-
+        this.mimeType = CCFileUtils.getMimeType(url);
         this.fileName = null;
     }
 
diff --git a/EvolvingNet/src/main/java/com/codingcoderscode/lib/net/util/CCFileUtils.java b/EvolvingNet/src/main/java/com/codingcoderscode/lib/net/util/CCFileUtils.java
@@ -3,6 +3,10 @@
 import android.text.TextUtils;
 
 import java.io.File;
+import java.net.FileNameMap;
+import java.net.URLConnection;
+
+import okhttp3.MediaType;
 
 /**
  * Created by CodingCodersCode on 2017/10/31.
@@ -17,7 +21,7 @@ public class CCFileUtils {
      */
     public static void deleteFile(String filePath) {
         try {
-            if (!TextUtils.isEmpty(filePath)){
+            if (!TextUtils.isEmpty(filePath)) {
                 deleteFile(new File(filePath));
             }
         } catch (Exception e) {
@@ -40,4 +44,37 @@ public static void deleteFile(File file) {
         }
     }
 
+    /**
+     * 获取File上传的mimeType
+     *
+     * @param filePath
+     * @return
+     */
+    public static String getMimeType(String filePath) {
+        String mimeType = "";
+        MediaType mediaType;
+        try {
+            if (TextUtils.isEmpty(filePath)) {
+                mimeType = "multipart/form-data;";
+            } else {
+                FileNameMap fileNameMap = URLConnection.getFileNameMap();
+                //url = url.replace("#", "");   //解决文件名中含有#号异常的问题
+                String contentType = fileNameMap.getContentTypeFor(filePath.replace("#", ""));
+                if (contentType == null) {
+                    mediaType = MediaType.parse("application/octet-stream");
+                } else {
+                    mediaType = MediaType.parse(contentType);
+                }
+
+                if (mediaType != null) {
+                    mimeType = mediaType.toString();
+                } else {
+                    mimeType = "multipart/form-data;";
+                }
+            }
+        } catch (Exception e) {
+
+        }
+        return mimeType;
+    }
 }
