目录结构优化

downloadutil/src/main/java/com/arialyy/downloadutil/core/DownloadManager.java

@@ -4,7 +4,8 @@ import android.app.Application;
 import android.content.Context;
 import android.util.Log;
 import com.arialyy.downloadutil.core.command.IDownloadCmd;
-import com.arialyy.downloadutil.core.inf.ITaskQueue;
+import com.arialyy.downloadutil.core.queue.ITaskQueue;
+import com.arialyy.downloadutil.core.queue.DownloadTaskQueue;
 import com.arialyy.downloadutil.orm.DbEntity;
 import com.arialyy.downloadutil.orm.DbUtil;
 import java.util.ArrayList;

downloadutil/src/main/java/com/arialyy/downloadutil/core/TaskEnum.java

@@ -1,9 +0,0 @@
-package com.arialyy.downloadutil.core;
-
-/**
- * Created by lyy on 2016/8/18.
- * 创建任务类型
- */
-public enum TaskEnum {
-  ORDINARY, NO_USR_CALLBACK
-}

downloadutil/src/main/java/com/arialyy/downloadutil/core/command/AddCmd.java

@@ -2,7 +2,7 @@ package com.arialyy.downloadutil.core.command;
 
 import android.util.Log;
 import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.Task;
+import com.arialyy.downloadutil.core.task.Task;
 
 /**
  * Created by lyy on 2016/8/22.

downloadutil/src/main/java/com/arialyy/downloadutil/core/command/CancelCmd.java

@@ -1,8 +1,7 @@
 package com.arialyy.downloadutil.core.command;
 
-import android.content.Context;
 import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.Task;
+import com.arialyy.downloadutil.core.task.Task;
 
 /**
  * Created by lyy on 2016/9/20.

downloadutil/src/main/java/com/arialyy/downloadutil/core/command/IDownloadCmd.java

@@ -2,7 +2,7 @@ package com.arialyy.downloadutil.core.command;
 
 import com.arialyy.downloadutil.core.DownloadEntity;
 import com.arialyy.downloadutil.core.DownloadManager;
-import com.arialyy.downloadutil.core.inf.ITaskQueue;
+import com.arialyy.downloadutil.core.queue.ITaskQueue;
 import com.arialyy.downloadutil.help.CheckHelp;
 import com.arialyy.downloadutil.util.Util;
 

downloadutil/src/main/java/com/arialyy/downloadutil/core/command/StartCmd.java

@@ -1,8 +1,7 @@
 package com.arialyy.downloadutil.core.command;
 
-import android.content.Context;
 import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.Task;
+import com.arialyy.downloadutil.core.task.Task;
 
 /**
  * Created by lyy on 2016/8/22.

downloadutil/src/main/java/com/arialyy/downloadutil/core/command/StopCmd.java

@@ -2,7 +2,7 @@ package com.arialyy.downloadutil.core.command;
 
 import android.util.Log;
 import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.Task;
+import com.arialyy.downloadutil.core.task.Task;
 
 /**
  * Created by lyy on 2016/9/20.

downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/DownloadTaskQueue.java

@@ -1,17 +1,20 @@
-package com.arialyy.downloadutil.core;
+package com.arialyy.downloadutil.core.queue;
 
 import android.content.Context;
 import android.util.Log;
-import com.arialyy.downloadutil.core.inf.IDownloadSchedulers;
-import com.arialyy.downloadutil.core.inf.ITaskQueue;
-import com.arialyy.downloadutil.core.pool.CachePool;
-import com.arialyy.downloadutil.core.pool.ExecutePool;
+import com.arialyy.downloadutil.core.DownloadEntity;
+import com.arialyy.downloadutil.core.scheduler.DownloadSchedulers;
+import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.downloadutil.core.task.TaskFactory;
+import com.arialyy.downloadutil.core.scheduler.IDownloadSchedulers;
+import com.arialyy.downloadutil.core.queue.pool.CachePool;
+import com.arialyy.downloadutil.core.queue.pool.ExecutePool;
 
 /**
  * Created by lyy on 2016/8/17.
  * 下载任务队列
  */
-final class DownloadTaskQueue implements ITaskQueue {
+public class DownloadTaskQueue implements ITaskQueue {
   private static final String      TAG          = "DownloadTaskQueue";
   private              CachePool   mCachePool   = CachePool.getInstance();
   private              ExecutePool mExecutePool = ExecutePool.getInstance();
@@ -126,11 +129,11 @@ final class DownloadTaskQueue implements ITaskQueue {
     mSchedulers = schedulers;
   }
 
-  static class Builder {
+  public static class Builder {
     Context             context;
     IDownloadSchedulers schedulers;
 
-    Builder(Context context) {
+    public Builder(Context context) {
       this.context = context.getApplicationContext();
     }
 
@@ -139,7 +142,7 @@ final class DownloadTaskQueue implements ITaskQueue {
       return this;
     }
 
-    DownloadTaskQueue build() {
+    public DownloadTaskQueue build() {
       DownloadTaskQueue queue = new DownloadTaskQueue(context);
       if (schedulers == null) {
         schedulers = DownloadSchedulers.getInstance(queue);

downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/IDownloader.java

@@ -1,6 +1,6 @@
-package com.arialyy.downloadutil.core.inf;
+package com.arialyy.downloadutil.core.queue;
 
-import com.arialyy.downloadutil.core.Task;
+import com.arialyy.downloadutil.core.task.Task;
 
 /**
  * Created by lyy on 2016/8/16.

downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/IPool.java

@@ -1,6 +1,6 @@
-package com.arialyy.downloadutil.core.inf;
+package com.arialyy.downloadutil.core.queue;
 
-import com.arialyy.downloadutil.core.Task;
+import com.arialyy.downloadutil.core.task.Task;
 
 /**
  * Created by lyy on 2016/8/14.

downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/ITaskQueue.java

@@ -1,13 +1,14 @@
-package com.arialyy.downloadutil.core.inf;
+package com.arialyy.downloadutil.core.queue;
 
 import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.Task;
+import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.downloadutil.core.scheduler.IDownloadSchedulers;
 
 /**
  * Created by lyy on 2016/8/16.
  * 任务功能接口
  */
-public interface ITaskQueue extends IDownloader{
+public interface ITaskQueue extends IDownloader {
 
   /**
    * 创建一个新的下载任务，创建时只是将新任务存储到缓存池

downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/pool/CachePool.java

@@ -1,9 +1,9 @@
-package com.arialyy.downloadutil.core.pool;
+package com.arialyy.downloadutil.core.queue.pool;
 
 import android.text.TextUtils;
 import android.util.Log;
-import com.arialyy.downloadutil.core.Task;
-import com.arialyy.downloadutil.core.inf.IPool;
+import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.downloadutil.core.queue.IPool;
 import com.arialyy.downloadutil.util.Util;
 import java.util.HashMap;
 import java.util.Map;

downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/pool/ExecutePool.java

@@ -1,9 +1,9 @@
-package com.arialyy.downloadutil.core.pool;
+package com.arialyy.downloadutil.core.queue.pool;
 
 import android.text.TextUtils;
 import android.util.Log;
-import com.arialyy.downloadutil.core.Task;
-import com.arialyy.downloadutil.core.inf.IPool;
+import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.downloadutil.core.queue.IPool;
 import com.arialyy.downloadutil.util.Util;
 import java.util.HashMap;
 import java.util.Map;

downloadutil/src/main/java/com/arialyy/downloadutil/core/scheduler/DownloadSchedulers.java

@@ -1,9 +1,11 @@
-package com.arialyy.downloadutil.core;
+package com.arialyy.downloadutil.core.scheduler;
 
 import android.os.Message;
 import android.util.Log;
-import com.arialyy.downloadutil.core.inf.IDownloadSchedulers;
-import com.arialyy.downloadutil.core.pool.ExecutePool;
+import com.arialyy.downloadutil.core.DownloadEntity;
+import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.downloadutil.core.queue.pool.ExecutePool;
+import com.arialyy.downloadutil.core.queue.DownloadTaskQueue;
 
 /**
  * Created by lyy on 2016/8/16.

downloadutil/src/main/java/com/arialyy/downloadutil/core/scheduler/IDownloadSchedulers.java

@@ -1,4 +1,4 @@
-package com.arialyy.downloadutil.core.inf;
+package com.arialyy.downloadutil.core.scheduler;
 
 import android.os.Handler;
 import com.arialyy.downloadutil.core.DownloadEntity;

downloadutil/src/main/java/com/arialyy/downloadutil/core/task/DownloadListener.java

@@ -1,6 +1,6 @@
-package com.arialyy.downloadutil.core;
+package com.arialyy.downloadutil.core.task;
 
-public class DownloadListener implements IDownloadListener {
+class DownloadListener implements IDownloadListener {
 
   @Override public void onResume(long resumeLocation) {
 

downloadutil/src/main/java/com/arialyy/downloadutil/core/task/DownloadUtil.java

@@ -1,9 +1,9 @@
-package com.arialyy.downloadutil.core;
+package com.arialyy.downloadutil.core.task;
 
 import android.content.Context;
 import android.util.Log;
 import android.util.SparseArray;
-import com.arialyy.downloadutil.core.inf.IDownloadUtil;
+import com.arialyy.downloadutil.core.DownloadEntity;
 import com.arialyy.downloadutil.util.Util;
 import java.io.File;
 import java.io.IOException;

downloadutil/src/main/java/com/arialyy/downloadutil/core/task/IDownloadListener.java

@@ -1,4 +1,4 @@
-package com.arialyy.downloadutil.core;
+package com.arialyy.downloadutil.core.task;
 
 /**
  * 下载监听

downloadutil/src/main/java/com/arialyy/downloadutil/core/task/IDownloadUtil.java

@@ -1,4 +1,4 @@
-package com.arialyy.downloadutil.core.inf;
+package com.arialyy.downloadutil.core.task;
 
 /**
  * Created by “AriaLyy@outlook.com” on 2016/10/31.

downloadutil/src/main/java/com/arialyy/downloadutil/core/task/Task.java

@@ -1,12 +1,14 @@
-package com.arialyy.downloadutil.core;
+package com.arialyy.downloadutil.core.task;
 
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Handler;
 import android.util.Log;
-import com.arialyy.downloadutil.core.inf.IDownloadSchedulers;
-import com.arialyy.downloadutil.core.inf.IDownloadUtil;
+import com.arialyy.downloadutil.core.DownloadEntity;
+import com.arialyy.downloadutil.core.DownloadManager;
+import com.arialyy.downloadutil.core.scheduler.IDownloadSchedulers;
+import com.arialyy.downloadutil.core.scheduler.DownloadSchedulers;
 
 /**
  * Created by lyy on 2016/8/11.

downloadutil/src/main/java/com/arialyy/downloadutil/core/task/TaskFactory.java

@@ -1,7 +1,8 @@
-package com.arialyy.downloadutil.core;
+package com.arialyy.downloadutil.core.task;
 
 import android.content.Context;
-import com.arialyy.downloadutil.core.inf.IDownloadSchedulers;
+import com.arialyy.downloadutil.core.DownloadEntity;
+import com.arialyy.downloadutil.core.scheduler.IDownloadSchedulers;
 
 /**
  * Created by lyy on 2016/8/18.