From 02420fe1f5ea9596bd944d143b17f8e934084e5c Mon Sep 17 00:00:00 2001
From: AriaLyy <511455842@qq.com>
Date: Tue, 6 Dec 2016 23:09:59 +0800
Subject: [PATCH] =?UTF-8?q?DownloadUtil=20=E9=87=8D=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E4=B8=BA=20Aria=EF=BC=8C=E4=BB=A3=E7=A0=81=E5=B7=B2=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=EF=BC=8C=E4=BD=BF=E7=94=A8=E8=B5=B7=E6=9D=A5=E6=9B=B4?=
 =?UTF-8?q?=E5=8A=A0=E7=AE=80=E4=BE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  2 +-
 .idea/modules.xml                             |  2 +-
 {downloadutil => Aria}/.gitignore             |  0
 {downloadutil => Aria}/build.gradle           |  2 +-
 {downloadutil => Aria}/jcenter.gradle         |  0
 {downloadutil => Aria}/proguard-rules.pro     |  0
 .../arialyy/downloadutil/ApplicationTest.java |  0
 .../src/main/AndroidManifest.xml              |  2 +-
 .../com/arialyy/aria}/core/AMReceiver.java    |  5 ++--
 .../java/com/arialyy/aria}/core/AMTarget.java | 23 +++++++++++-------
 .../java/com/arialyy/aria}/core/Aria.java     |  2 +-
 .../com/arialyy/aria}/core/AriaManager.java   | 18 ++++++++++----
 .../arialyy/aria}/core/DownloadEntity.java    |  6 ++---
 .../arialyy/aria}/core/DownloadManager.java   | 14 +++++------
 .../arialyy/aria}/core/command/AddCmd.java    |  6 ++---
 .../arialyy/aria}/core/command/CancelCmd.java |  7 +++---
 .../aria}/core/command/CmdFactory.java        |  6 ++---
 .../aria}/core/command/IDownloadCmd.java      | 12 +++++-----
 .../arialyy/aria}/core/command/SingleCmd.java |  7 +++---
 .../arialyy/aria}/core/command/StartCmd.java  |  7 +++---
 .../arialyy/aria}/core/command/StopCmd.java   |  7 +++---
 .../aria}/core/queue/DownloadTaskQueue.java   | 16 ++++++-------
 .../arialyy/aria}/core/queue/IDownloader.java |  4 ++--
 .../com/arialyy/aria}/core/queue/IPool.java   |  4 ++--
 .../arialyy/aria}/core/queue/ITaskQueue.java  |  8 +++----
 .../aria}/core/queue/pool/CachePool.java      |  8 +++----
 .../aria}/core/queue/pool/ExecutePool.java    |  8 +++----
 .../core/scheduler/DownloadSchedulers.java    | 12 +++++-----
 .../core/scheduler/IDownloadSchedulers.java   |  5 ++--
 .../core/scheduler/OnSchedulerListener.java   |  4 ++--
 .../aria}/core/task/DownloadListener.java     |  2 +-
 .../arialyy/aria}/core/task/DownloadUtil.java |  6 ++---
 .../aria}/core/task/IDownloadListener.java    |  2 +-
 .../aria}/core/task/IDownloadUtil.java        |  2 +-
 .../com/arialyy/aria}/core/task/Task.java     | 12 +++++-----
 .../arialyy/aria}/core/task/TaskFactory.java  |  6 ++---
 .../java/com/arialyy/aria}/orm/DbEntity.java  |  4 ++--
 .../java/com/arialyy/aria}/orm/DbUtil.java    |  4 ++--
 .../main/java/com/arialyy/aria}/orm/Id.java   |  2 +-
 .../java/com/arialyy/aria}/orm/Ignore.java    |  2 +-
 .../java/com/arialyy/aria}/orm/SqlHelper.java |  2 +-
 .../com/arialyy/aria}/util/CheckUtil.java     |  4 ++--
 .../com/arialyy/aria}/util/CommonUtil.java    |  8 +++----
 .../java/com/arialyy/aria}/util/PathUtil.java |  2 +-
 .../src/main/res/values/strings.xml           |  0
 app/build.gradle                              |  2 +-
 app/src/main/AndroidManifest.xml              |  5 ++--
 .../simple/activity/MultiTaskActivity.java    |  7 +++---
 .../simple/activity/SingleTaskActivity.java   | 13 +++++-----
 .../simple/adapter/DownloadAdapter.java       | 24 +++++--------------
 .../com/arialyy/simple/base/BaseActivity.java | 12 +++++++++-
 .../arialyy/simple/base/BaseApplication.java  |  2 +-
 .../arialyy/simple/module/DownloadModule.java |  6 ++---
 app/src/main/res/layout/activity_single.xml   |  1 -
 app/src/main/res/values-v21/styles.xml        | 20 ++++++++--------
 app/src/main/res/values/styles.xml            | 18 +++++++-------
 settings.gradle                               |  2 +-
 57 files changed, 190 insertions(+), 177 deletions(-)
 rename {downloadutil => Aria}/.gitignore (100%)
 rename {downloadutil => Aria}/build.gradle (95%)
 rename {downloadutil => Aria}/jcenter.gradle (100%)
 rename {downloadutil => Aria}/proguard-rules.pro (100%)
 rename {downloadutil => Aria}/src/androidTest/java/com/arialyy/downloadutil/ApplicationTest.java (100%)
 rename {downloadutil => Aria}/src/main/AndroidManifest.xml (84%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/AMReceiver.java (90%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/AMTarget.java (78%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/Aria.java (98%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/AriaManager.java (90%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/DownloadEntity.java (97%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/DownloadManager.java (91%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/command/AddCmd.java (88%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/command/CancelCmd.java (85%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/command/CmdFactory.java (97%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/command/IDownloadCmd.java (81%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/command/SingleCmd.java (77%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/command/StartCmd.java (85%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/command/StopCmd.java (87%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/queue/DownloadTaskQueue.java (91%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/queue/IDownloader.java (92%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/queue/IPool.java (94%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/queue/ITaskQueue.java (90%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/queue/pool/CachePool.java (94%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/queue/pool/ExecutePool.java (96%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/scheduler/DownloadSchedulers.java (94%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/scheduler/IDownloadSchedulers.java (92%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/scheduler/OnSchedulerListener.java (86%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/task/DownloadListener.java (96%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/task/DownloadUtil.java (99%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/task/IDownloadListener.java (97%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/task/IDownloadUtil.java (96%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/task/Task.java (96%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/core/task/TaskFactory.java (90%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/orm/DbEntity.java (97%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/orm/DbUtil.java (99%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/orm/Id.java (96%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/orm/Ignore.java (96%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/orm/SqlHelper.java (97%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/util/CheckUtil.java (95%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/util/CommonUtil.java (97%)
 rename {downloadutil/src/main/java/com/arialyy/downloadutil => Aria/src/main/java/com/arialyy/aria}/util/PathUtil.java (98%)
 rename {downloadutil => Aria}/src/main/res/values/strings.xml (100%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e12fe0b2..3889b503 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,8 +9,8 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/Aria" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/downloadutil" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8700295b..4708f7cb 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/Aria/Aria.iml" filepath="$PROJECT_DIR$/Aria/Aria.iml" />
       <module fileurl="file://$PROJECT_DIR$/DownloadPrj.iml" filepath="$PROJECT_DIR$/DownloadPrj.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/downloadutil/downloadutil.iml" filepath="$PROJECT_DIR$/downloadutil/downloadutil.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/downloadutil/.gitignore b/Aria/.gitignore
similarity index 100%
rename from downloadutil/.gitignore
rename to Aria/.gitignore
diff --git a/downloadutil/build.gradle b/Aria/build.gradle
similarity index 95%
rename from downloadutil/build.gradle
rename to Aria/build.gradle
index 5bbfce46..4ba96047 100644
--- a/downloadutil/build.gradle
+++ b/Aria/build.gradle
@@ -8,7 +8,7 @@ android {
     minSdkVersion 9
     targetSdkVersion 23
     versionCode 58
-    versionName "2.1.0"
+    versionName "2.3.0"
   }
   buildTypes {
     release {
diff --git a/downloadutil/jcenter.gradle b/Aria/jcenter.gradle
similarity index 100%
rename from downloadutil/jcenter.gradle
rename to Aria/jcenter.gradle
diff --git a/downloadutil/proguard-rules.pro b/Aria/proguard-rules.pro
similarity index 100%
rename from downloadutil/proguard-rules.pro
rename to Aria/proguard-rules.pro
diff --git a/downloadutil/src/androidTest/java/com/arialyy/downloadutil/ApplicationTest.java b/Aria/src/androidTest/java/com/arialyy/downloadutil/ApplicationTest.java
similarity index 100%
rename from downloadutil/src/androidTest/java/com/arialyy/downloadutil/ApplicationTest.java
rename to Aria/src/androidTest/java/com/arialyy/downloadutil/ApplicationTest.java
diff --git a/downloadutil/src/main/AndroidManifest.xml b/Aria/src/main/AndroidManifest.xml
similarity index 84%
rename from downloadutil/src/main/AndroidManifest.xml
rename to Aria/src/main/AndroidManifest.xml
index 7e405fd7..952e1869 100644
--- a/downloadutil/src/main/AndroidManifest.xml
+++ b/Aria/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.arialyy.downloadutil">
+    package="com.arialyy.aria">
 
   <application
       android:allowBackup="true"
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/AMReceiver.java b/Aria/src/main/java/com/arialyy/aria/core/AMReceiver.java
similarity index 90%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/AMReceiver.java
rename to Aria/src/main/java/com/arialyy/aria/core/AMReceiver.java
index 987d1521..8205242d 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/AMReceiver.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/AMReceiver.java
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.arialyy.downloadutil.core;
+package com.arialyy.aria.core;
 
-import android.content.Context;
-import com.arialyy.downloadutil.core.scheduler.OnSchedulerListener;
+import com.arialyy.aria.core.scheduler.OnSchedulerListener;
 
 /**
  * AM 接收器
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/AMTarget.java b/Aria/src/main/java/com/arialyy/aria/core/AMTarget.java
similarity index 78%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/AMTarget.java
rename to Aria/src/main/java/com/arialyy/aria/core/AMTarget.java
index ebd216e5..cc1da45d 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/AMTarget.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/AMTarget.java
@@ -1,11 +1,10 @@
-package com.arialyy.downloadutil.core;
-
-import android.content.Context;
-import com.arialyy.downloadutil.core.command.CmdFactory;
-import com.arialyy.downloadutil.core.command.IDownloadCmd;
-import com.arialyy.downloadutil.core.scheduler.OnSchedulerListener;
-import com.arialyy.downloadutil.core.task.Task;
-import com.arialyy.downloadutil.util.CommonUtil;
+package com.arialyy.aria.core;
+
+import com.arialyy.aria.core.command.CmdFactory;
+import com.arialyy.aria.core.scheduler.OnSchedulerListener;
+import com.arialyy.aria.core.command.IDownloadCmd;
+import com.arialyy.aria.core.task.Task;
+import com.arialyy.aria.util.CommonUtil;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -19,6 +18,14 @@ public class AMTarget {
     this.receiver = receiver;
   }
 
+  /**
+   * 添加任务
+   */
+  public void add() {
+    receiver.manager.setCmd(
+        CommonUtil.createCmd(receiver.obj, receiver.entity, CmdFactory.TASK_CREATE)).exe();
+  }
+
   /**
    * 开始下载
    */
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/Aria.java b/Aria/src/main/java/com/arialyy/aria/core/Aria.java
similarity index 98%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/Aria.java
rename to Aria/src/main/java/com/arialyy/aria/core/Aria.java
index b77e228f..e6557e1f 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/Aria.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/Aria.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.core;
+package com.arialyy.aria.core;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/AriaManager.java b/Aria/src/main/java/com/arialyy/aria/core/AriaManager.java
similarity index 90%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/AriaManager.java
rename to Aria/src/main/java/com/arialyy/aria/core/AriaManager.java
index fef5af9c..346b0ab1 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/AriaManager.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/AriaManager.java
@@ -1,4 +1,4 @@
-package com.arialyy.downloadutil.core;
+package com.arialyy.aria.core;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -7,9 +7,9 @@ import android.app.Service;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import com.arialyy.downloadutil.core.command.CmdFactory;
-import com.arialyy.downloadutil.core.command.IDownloadCmd;
-import com.arialyy.downloadutil.util.CommonUtil;
+import com.arialyy.aria.core.command.CmdFactory;
+import com.arialyy.aria.util.CommonUtil;
+import com.arialyy.aria.core.command.IDownloadCmd;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -45,6 +45,16 @@ import java.util.Set;
     return getTarget(obj);
   }
 
+  /**
+   * 设置同时下载的任务数
+   */
+  public void setDownloadNum(int num){
+    if (num <= 0){
+      throw new IllegalArgumentException("下载任务数不能小于1");
+    }
+    mManager.getTaskQueue().setDownloadNum(num);
+  }
+
   /**
    * 停止所有正在执行的任务
    */
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/DownloadEntity.java b/Aria/src/main/java/com/arialyy/aria/core/DownloadEntity.java
similarity index 97%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/DownloadEntity.java
rename to Aria/src/main/java/com/arialyy/aria/core/DownloadEntity.java
index 8874136d..32b040c6 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/DownloadEntity.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/DownloadEntity.java
@@ -15,12 +15,12 @@
  */
 
 
-package com.arialyy.downloadutil.core;
+package com.arialyy.aria.core;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import com.arialyy.downloadutil.orm.DbEntity;
-import com.arialyy.downloadutil.orm.Ignore;
+import com.arialyy.aria.orm.Ignore;
+import com.arialyy.aria.orm.DbEntity;
 
 /**
  * Created by lyy on 2015/12/25.
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/DownloadManager.java b/Aria/src/main/java/com/arialyy/aria/core/DownloadManager.java
similarity index 91%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/DownloadManager.java
rename to Aria/src/main/java/com/arialyy/aria/core/DownloadManager.java
index 66ecad45..f6eb2b9e 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/DownloadManager.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/DownloadManager.java
@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.core;
+package com.arialyy.aria.core;
 
-import android.app.Application;
 import android.content.Context;
-import android.util.Log;
-import com.arialyy.downloadutil.core.command.IDownloadCmd;
-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 com.arialyy.aria.core.queue.ITaskQueue;
+import com.arialyy.aria.orm.DbUtil;
+import com.arialyy.aria.core.command.IDownloadCmd;
+import com.arialyy.aria.core.queue.DownloadTaskQueue;
+import com.arialyy.aria.orm.DbEntity;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/AddCmd.java b/Aria/src/main/java/com/arialyy/aria/core/command/AddCmd.java
similarity index 88%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/command/AddCmd.java
rename to Aria/src/main/java/com/arialyy/aria/core/command/AddCmd.java
index e7885acc..e79b37db 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/AddCmd.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/AddCmd.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.core.command;
+package com.arialyy.aria.core.command;
 
 import android.util.Log;
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.core.task.Task;
 
 /**
  * Created by lyy on 2016/8/22.
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/CancelCmd.java b/Aria/src/main/java/com/arialyy/aria/core/command/CancelCmd.java
similarity index 85%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/command/CancelCmd.java
rename to Aria/src/main/java/com/arialyy/aria/core/command/CancelCmd.java
index dcee07ae..01af9af8 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/CancelCmd.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/CancelCmd.java
@@ -15,10 +15,10 @@
  */
 
 
-package com.arialyy.downloadutil.core.command;
+package com.arialyy.aria.core.command;
 
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.core.task.Task;
 
 /**
  * Created by lyy on 2016/9/20.
@@ -40,6 +40,7 @@ class CancelCmd extends IDownloadCmd {
       task = mQueue.createTask(mTarget, mEntity);
     }
     if (task != null) {
+      task.setmTargetName(mTarget.getClass().getName());
       mQueue.cancelTask(task);
     }
   }
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/CmdFactory.java b/Aria/src/main/java/com/arialyy/aria/core/command/CmdFactory.java
similarity index 97%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/command/CmdFactory.java
rename to Aria/src/main/java/com/arialyy/aria/core/command/CmdFactory.java
index bbcc713f..e8003efe 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/CmdFactory.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/CmdFactory.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.core.command;
+package com.arialyy.aria.core.command;
 
-import com.arialyy.downloadutil.core.DownloadEntity;
+import com.arialyy.aria.core.DownloadEntity;
 
 /**
  * Created by Lyy on 2016/9/23.
@@ -152,7 +152,7 @@ public class CmdFactory {
   private StartCmd createStartCmd(Object target, DownloadEntity entity) {
     return new StartCmd(target, entity);
   }
-  
+
   /**
    * 创建启动下载命令
    *
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/IDownloadCmd.java b/Aria/src/main/java/com/arialyy/aria/core/command/IDownloadCmd.java
similarity index 81%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/command/IDownloadCmd.java
rename to Aria/src/main/java/com/arialyy/aria/core/command/IDownloadCmd.java
index 431648ed..a61650ba 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/IDownloadCmd.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/IDownloadCmd.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.core.command;
+package com.arialyy.aria.core.command;
 
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.DownloadManager;
-import com.arialyy.downloadutil.core.queue.ITaskQueue;
-import com.arialyy.downloadutil.util.CheckUtil;
-import com.arialyy.downloadutil.util.CommonUtil;
+import com.arialyy.aria.core.DownloadManager;
+import com.arialyy.aria.core.queue.ITaskQueue;
+import com.arialyy.aria.util.CheckUtil;
+import com.arialyy.aria.util.CommonUtil;
+import com.arialyy.aria.core.DownloadEntity;
 
 /**
  * Created by lyy on 2016/8/22.
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/SingleCmd.java b/Aria/src/main/java/com/arialyy/aria/core/command/SingleCmd.java
similarity index 77%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/command/SingleCmd.java
rename to Aria/src/main/java/com/arialyy/aria/core/command/SingleCmd.java
index 6bbcd139..f8da683d 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/SingleCmd.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/SingleCmd.java
@@ -1,8 +1,8 @@
-package com.arialyy.downloadutil.core.command;
+package com.arialyy.aria.core.command;
 
 import android.util.Log;
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.core.task.Task;
 
 /**
  * Created by lyy on 2016/11/30.
@@ -27,6 +27,7 @@ class SingleCmd extends IDownloadCmd {
     } else {
       Log.w(TAG, "添加命令执行失败，【该任务已经存在】");
     }
+    task.setmTargetName(mTarget.getClass().getName());
     mQueue.startTask(task);
   }
 }
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/StartCmd.java b/Aria/src/main/java/com/arialyy/aria/core/command/StartCmd.java
similarity index 85%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/command/StartCmd.java
rename to Aria/src/main/java/com/arialyy/aria/core/command/StartCmd.java
index 7b4b5fb8..295089cf 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/StartCmd.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/StartCmd.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.core.command;
+package com.arialyy.aria.core.command;
 
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.core.task.Task;
 
 /**
  * Created by lyy on 2016/8/22.
@@ -39,6 +39,7 @@ class StartCmd extends IDownloadCmd {
       task = mQueue.createTask(mTarget, mEntity);
     }
     if (task != null) {
+      task.setmTargetName(mTarget.getClass().getName());
       mQueue.startTask(task);
     }
   }
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/StopCmd.java b/Aria/src/main/java/com/arialyy/aria/core/command/StopCmd.java
similarity index 87%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/command/StopCmd.java
rename to Aria/src/main/java/com/arialyy/aria/core/command/StopCmd.java
index 37c851e9..c696e5b6 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/command/StopCmd.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/StopCmd.java
@@ -15,11 +15,11 @@
  */
 
 
-package com.arialyy.downloadutil.core.command;
+package com.arialyy.aria.core.command;
 
 import android.util.Log;
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.core.task.Task;
 
 /**
  * Created by lyy on 2016/9/20.
@@ -48,6 +48,7 @@ class StopCmd extends IDownloadCmd {
         Log.w(TAG, "停止命令执行失败，【调度器中没有该任务】");
       }
     } else {
+      task.setmTargetName(mTarget.getClass().getName());
       mQueue.stopTask(task);
     }
   }
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/DownloadTaskQueue.java b/Aria/src/main/java/com/arialyy/aria/core/queue/DownloadTaskQueue.java
similarity index 91%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/DownloadTaskQueue.java
rename to Aria/src/main/java/com/arialyy/aria/core/queue/DownloadTaskQueue.java
index 29bd3d31..1e597934 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/DownloadTaskQueue.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/queue/DownloadTaskQueue.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.core.queue;
+package com.arialyy.aria.core.queue;
 
 import android.content.Context;
 import android.util.Log;
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.queue.pool.CachePool;
-import com.arialyy.downloadutil.core.queue.pool.ExecutePool;
-import com.arialyy.downloadutil.core.scheduler.DownloadSchedulers;
-import com.arialyy.downloadutil.core.scheduler.IDownloadSchedulers;
-import com.arialyy.downloadutil.core.task.Task;
-import com.arialyy.downloadutil.core.task.TaskFactory;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.core.queue.pool.CachePool;
+import com.arialyy.aria.core.queue.pool.ExecutePool;
+import com.arialyy.aria.core.scheduler.DownloadSchedulers;
+import com.arialyy.aria.core.scheduler.IDownloadSchedulers;
+import com.arialyy.aria.core.task.Task;
+import com.arialyy.aria.core.task.TaskFactory;
 
 /**
  * Created by lyy on 2016/8/17.
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/IDownloader.java b/Aria/src/main/java/com/arialyy/aria/core/queue/IDownloader.java
similarity index 92%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/IDownloader.java
rename to Aria/src/main/java/com/arialyy/aria/core/queue/IDownloader.java
index 6e121159..2534c69c 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/IDownloader.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/queue/IDownloader.java
@@ -15,9 +15,9 @@
  */
 
 
-package com.arialyy.downloadutil.core.queue;
+package com.arialyy.aria.core.queue;
 
-import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.aria.core.task.Task;
 
 /**
  * Created by lyy on 2016/8/16.
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/IPool.java b/Aria/src/main/java/com/arialyy/aria/core/queue/IPool.java
similarity index 94%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/IPool.java
rename to Aria/src/main/java/com/arialyy/aria/core/queue/IPool.java
index 3fa6eaaf..615c5146 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/IPool.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/queue/IPool.java
@@ -15,9 +15,9 @@
  */
 
 
-package com.arialyy.downloadutil.core.queue;
+package com.arialyy.aria.core.queue;
 
-import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.aria.core.task.Task;
 
 /**
  * Created by lyy on 2016/8/14.
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/ITaskQueue.java b/Aria/src/main/java/com/arialyy/aria/core/queue/ITaskQueue.java
similarity index 90%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/ITaskQueue.java
rename to Aria/src/main/java/com/arialyy/aria/core/queue/ITaskQueue.java
index d54f69af..f70059db 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/ITaskQueue.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/queue/ITaskQueue.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.core.queue;
+package com.arialyy.aria.core.queue;
 
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.scheduler.IDownloadSchedulers;
-import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.core.scheduler.IDownloadSchedulers;
+import com.arialyy.aria.core.task.Task;
 
 /**
  * Created by lyy on 2016/8/16.
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/pool/CachePool.java b/Aria/src/main/java/com/arialyy/aria/core/queue/pool/CachePool.java
similarity index 94%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/pool/CachePool.java
rename to Aria/src/main/java/com/arialyy/aria/core/queue/pool/CachePool.java
index d154141e..f2adb5e2 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/pool/CachePool.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/queue/pool/CachePool.java
@@ -15,13 +15,13 @@
  */
 
 
-package com.arialyy.downloadutil.core.queue.pool;
+package com.arialyy.aria.core.queue.pool;
 
 import android.text.TextUtils;
 import android.util.Log;
-import com.arialyy.downloadutil.core.task.Task;
-import com.arialyy.downloadutil.core.queue.IPool;
-import com.arialyy.downloadutil.util.CommonUtil;
+import com.arialyy.aria.core.queue.IPool;
+import com.arialyy.aria.util.CommonUtil;
+import com.arialyy.aria.core.task.Task;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.LinkedBlockingQueue;
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/pool/ExecutePool.java b/Aria/src/main/java/com/arialyy/aria/core/queue/pool/ExecutePool.java
similarity index 96%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/pool/ExecutePool.java
rename to Aria/src/main/java/com/arialyy/aria/core/queue/pool/ExecutePool.java
index a94825c2..054ffab8 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/queue/pool/ExecutePool.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/queue/pool/ExecutePool.java
@@ -15,13 +15,13 @@
  */
 
 
-package com.arialyy.downloadutil.core.queue.pool;
+package com.arialyy.aria.core.queue.pool;
 
 import android.text.TextUtils;
 import android.util.Log;
-import com.arialyy.downloadutil.core.queue.IPool;
-import com.arialyy.downloadutil.core.task.Task;
-import com.arialyy.downloadutil.util.CommonUtil;
+import com.arialyy.aria.util.CommonUtil;
+import com.arialyy.aria.core.queue.IPool;
+import com.arialyy.aria.core.task.Task;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ArrayBlockingQueue;
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/scheduler/DownloadSchedulers.java b/Aria/src/main/java/com/arialyy/aria/core/scheduler/DownloadSchedulers.java
similarity index 94%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/scheduler/DownloadSchedulers.java
rename to Aria/src/main/java/com/arialyy/aria/core/scheduler/DownloadSchedulers.java
index 657ff62c..397f2085 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/scheduler/DownloadSchedulers.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/scheduler/DownloadSchedulers.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.core.scheduler;
+package com.arialyy.aria.core.scheduler;
 
 import android.os.Message;
 import android.text.TextUtils;
 import android.util.Log;
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.queue.ITaskQueue;
-import com.arialyy.downloadutil.core.task.Task;
-import com.arialyy.downloadutil.core.queue.pool.ExecutePool;
-import com.arialyy.downloadutil.core.queue.DownloadTaskQueue;
+import com.arialyy.aria.core.queue.ITaskQueue;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.core.task.Task;
+import com.arialyy.aria.core.queue.pool.ExecutePool;
+import com.arialyy.aria.core.queue.DownloadTaskQueue;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/scheduler/IDownloadSchedulers.java b/Aria/src/main/java/com/arialyy/aria/core/scheduler/IDownloadSchedulers.java
similarity index 92%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/scheduler/IDownloadSchedulers.java
rename to Aria/src/main/java/com/arialyy/aria/core/scheduler/IDownloadSchedulers.java
index 2e823928..a6d3fcf5 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/scheduler/IDownloadSchedulers.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/scheduler/IDownloadSchedulers.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.core.scheduler;
+package com.arialyy.aria.core.scheduler;
 
-import android.content.Context;
 import android.os.Handler;
-import com.arialyy.downloadutil.core.DownloadEntity;
+import com.arialyy.aria.core.DownloadEntity;
 
 /**
  * Created by “AriaLyy@outlook.com” on 2016/11/2.
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/scheduler/OnSchedulerListener.java b/Aria/src/main/java/com/arialyy/aria/core/scheduler/OnSchedulerListener.java
similarity index 86%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/scheduler/OnSchedulerListener.java
rename to Aria/src/main/java/com/arialyy/aria/core/scheduler/OnSchedulerListener.java
index e05b0ad4..d36d5a3e 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/scheduler/OnSchedulerListener.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/scheduler/OnSchedulerListener.java
@@ -1,6 +1,6 @@
-package com.arialyy.downloadutil.core.scheduler;
+package com.arialyy.aria.core.scheduler;
 
-import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.aria.core.task.Task;
 
 /**
  * Target处理任务监听
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/task/DownloadListener.java b/Aria/src/main/java/com/arialyy/aria/core/task/DownloadListener.java
similarity index 96%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/task/DownloadListener.java
rename to Aria/src/main/java/com/arialyy/aria/core/task/DownloadListener.java
index b58d8246..ac1f96ff 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/task/DownloadListener.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/task/DownloadListener.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.arialyy.downloadutil.core.task;
+package com.arialyy.aria.core.task;
 
 class DownloadListener implements IDownloadListener {
 
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/task/DownloadUtil.java b/Aria/src/main/java/com/arialyy/aria/core/task/DownloadUtil.java
similarity index 99%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/task/DownloadUtil.java
rename to Aria/src/main/java/com/arialyy/aria/core/task/DownloadUtil.java
index e4667f92..c093cf9b 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/task/DownloadUtil.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/task/DownloadUtil.java
@@ -15,13 +15,13 @@
  */
 
 
-package com.arialyy.downloadutil.core.task;
+package com.arialyy.aria.core.task;
 
 import android.content.Context;
 import android.util.Log;
 import android.util.SparseArray;
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.util.CommonUtil;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.util.CommonUtil;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/task/IDownloadListener.java b/Aria/src/main/java/com/arialyy/aria/core/task/IDownloadListener.java
similarity index 97%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/task/IDownloadListener.java
rename to Aria/src/main/java/com/arialyy/aria/core/task/IDownloadListener.java
index c613cd0c..3b1704d8 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/task/IDownloadListener.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/task/IDownloadListener.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.arialyy.downloadutil.core.task;
+package com.arialyy.aria.core.task;
 
 /**
  * 下载监听
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/task/IDownloadUtil.java b/Aria/src/main/java/com/arialyy/aria/core/task/IDownloadUtil.java
similarity index 96%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/task/IDownloadUtil.java
rename to Aria/src/main/java/com/arialyy/aria/core/task/IDownloadUtil.java
index 60ab112f..83bb0f53 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/task/IDownloadUtil.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/task/IDownloadUtil.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.arialyy.downloadutil.core.task;
+package com.arialyy.aria.core.task;
 
 /**
  * Created by “AriaLyy@outlook.com” on 2016/10/31.
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/task/Task.java b/Aria/src/main/java/com/arialyy/aria/core/task/Task.java
similarity index 96%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/task/Task.java
rename to Aria/src/main/java/com/arialyy/aria/core/task/Task.java
index 8b51f567..0ce8c6ca 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/task/Task.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/task/Task.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.core.task;
+package com.arialyy.aria.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.DownloadEntity;
-import com.arialyy.downloadutil.core.DownloadManager;
-import com.arialyy.downloadutil.core.scheduler.IDownloadSchedulers;
-import com.arialyy.downloadutil.core.scheduler.DownloadSchedulers;
+import com.arialyy.aria.core.DownloadManager;
+import com.arialyy.aria.core.scheduler.DownloadSchedulers;
+import com.arialyy.aria.core.scheduler.IDownloadSchedulers;
+import com.arialyy.aria.core.DownloadEntity;
 
 /**
  * Created by lyy on 2016/8/11.
@@ -156,7 +156,7 @@ public class Task {
     }
   }
 
-  public static class Builder {
+  static class Builder {
     DownloadEntity downloadEntity;
     Handler        outHandler;
     Context        context;
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/core/task/TaskFactory.java b/Aria/src/main/java/com/arialyy/aria/core/task/TaskFactory.java
similarity index 90%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/core/task/TaskFactory.java
rename to Aria/src/main/java/com/arialyy/aria/core/task/TaskFactory.java
index 0138fdac..f057dee4 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/core/task/TaskFactory.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/task/TaskFactory.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.core.task;
+package com.arialyy.aria.core.task;
 
 import android.content.Context;
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.scheduler.IDownloadSchedulers;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.core.scheduler.IDownloadSchedulers;
 
 /**
  * Created by lyy on 2016/8/18.
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/orm/DbEntity.java b/Aria/src/main/java/com/arialyy/aria/orm/DbEntity.java
similarity index 97%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/orm/DbEntity.java
rename to Aria/src/main/java/com/arialyy/aria/orm/DbEntity.java
index 05167d9d..74047a7a 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/orm/DbEntity.java
+++ b/Aria/src/main/java/com/arialyy/aria/orm/DbEntity.java
@@ -15,10 +15,10 @@
  */
 
 
-package com.arialyy.downloadutil.orm;
+package com.arialyy.aria.orm;
 
 import android.support.annotation.NonNull;
-import com.arialyy.downloadutil.util.CommonUtil;
+import com.arialyy.aria.util.CommonUtil;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/orm/DbUtil.java b/Aria/src/main/java/com/arialyy/aria/orm/DbUtil.java
similarity index 99%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/orm/DbUtil.java
rename to Aria/src/main/java/com/arialyy/aria/orm/DbUtil.java
index abf1ac7b..d0053879 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/orm/DbUtil.java
+++ b/Aria/src/main/java/com/arialyy/aria/orm/DbUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.orm;
+package com.arialyy.aria.orm;
 
 import android.app.Application;
 import android.content.Context;
@@ -22,7 +22,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.support.annotation.NonNull;
 import android.util.Log;
-import com.arialyy.downloadutil.util.CommonUtil;
+import com.arialyy.aria.util.CommonUtil;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/orm/Id.java b/Aria/src/main/java/com/arialyy/aria/orm/Id.java
similarity index 96%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/orm/Id.java
rename to Aria/src/main/java/com/arialyy/aria/orm/Id.java
index 10cf8dec..70dfb70a 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/orm/Id.java
+++ b/Aria/src/main/java/com/arialyy/aria/orm/Id.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.arialyy.downloadutil.orm;
+package com.arialyy.aria.orm;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/orm/Ignore.java b/Aria/src/main/java/com/arialyy/aria/orm/Ignore.java
similarity index 96%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/orm/Ignore.java
rename to Aria/src/main/java/com/arialyy/aria/orm/Ignore.java
index b44d0632..8cd77d8a 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/orm/Ignore.java
+++ b/Aria/src/main/java/com/arialyy/aria/orm/Ignore.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.arialyy.downloadutil.orm;
+package com.arialyy.aria.orm;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/orm/SqlHelper.java b/Aria/src/main/java/com/arialyy/aria/orm/SqlHelper.java
similarity index 97%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/orm/SqlHelper.java
rename to Aria/src/main/java/com/arialyy/aria/orm/SqlHelper.java
index 4fd49949..f58b7961 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/orm/SqlHelper.java
+++ b/Aria/src/main/java/com/arialyy/aria/orm/SqlHelper.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.arialyy.downloadutil.orm;
+package com.arialyy.aria.orm;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/util/CheckUtil.java b/Aria/src/main/java/com/arialyy/aria/util/CheckUtil.java
similarity index 95%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/util/CheckUtil.java
rename to Aria/src/main/java/com/arialyy/aria/util/CheckUtil.java
index 85fb9795..2b07ec87 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/util/CheckUtil.java
+++ b/Aria/src/main/java/com/arialyy/aria/util/CheckUtil.java
@@ -15,11 +15,11 @@
  */
 
 
-package com.arialyy.downloadutil.util;
+package com.arialyy.aria.util;
 
 import android.text.TextUtils;
 import android.util.Log;
-import com.arialyy.downloadutil.core.DownloadEntity;
+import com.arialyy.aria.core.DownloadEntity;
 import java.io.File;
 
 /**
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/util/CommonUtil.java b/Aria/src/main/java/com/arialyy/aria/util/CommonUtil.java
similarity index 97%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/util/CommonUtil.java
rename to Aria/src/main/java/com/arialyy/aria/util/CommonUtil.java
index d8b2c18c..98f2df6e 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/util/CommonUtil.java
+++ b/Aria/src/main/java/com/arialyy/aria/util/CommonUtil.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.arialyy.downloadutil.util;
+package com.arialyy.aria.util;
 
 import android.util.Log;
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.command.CmdFactory;
-import com.arialyy.downloadutil.core.command.IDownloadCmd;
+import com.arialyy.aria.core.command.CmdFactory;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.core.command.IDownloadCmd;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
diff --git a/downloadutil/src/main/java/com/arialyy/downloadutil/util/PathUtil.java b/Aria/src/main/java/com/arialyy/aria/util/PathUtil.java
similarity index 98%
rename from downloadutil/src/main/java/com/arialyy/downloadutil/util/PathUtil.java
rename to Aria/src/main/java/com/arialyy/aria/util/PathUtil.java
index 911fe845..53e810d6 100644
--- a/downloadutil/src/main/java/com/arialyy/downloadutil/util/PathUtil.java
+++ b/Aria/src/main/java/com/arialyy/aria/util/PathUtil.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.arialyy.downloadutil.util;
+package com.arialyy.aria.util;
 
 import android.os.Environment;
 import java.security.MessageDigest;
diff --git a/downloadutil/src/main/res/values/strings.xml b/Aria/src/main/res/values/strings.xml
similarity index 100%
rename from downloadutil/src/main/res/values/strings.xml
rename to Aria/src/main/res/values/strings.xml
diff --git a/app/build.gradle b/app/build.gradle
index c04ac203..f8fe4165 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,5 +37,5 @@ dependencies {
   compile 'com.squareup.okhttp3:okhttp:3.2.0'
   compile 'com.arialyy.frame:MVVM2:2.2.0'
   compile 'com.arialyy.absadapter:AbsAdapter:1.1.2'
-  compile project(':downloadutil')
+  compile project(':Aria')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bad1ec85..5c882e2a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,12 +12,11 @@
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
       android:supportsRtl="true"
-      android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme.NoActionBar">
     <!--android:name=".activity.SingleTaskActivity"-->
     <activity
         android:name=".activity.MainActivity"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme.NoActionBar">
+        android:label="@string/app_name">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 
diff --git a/app/src/main/java/com/arialyy/simple/activity/MultiTaskActivity.java b/app/src/main/java/com/arialyy/simple/activity/MultiTaskActivity.java
index 4fb51665..98e57a11 100644
--- a/app/src/main/java/com/arialyy/simple/activity/MultiTaskActivity.java
+++ b/app/src/main/java/com/arialyy/simple/activity/MultiTaskActivity.java
@@ -23,9 +23,9 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import butterknife.Bind;
-import com.arialyy.downloadutil.core.AMTarget;
-import com.arialyy.downloadutil.core.Aria;
-import com.arialyy.downloadutil.core.task.Task;
+import com.arialyy.aria.core.AMTarget;
+import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.task.Task;
 import com.arialyy.frame.util.show.L;
 import com.arialyy.simple.R;
 import com.arialyy.simple.adapter.DownloadAdapter;
@@ -135,6 +135,7 @@ public class MultiTaskActivity extends BaseActivity<ActivityMultiBinding> {
     @Override public void onTaskStart(Task task) {
       super.onTaskStart(task);
       L.d(TAG, "download start");
+      mAdapter.updateState(task.getDownloadEntity());
     }
 
     @Override public void onTaskResume(Task task) {
diff --git a/app/src/main/java/com/arialyy/simple/activity/SingleTaskActivity.java b/app/src/main/java/com/arialyy/simple/activity/SingleTaskActivity.java
index a015f092..643335df 100644
--- a/app/src/main/java/com/arialyy/simple/activity/SingleTaskActivity.java
+++ b/app/src/main/java/com/arialyy/simple/activity/SingleTaskActivity.java
@@ -24,16 +24,15 @@ import android.os.Message;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 import butterknife.Bind;
-import com.arialyy.downloadutil.core.AMTarget;
-import com.arialyy.downloadutil.core.Aria;
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.task.Task;
-import com.arialyy.downloadutil.orm.DbEntity;
-import com.arialyy.downloadutil.util.CommonUtil;
+import com.arialyy.aria.core.AMTarget;
+import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.core.task.Task;
+import com.arialyy.aria.orm.DbEntity;
+import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.simple.R;
 import com.arialyy.simple.base.BaseActivity;
 import com.arialyy.simple.databinding.ActivitySingleBinding;
diff --git a/app/src/main/java/com/arialyy/simple/adapter/DownloadAdapter.java b/app/src/main/java/com/arialyy/simple/adapter/DownloadAdapter.java
index 46e5acec..ef15f824 100644
--- a/app/src/main/java/com/arialyy/simple/adapter/DownloadAdapter.java
+++ b/app/src/main/java/com/arialyy/simple/adapter/DownloadAdapter.java
@@ -25,16 +25,11 @@ import android.widget.TextView;
 import butterknife.Bind;
 import com.arialyy.absadapter.common.AbsHolder;
 import com.arialyy.absadapter.recycler_view.AbsRVAdapter;
-import com.arialyy.downloadutil.core.Aria;
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.DownloadManager;
-import com.arialyy.downloadutil.core.command.CmdFactory;
-import com.arialyy.downloadutil.core.command.IDownloadCmd;
-import com.arialyy.downloadutil.util.CommonUtil;
+import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.simple.R;
 import com.arialyy.simple.widget.HorizontalProgressBarWithNumber;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -46,22 +41,16 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class DownloadAdapter extends AbsRVAdapter<DownloadEntity, DownloadAdapter.MyHolder> {
   private static final String TAG = "DownloadAdapter";
-  private DownloadManager mManager;
-  private CmdFactory      mFactory;
   private Map<String, Integer> mPositions = new ConcurrentHashMap<>();
 
   public DownloadAdapter(Context context, List<DownloadEntity> data) {
     super(context, data);
-    mFactory = CmdFactory.getInstance();
-    mManager = DownloadManager.getInstance();
-    List<IDownloadCmd> addCmd = new ArrayList<>();
     int                i      = 0;
     for (DownloadEntity entity : data) {
       mPositions.put(entity.getDownloadUrl(), i);
-      addCmd.add(mFactory.createCmd(entity, CmdFactory.TASK_CREATE));
+      Aria.whit(getContext()).load(entity).add();
       i++;
     }
-    mManager.setCmds(addCmd).exe();
   }
 
   @Override protected MyHolder getViewHolder(View convertView, int viewType) {
@@ -152,14 +141,13 @@ public class DownloadAdapter extends AbsRVAdapter<DownloadEntity, DownloadAdapte
       @Override public void onClick(View v) {
         mData.remove(item);
         notifyDataSetChanged();
-        IDownloadCmd cancelCmd = mFactory.createCmd(item, CmdFactory.TASK_CANCEL);
-        mManager.setCmd(cancelCmd).exe();
+        Aria.whit(getContext()).load(item).cancel();
       }
     });
   }
 
   public void setDownloadNum(int num) {
-    mManager.getTaskQueue().setDownloadNum(num);
+    Aria.get(getContext()).setDownloadNum(num);
   }
 
   private String covertCurrentSize(long currentSize) {
diff --git a/app/src/main/java/com/arialyy/simple/base/BaseActivity.java b/app/src/main/java/com/arialyy/simple/base/BaseActivity.java
index 4b66707d..57529a07 100644
--- a/app/src/main/java/com/arialyy/simple/base/BaseActivity.java
+++ b/app/src/main/java/com/arialyy/simple/base/BaseActivity.java
@@ -14,17 +14,27 @@
  * limitations under the License.
  */
 
-
 package com.arialyy.simple.base;
 
 import android.databinding.ViewDataBinding;
 import android.os.Bundle;
+import android.os.PersistableBundle;
 import com.arialyy.frame.core.AbsActivity;
+import com.arialyy.frame.util.AndroidVersionUtil;
+import com.arialyy.simple.R;
 
 /**
  * Created by Lyy on 2016/9/27.
  */
 public abstract class BaseActivity<VB extends ViewDataBinding> extends AbsActivity<VB> {
+
+  @Override protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    if (AndroidVersionUtil.hasLollipop()) {
+      getWindow().setStatusBarColor(getResources().getColor(R.color.colorPrimaryDark));
+    }
+  }
+
   @Override protected void dataCallback(int result, Object data) {
 
   }
diff --git a/app/src/main/java/com/arialyy/simple/base/BaseApplication.java b/app/src/main/java/com/arialyy/simple/base/BaseApplication.java
index 4710265d..1b97cde5 100644
--- a/app/src/main/java/com/arialyy/simple/base/BaseApplication.java
+++ b/app/src/main/java/com/arialyy/simple/base/BaseApplication.java
@@ -18,7 +18,7 @@
 package com.arialyy.simple.base;
 
 import android.app.Application;
-import com.arialyy.downloadutil.core.DownloadManager;
+import com.arialyy.aria.core.DownloadManager;
 import com.arialyy.frame.core.AbsFrame;
 
 /**
diff --git a/app/src/main/java/com/arialyy/simple/module/DownloadModule.java b/app/src/main/java/com/arialyy/simple/module/DownloadModule.java
index 559dac04..48fffd6b 100644
--- a/app/src/main/java/com/arialyy/simple/module/DownloadModule.java
+++ b/app/src/main/java/com/arialyy/simple/module/DownloadModule.java
@@ -22,9 +22,9 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Environment;
 import android.os.Handler;
-import com.arialyy.downloadutil.core.DownloadEntity;
-import com.arialyy.downloadutil.core.DownloadManager;
-import com.arialyy.downloadutil.util.CommonUtil;
+import com.arialyy.aria.core.DownloadEntity;
+import com.arialyy.aria.core.DownloadManager;
+import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.frame.util.AndroidUtils;
 import com.arialyy.frame.util.StringUtil;
 import com.arialyy.frame.util.show.L;
diff --git a/app/src/main/res/layout/activity_single.xml b/app/src/main/res/layout/activity_single.xml
index 3c74a58e..851b49dc 100644
--- a/app/src/main/res/layout/activity_single.xml
+++ b/app/src/main/res/layout/activity_single.xml
@@ -12,7 +12,6 @@
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay"
         >
 
       <include layout="@layout/layout_bar"/>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index ecada24b..0d719a06 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,16 +1,16 @@
 <resources>
 
-  <style name="AppTheme.NoActionBar">
-    <item name="windowActionBar">false</item>
-    <item name="windowNoTitle">true</item>
-    <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-    <item name="android:statusBarColor">@android:color/transparent</item>
-    <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-    <item name="colorAccent">@color/colorAccent</item>
-  </style>
+  <!--<style name="AppTheme.NoActionBar">-->
+    <!--<item name="windowActionBar">false</item>-->
+    <!--<item name="windowNoTitle">true</item>-->
+    <!--<item name="android:windowDrawsSystemBarBackgrounds">true</item>-->
+    <!--<item name="android:statusBarColor">@android:color/transparent</item>-->
+    <!--<item name="colorPrimary">@color/colorPrimary</item>-->
+    <!--<item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
+    <!--<item name="colorAccent">@color/colorAccent</item>-->
+  <!--</style>-->
 
-  <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+  <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
     <!-- Customize your theme here. -->
     <item name="colorPrimary">@color/colorPrimary</item>
     <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 752d63ba..75816b21 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,16 +1,16 @@
 <resources>
 
   <!-- Base application theme. -->
-  <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-    <!-- Customize your theme here. -->
-    <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-    <item name="colorAccent">@color/colorAccent</item>
-    <item name="windowActionBar">false</item>
-    <item name="windowNoTitle">true</item>
-  </style>
+  <!--<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">-->
+    <!--&lt;!&ndash; Customize your theme here. &ndash;&gt;-->
+    <!--<item name="colorPrimary">@color/colorPrimary</item>-->
+    <!--<item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
+    <!--<item name="colorAccent">@color/colorAccent</item>-->
+    <!--<item name="windowActionBar">false</item>-->
+    <!--<item name="windowNoTitle">true</item>-->
+  <!--</style>-->
 
-  <style name="AppTheme.NoActionBar">
+  <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
     <item name="windowActionBar">false</item>
     <item name="windowNoTitle">true</item>
     <item name="colorPrimary">@color/colorPrimary</item>
diff --git a/settings.gradle b/settings.gradle
index 460b17ab..7fa85466 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':downloadutil'
+include ':app', ':Aria'