Merge branch 'v_2.0' of https://github.com/AriaLyy/Aria into v_2.0

Aria/src/main/java/com/arialyy/aria/core/queue/DownloadTaskQueue.java

@@ -33,9 +33,9 @@ import com.arialyy.aria.util.Configuration;
  * 下载任务队列
  */
 public class DownloadTaskQueue implements ITaskQueue {
-  private static final String TAG = "DownloadTaskQueue";
-  private CachePool mCachePool = CachePool.getInstance();
-  private ExecutePool mExecutePool = ExecutePool.getInstance();
+  private static final String      TAG          = "DownloadTaskQueue";
+  private              CachePool   mCachePool   = CachePool.getInstance();
+  private              ExecutePool mExecutePool = ExecutePool.getInstance();
   private Context mContext;
   //private IDownloadSchedulers mSchedulers;
 
@@ -171,13 +171,10 @@ public class DownloadTaskQueue implements ITaskQueue {
     Task task = mExecutePool.getTask(entity.getDownloadUrl());
     if (task != null) {
       Log.d(TAG, "从执行池删除任务，删除" + (mExecutePool.removeTask(task) ? "成功" : "失败"));
-    } else {
-      task = mCachePool.getTask(entity.getDownloadUrl());
     }
+    task = mCachePool.getTask(entity.getDownloadUrl());
     if (task != null) {
       Log.d(TAG, "从缓存池删除任务，删除" + (mCachePool.removeTask(task) ? "成功" : "失败"));
-    } else {
-      Log.w(TAG, "没有找到下载链接为【" + entity.getDownloadUrl() + "】的任务");
     }
   }
 

Aria/src/main/java/com/arialyy/aria/core/scheduler/DownloadSchedulers.java

@@ -121,15 +121,16 @@ public class DownloadSchedulers implements IDownloadSchedulers {
       case STOP:
       case CANCEL:
         mQueue.removeTask(entity);
-        mQueue.removeTask(entity);
-        if (mQueue.size() != Configuration.getInstance().getDownloadNum()) {
+        if (mQueue.size() < Configuration.getInstance().getDownloadNum()) {
           startNextTask(entity);
         }
         break;
       case COMPLETE:
+        mQueue.removeTask(entity);
         startNextTask(entity);
         break;
       case FAIL:
+        mQueue.removeTask(entity);
         handleFailTask(entity);
         break;
     }
@@ -223,7 +224,6 @@ public class DownloadSchedulers implements IDownloadSchedulers {
    * @param entity 通过Handler传递的下载实体
    */
   @Override public void startNextTask(DownloadEntity entity) {
-    mQueue.removeTask(entity);
     Task newTask = mQueue.getNextTask();
     if (newTask == null) {
       Log.w(TAG, "没有下一任务");