'修复上传问题'

nigelly · Feb 28, 2020 · bb4d4ff · bb4d4ff
1 parent 7eb2e5d
commit bb4d4ff
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/corelibrary/build.gradle b/corelibrary/build.gradle
@@ -48,5 +48,6 @@ dependencies {
     api 'com.github.bumptech.glide:glide:4.8.0'
 
     api 'cat.ereza:customactivityoncrash:2.2.0'
+    testImplementation 'junit:junit:4.12'
 
 }
diff --git a/corelibrary/src/main/java/com/pxs/corelibrary/corelib/HttpHelper.java b/corelibrary/src/main/java/com/pxs/corelibrary/corelib/HttpHelper.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 
 import okhttp3.Interceptor;
+import okhttp3.RequestBody;
 
 
 public class HttpHelper implements IHttpProcessor {
@@ -64,7 +65,7 @@ public void rxDownload(String url, DownHttpCallback downHttpCallback,String file
     }
 
     @Override
-    public void rxUpload(String url, UploadProgressRequestBody requestBody, OnSuccessAndFaultListener listener) {
+    public void rxUpload(String url, RequestBody requestBody, OnSuccessAndFaultListener listener) {
         mHttpProcessor.rxUpload(url,requestBody,listener);
     }
 

diff --git a/corelibrary/src/main/java/com/pxs/corelibrary/corelib/IHttpProcessor.java b/corelibrary/src/main/java/com/pxs/corelibrary/corelib/IHttpProcessor.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 
 import okhttp3.Interceptor;
+import okhttp3.RequestBody;
 
 
 public interface IHttpProcessor {
@@ -24,5 +25,5 @@ public interface IHttpProcessor {
 
     void rxDownload(String url, DownHttpCallback downHttpCallback,String fileName);
 
-    void rxUpload(String url, UploadProgressRequestBody requestBody, OnSuccessAndFaultListener listener);
+    void rxUpload(String url, RequestBody requestBody, OnSuccessAndFaultListener listener);
 }
diff --git a/corelibrary/src/main/java/com/pxs/corelibrary/corelib/http/RestCreator.java b/corelibrary/src/main/java/com/pxs/corelibrary/corelib/http/RestCreator.java
@@ -43,7 +43,7 @@ private static Retrofit RETROFIT_CUSTOM_INTERCEPTOR(Interceptor interceptor) {
     //单独配置okhttp
     private static class OkHttpHolder {
 
-        private static final int TIME_OUT = 60;
+        private static final int TIME_OUT = 20;
 
         private static OkHttpClient client = null;
 

diff --git a/corelibrary/src/main/java/com/pxs/corelibrary/corelib/http/RetrofitProcess.java b/corelibrary/src/main/java/com/pxs/corelibrary/corelib/http/RetrofitProcess.java
@@ -9,6 +9,7 @@
 import java.util.Map;
 
 import okhttp3.Interceptor;
+import okhttp3.RequestBody;
 
 
 public class RetrofitProcess implements IHttpProcessor {
@@ -132,7 +133,7 @@ public void rxDownload(String url, DownHttpCallback httpCallback,String fileName
     }
 
     @Override
-    public void rxUpload(String url, UploadProgressRequestBody requestBody, final OnSuccessAndFaultListener listener) {
+    public void rxUpload(String url, RequestBody requestBody, final OnSuccessAndFaultListener listener) {
         RestClient.create().url(url)
                 .body(requestBody)
                 .listener(listener)