修复多线程引起的下载出错显示异常的bug

JinJieGu · JinJieGu · commit c116e094b0dc · 2017-12-21T10:33:28.000+08:00
新增取消任务null Listener判断
diff --git a/library/src/main/java/jaygoo/library/m3u8downloader/DownloadQueue.java b/library/src/main/java/jaygoo/library/m3u8downloader/DownloadQueue.java
@@ -34,11 +34,14 @@ public void offer(M3U8Task task){
      * @return
      */
     public M3U8Task poll(){
-        if (queue.size() >= 2){
-            queue.remove(0);
-            return queue.get(0);
-        }else if (queue.size() == 1){
-            queue.remove(0);
+        try {
+            if (queue.size() >= 2){
+                queue.remove(0);
+                return queue.get(0);
+            }else if (queue.size() == 1){
+                queue.remove(0);
+            }
+        }catch (Exception e){
         }
         return null;
     }
@@ -48,8 +51,11 @@ public M3U8Task poll(){
      * @return
      */
     public M3U8Task peek(){
-        if (queue.size() >= 1){
-            return queue.get(0);
+        try {
+            if (queue.size() >= 1){
+                return queue.get(0);
+            }
+        }catch (Exception e){
         }
         return null;
     }
@@ -81,16 +87,24 @@ public boolean contains(M3U8Task task){
      * @return
      */
     public M3U8Task getTask(String url){
-        for (int i = 0; i < queue.size(); i++){
-            if (queue.get(i).getUrl().equals(url)){
-                return queue.get(i);
+        try {
+            for (int i = 0; i < queue.size(); i++){
+                if (queue.get(i).getUrl().equals(url)){
+                    return queue.get(i);
+                }
             }
+        }catch (Exception e){
         }
+
         return null;
     }
 
     public boolean isEmpty(){
-        return queue.size() == 0;
+        return size() == 0;
+    }
+
+    public int size(){
+        return queue.size();
     }
 
     public boolean isHead(String url){
diff --git a/library/src/main/java/jaygoo/library/m3u8downloader/M3U8DownloadTask.java b/library/src/main/java/jaygoo/library/m3u8downloader/M3U8DownloadTask.java
@@ -1,5 +1,8 @@
 package jaygoo.library.m3u8downloader;
 
+import android.os.Handler;
+import android.os.Message;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -26,6 +29,10 @@
  * ================================================
  */
 class M3U8DownloadTask {
+    private static final int WHAT_ON_ERROR = 1001;
+    private static final int WHAT_ON_PROGRESS = 1002;
+    private static final int WHAT_ON_SUCCESS = 1003;
+    private static final int WHAT_ON_START_DOWNLOAD = 1004;
     private OnTaskDownloadListener onTaskDownloadListener;
     //加密Key，默认为空，不加密
     private String encryptKey = null;
@@ -68,6 +75,33 @@ class M3U8DownloadTask {
     private ExecutorService executor;//线程池
     private M3U8 currentM3U8;
 
+    private WeakHandler mHandler = new WeakHandler(new Handler.Callback() {
+        @Override
+        public boolean handleMessage(Message msg) {
+            switch (msg.what) {
+                case WHAT_ON_ERROR:
+                    onTaskDownloadListener.onError((Throwable) msg.obj);
+                    break;
+
+                case WHAT_ON_START_DOWNLOAD:
+                    onTaskDownloadListener.onStartDownload(totalTs, curTs);
+                    break;
+
+                case WHAT_ON_PROGRESS:
+                    onTaskDownloadListener.onDownloading(totalFileSize, itemFileSize, totalTs, curTs);
+                    break;
+
+                case WHAT_ON_SUCCESS:
+                    if (netSpeedTimer != null) {
+                        netSpeedTimer.cancel();
+                    }
+                    onTaskDownloadListener.onSuccess(currentM3U8);
+                    break;
+            }
+            return true;
+        }
+    });
+
     public M3U8DownloadTask(){
         connTimeout = M3U8DownloaderConfig.getConnTimeout();
         readTimeout = M3U8DownloaderConfig.getReadTimeout();
@@ -138,10 +172,7 @@ public void run() {
                                 currentM3U8.setM3u8FilePath(m3u8File.getPath());
                                 currentM3U8.setDirFilePath(saveDir);
                                 currentM3U8.getFileSize();
-                                if (netSpeedTimer != null) {
-                                    netSpeedTimer.cancel();
-                                }
-                                onTaskDownloadListener.onSuccess(currentM3U8);
+                                mHandler.sendEmptyMessage(WHAT_ON_SUCCESS);
                                 isRunning = false;
                             }
                         } catch (InterruptedIOException e) {
@@ -240,7 +271,7 @@ public void run() {
                             if (conn.getResponseCode() == 200) {
                                 if (isStartDownload){
                                     isStartDownload = false;
-                                    onTaskDownloadListener.onStartDownload(totalTs, curTs);
+                                    mHandler.sendEmptyMessage(WHAT_ON_START_DOWNLOAD);
                                 }
                                 inputStream = conn.getInputStream();
                                 fos = new FileOutputStream(file);//会自动创建文件
@@ -278,7 +309,7 @@ public void run() {
 
                         itemFileSize = file.length();
                         m3U8Ts.setFileSize(itemFileSize);
-                        onTaskDownloadListener.onDownloading(totalFileSize, itemFileSize, totalTs, curTs);
+                        mHandler.sendEmptyMessage(WHAT_ON_PROGRESS);
                         curTs++;
                     }else {
                         curTs ++;
@@ -304,7 +335,10 @@ private void handlerError(Throwable e) {
         if ("thread interrupted".equals(e.getMessage())) {
             return;
         }
-        onTaskDownloadListener.onError(e);
+        Message msg = Message.obtain();
+        msg.obj = e;
+        msg.what = WHAT_ON_ERROR;
+        mHandler.sendMessage(msg);
     }
 
     /**
diff --git a/library/src/main/java/jaygoo/library/m3u8downloader/M3U8Downloader.java b/library/src/main/java/jaygoo/library/m3u8downloader/M3U8Downloader.java
@@ -1,6 +1,8 @@
 package jaygoo.library.m3u8downloader;
 
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import android.util.Log;
 
 import java.io.File;
 import java.util.List;
@@ -204,6 +206,7 @@ private void startDownloadTask(M3U8Task task){
             M3U8Log.d("start download task, but task is running: " + task.getUrl());
             return;
         }
+
         if (task.getState() == M3U8TaskState.PAUSE){
             M3U8Log.d("start download task, but task has pause: " + task.getUrl());
             return;
@@ -237,17 +240,21 @@ public void cancel(List<String> urls){
      * 取消任务,删除缓存
      * @param url
      */
-    public void cancelAndDelete(final String url, final OnDeleteTaskListener listener){
+    public void cancelAndDelete(final String url, @Nullable final OnDeleteTaskListener listener){
         pause(url);
-        listener.onStart();
+        if (listener != null) {
+            listener.onStart();
+        }
         new Thread(new Runnable() {
             @Override
             public void run() {
                 boolean isDelete = MUtils.clearDir(new File(MUtils.getSaveFileDir(url)));
-                if (isDelete){
-                    listener.onSuccess();
-                }else {
-                    listener.onFail();
+                if (listener != null) {
+                    if (isDelete) {
+                        listener.onSuccess();
+                    } else {
+                        listener.onFail();
+                    }
                 }
             }
         }).start();
@@ -258,20 +265,24 @@ public void run() {
      * @param urls
      * @param listener
      */
-    public void cancelAndDelete(final List<String> urls, final OnDeleteTaskListener listener){
+    public void cancelAndDelete(final List<String> urls, @Nullable final OnDeleteTaskListener listener){
         pause(urls);
-        listener.onStart();
+        if (listener != null) {
+            listener.onStart();
+        }
         new Thread(new Runnable() {
             @Override
             public void run() {
                 boolean isDelete = true;
                 for (String url : urls){
                     isDelete = isDelete && MUtils.clearDir(new File(MUtils.getSaveFileDir(url)));
                 }
-                if (isDelete){
-                    listener.onSuccess();
-                }else {
-                    listener.onFail();
+                if (listener != null) {
+                    if (isDelete) {
+                        listener.onSuccess();
+                    } else {
+                        listener.onFail();
+                    }
                 }
             }
         }).start();
@@ -337,12 +348,12 @@ public void onStart() {
 
         @Override
         public void onError(Throwable errorMsg) {
-            currentM3U8Task.setState(M3U8TaskState.ERROR);
-            if (onM3U8DownloadListener != null){
-                onM3U8DownloadListener.onDownloadError(currentM3U8Task, errorMsg);
-            }
-            M3U8Log.e("onError: "+ errorMsg.getMessage());
-            downloadNextTask();
+                currentM3U8Task.setState(M3U8TaskState.ERROR);
+                if (onM3U8DownloadListener != null) {
+                    onM3U8DownloadListener.onDownloadError(currentM3U8Task, errorMsg);
+                }
+                M3U8Log.e("onError: " + errorMsg.getMessage());
+                downloadNextTask();
         }
 
     };
diff --git a/library/src/main/java/jaygoo/library/m3u8downloader/WeakHandler.java b/library/src/main/java/jaygoo/library/m3u8downloader/WeakHandler.java
