fix breakpoint download invalid after invoke setId method.

huxq17 · Jul 30, 2020 · c6cee52 · c6cee52
1 parent dc5d1f6
commit c6cee52
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/app/src/main/java/com/huxq17/download/demo/DemoApplication.java b/app/src/main/java/com/huxq17/download/demo/DemoApplication.java
@@ -3,15 +3,14 @@
 import android.app.Application;
 import android.os.Environment;
 
+import com.huxq17.download.Pump;
 import com.huxq17.download.PumpFactory;
-import com.huxq17.download.config.DownloadConfig;
 import com.huxq17.download.core.DownloadInfo;
 import com.huxq17.download.core.DownloadInterceptor;
-import com.huxq17.download.core.service.IDownloadConfigService;
 import com.huxq17.download.core.DownloadTaskExecutor;
 import com.huxq17.download.core.SimpleDownloadTaskExecutor;
+import com.huxq17.download.core.service.IDownloadConfigService;
 import com.huxq17.download.utils.FileUtil;
-import com.huxq17.download.utils.Util;
 
 import java.io.File;
 
@@ -81,7 +80,7 @@ public DownloadInfo intercept(DownloadChain chain) {
     public void onCreate() {
         super.onCreate();
         instance = this;
-        DownloadConfig.newBuilder()
+        Pump.newConfigBuilder()
                 //Optional,set the maximum number of tasks to run at the same time, default 3.
                 .setMaxRunningTaskNum(2)
                 //Optional,set the minimum available storage space size for downloading to avoid insufficient storage space during downloading, default is 4kb.

diff --git a/app/src/main/java/com/huxq17/download/demo/MainActivity.java b/app/src/main/java/com/huxq17/download/demo/MainActivity.java
@@ -89,7 +89,8 @@ public void onFailed() {
                         //Set whether to repeatedly download the downloaded file,default false.
                         .forceReDownload(true)
                         //Set how many threads are used when downloading,default 3.
-                        .threadNum(1)
+                        .threadNum(3)
+                        .setId("123")
                         //Pump will connect server by this OKHttp request builder,so you can customize http request.
                         .setRequestBuilder(new Request.Builder())
                         .setRetry(3, 200)

diff --git a/library/src/main/java/com/huxq17/download/Pump.java b/library/src/main/java/com/huxq17/download/Pump.java
@@ -3,6 +3,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.huxq17.download.config.DownloadConfig;
 import com.huxq17.download.core.DownloadInfo;
 import com.huxq17.download.core.DownloadRequest;
 import com.huxq17.download.core.service.IDownloadManager;
@@ -13,6 +14,9 @@
 import java.util.List;
 
 public class Pump {
+    public static DownloadConfig.Builder newConfigBuilder(){
+        return DownloadConfig.newBuilder();
+    }
     /**
      * Create a new download request,download file will store in cache path.
      *

diff --git a/library/src/main/java/com/huxq17/download/core/DownloadRequest.java b/library/src/main/java/com/huxq17/download/core/DownloadRequest.java
@@ -52,7 +52,7 @@ void setDownloadInfo(DownloadDetailsInfo downloadInfo) {
     }
 
     public int getRetryDelay() {
-        return retryDelay < 0 ? 0 : retryDelay;
+        return Math.max(retryDelay, 0);
     }
 
     public DownloadDetailsInfo getDownloadInfo() {
@@ -68,7 +68,7 @@ public String getName() {
     }
 
     public int getRetryCount() {
-        return retryCount < 0 ? 0 : retryCount;
+        return Math.max(retryCount, 0);
     }
 
     public String getUrl() {

diff --git a/library/src/main/java/com/huxq17/download/core/interceptor/ConnectInterceptor.java b/library/src/main/java/com/huxq17/download/core/interceptor/ConnectInterceptor.java
@@ -191,11 +191,11 @@ private void checkDownloadFile(long contentLength, boolean isSupportBreakPointDo
     }
 
     private DownloadConnection buildRequest(DownloadRequest downloadRequest) {
-        String url = downloadRequest.getUrl();
+        String id = downloadRequest.getId();
         DownloadConnection connection = createConnection(downloadRequest);
         firstBlockTask = new DownloadBlockTask(downloadRequest, 0, connection);
         long completedSize = firstBlockTask.getCompletedSize();
-        DownloadProvider.CacheBean cacheBean = DBService.getInstance().queryCache(url);
+        DownloadProvider.CacheBean cacheBean = DBService.getInstance().queryCache(id);
         if (cacheBean == null) {
             return connection;
         }