From c5faaa3263dc30dde44ca54e11017fac18568192 Mon Sep 17 00:00:00 2001 From: z Date: Tue, 16 Jun 2020 14:04:02 +0430 Subject: [PATCH 1/4] check mTask in FileDownloadMessenger.notifyProgress --- build.gradle | 7 +++++-- .../com/liulishuo/filedownloader/demo/MainActivity.java | 2 ++ gradle/wrapper/gradle-wrapper.properties | 2 +- .../liulishuo/filedownloader/FileDownloadMessenger.java | 7 +++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index c13e4f32..afa4e4a9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,21 @@ buildscript { repositories { + maven { + url "https://plugins.gradle.org/m2/" + } jcenter() google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:3.4.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' } } allprojects { repositories { - jcenter() google() + jcenter() } } diff --git a/demo/src/main/java/com/liulishuo/filedownloader/demo/MainActivity.java b/demo/src/main/java/com/liulishuo/filedownloader/demo/MainActivity.java index c2d95fc7..b5623755 100644 --- a/demo/src/main/java/com/liulishuo/filedownloader/demo/MainActivity.java +++ b/demo/src/main/java/com/liulishuo/filedownloader/demo/MainActivity.java @@ -4,6 +4,7 @@ import android.net.Uri; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; +import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -22,6 +23,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + Log.d("tag","hi"); // 这是只是为了全局监控。如果你有需求需要全局监控（比如用于打点/统计）可以使用这个方式，如果没有类似需求就不需要 // 如果你有这个需求，实现FileDownloadMonitor.IMonitor接口，也使用FileDownloadMonitor.setGlobalMonitor diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a58200fb..b5f789de 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-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/library/src/main/java/com/liulishuo/filedownloader/FileDownloadMessenger.java b/library/src/main/java/com/liulishuo/filedownloader/FileDownloadMessenger.java index 80fce2f0..dbd8bf29 100644 --- a/library/src/main/java/com/liulishuo/filedownloader/FileDownloadMessenger.java +++ b/library/src/main/java/com/liulishuo/filedownloader/FileDownloadMessenger.java @@ -103,6 +103,13 @@ public void notifyConnected(MessageSnapshot snapshot) { @Override public void notifyProgress(MessageSnapshot snapshot) { + if (mTask == null) { + if (FileDownloadLog.NEED_LOG) { + FileDownloadLog.d(this, "notify progress nil", + snapshot.getId(), snapshot.getStatus()); + } + return; + } final BaseDownloadTask originTask = mTask.getOrigin(); if (FileDownloadLog.NEED_LOG) { FileDownloadLog.d(this, "notify progress %s %d %d", From 229fb644bc5a37394a09723262a408494598a0b6 Mon Sep 17 00:00:00 2001 From: z Date: Wed, 17 Jun 2020 18:28:27 +0430 Subject: [PATCH 2/4] check mTask in FileDownloadMessenger --- .../filedownloader/FileDownloadMessenger.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/liulishuo/filedownloader/FileDownloadMessenger.java b/library/src/main/java/com/liulishuo/filedownloader/FileDownloadMessenger.java index dbd8bf29..d5742597 100644 --- a/library/src/main/java/com/liulishuo/filedownloader/FileDownloadMessenger.java +++ b/library/src/main/java/com/liulishuo/filedownloader/FileDownloadMessenger.java @@ -105,7 +105,7 @@ public void notifyConnected(MessageSnapshot snapshot) { public void notifyProgress(MessageSnapshot snapshot) { if (mTask == null) { if (FileDownloadLog.NEED_LOG) { - FileDownloadLog.d(this, "notify progress nil", + FileDownloadLog.d(this, "can't notify progress snapshot(id[%d], status[%d])", snapshot.getId(), snapshot.getStatus()); } return; @@ -146,6 +146,13 @@ public void notifyBlockComplete(MessageSnapshot snapshot) { @Override public void notifyRetry(MessageSnapshot snapshot) { + if (mTask == null) { + if (FileDownloadLog.NEED_LOG) { + FileDownloadLog.d(this, "can't notify retry snapshot(id[%d], status[%d])", + snapshot.getId(), snapshot.getStatus()); + } + return; + } if (FileDownloadLog.NEED_LOG) { final BaseDownloadTask originTask = mTask.getOrigin(); FileDownloadLog.d(this, "notify retry %s %d %d %s", mTask, @@ -172,6 +179,13 @@ public void notifyWarn(MessageSnapshot snapshot) { @Override public void notifyError(MessageSnapshot snapshot) { + if (mTask == null) { + if (FileDownloadLog.NEED_LOG) { + FileDownloadLog.d(this, "can't notify error snapshot(id[%d], status[%d])", + snapshot.getId(), snapshot.getStatus()); + } + return; + } if (FileDownloadLog.NEED_LOG) { FileDownloadLog.d(this, "notify error %s %s", mTask, mTask.getOrigin().getErrorCause()); } From 0bd1e1a9029f74aaec7d99840168374cd514ead7 Mon Sep 17 00:00:00 2001 From: z Date: Wed, 17 Jun 2020 18:30:43 +0430 Subject: [PATCH 3/4] check mTask in FileDownloadMessenger --- .../java/com/liulishuo/filedownloader/demo/MainActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/demo/src/main/java/com/liulishuo/filedownloader/demo/MainActivity.java b/demo/src/main/java/com/liulishuo/filedownloader/demo/MainActivity.java index b5623755..6c640912 100644 --- a/demo/src/main/java/com/liulishuo/filedownloader/demo/MainActivity.java +++ b/demo/src/main/java/com/liulishuo/filedownloader/demo/MainActivity.java @@ -23,7 +23,6 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - Log.d("tag","hi"); // 这是只是为了全局监控。如果你有需求需要全局监控（比如用于打点/统计）可以使用这个方式，如果没有类似需求就不需要 // 如果你有这个需求，实现FileDownloadMonitor.IMonitor接口，也使用FileDownloadMonitor.setGlobalMonitor From 6a2ccc74bb8ec962c4c7ca5c15f8d709cbb2ee93 Mon Sep 17 00:00:00 2001 From: z Date: Wed, 17 Jun 2020 18:34:09 +0430 Subject: [PATCH 4/4] delete log from mainActivity --- .../java/com/liulishuo/filedownloader/demo/MainActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/demo/src/main/java/com/liulishuo/filedownloader/demo/MainActivity.java b/demo/src/main/java/com/liulishuo/filedownloader/demo/MainActivity.java index 6c640912..c2d95fc7 100644 --- a/demo/src/main/java/com/liulishuo/filedownloader/demo/MainActivity.java +++ b/demo/src/main/java/com/liulishuo/filedownloader/demo/MainActivity.java @@ -4,7 +4,6 @@ import android.net.Uri; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View;