组件化功能基本完成

2019-09-29 20:07:21 +08:00
parent 7ee1347ab4
commit 2a92321785
337 changed files with 5186 additions and 3250 deletions
--- a/app/src/main/assets/help_code/FtpUpload.java
+++ b/app/src/main/assets/help_code/FtpUpload.java
@@ -23,7 +23,7 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.common.ftp.FtpInterceptHandler;
 import com.arialyy.aria.core.common.ftp.IFtpUploadInterceptor;
 import com.arialyy.aria.core.upload.UploadEntity;
-import com.arialyy.aria.core.upload.UploadTask;
+import com.arialyy.aria.core.task.UploadTask;
 import com.arialyy.frame.util.FileUtil;
 import com.arialyy.frame.util.show.T;
 import com.arialyy.simple.R;
--- a/app/src/main/assets/help_code/KotlinHttpDownload.kt
+++ b/app/src/main/assets/help_code/KotlinHttpDownload.kt
@@ -22,8 +22,8 @@ import android.widget.Toast
 import com.arialyy.annotations.Download
 import com.arialyy.aria.core.Aria
 import com.arialyy.aria.core.download.target.HttpNormalTarget
-import com.arialyy.aria.core.download.DownloadTask
-import com.arialyy.aria.core.inf.IEntity
+import com.arialyy.aria.core.task.DownloadTask
+import com.arialyy.aria.inf.IEntity
 import com.arialyy.simple.R
 import com.arialyy.simple.base.BaseActivity
 import com.arialyy.simple.databinding.ActivitySingleBinding
@@ -59,7 +59,7 @@ class KotlinDownloadActivity : BaseActivity<ActivitySingleBinding>() {
    target = Aria.download(this)
        .load(DOWNLOAD_URL)
    binding.progress = target.percent
-    if (target.taskState == IEntity.STATE_STOP) {
+    if (target.taskState == com.arialyy.aria.inf.IEntity.STATE_STOP) {
      mStart.text = "恢复"
    } else if (target.isRunning) {
      mStart.text = "停止"
@@ -71,7 +71,7 @@ class KotlinDownloadActivity : BaseActivity<ActivitySingleBinding>() {
   * 注解方法不能添加internal修饰符，否则会出现e: [kapt] An exception occurred: java.lang.IllegalArgumentException: peerIndex 1 for '$a' not in range (received 0 arguments)错误
   */
  @Download.onTaskRunning
-  fun running(task: DownloadTask) {
+  fun running(task: com.arialyy.aria.core.task.DownloadTask) {
    Log.d(TAG, task.percent.toString())
    val len = task.fileSize
    if (len == 0L) {
@@ -83,40 +83,40 @@ class KotlinDownloadActivity : BaseActivity<ActivitySingleBinding>() {
  }

  @Download.onWait
-  fun onWait(task: DownloadTask) {
+  fun onWait(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == DOWNLOAD_URL) {
      Log.d(TAG, "wait ==> " + task.downloadEntity.fileName)
    }
  }

  @Download.onPre
-  fun onPre(task: DownloadTask) {
+  fun onPre(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == DOWNLOAD_URL) {
      mStart.text = "停止"
    }
  }

  @Download.onTaskStart
-  fun taskStart(task: DownloadTask) {
+  fun taskStart(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == DOWNLOAD_URL) {
      binding.fileSize = task.convertFileSize
    }
  }

  @Download.onTaskComplete
-  fun complete(task: DownloadTask) {
+  fun complete(task: com.arialyy.aria.core.task.DownloadTask) {
    Log.d(TAG, "完成")
  }

  @Download.onTaskResume
-  fun taskResume(task: DownloadTask) {
+  fun taskResume(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == DOWNLOAD_URL) {
      mStart.text = "停止"
    }
  }

  @Download.onTaskStop
-  fun taskStop(task: DownloadTask) {
+  fun taskStop(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == DOWNLOAD_URL) {
      mStart.text = "恢复"
      binding.speed = ""
@@ -124,7 +124,7 @@ class KotlinDownloadActivity : BaseActivity<ActivitySingleBinding>() {
  }

  @Download.onTaskCancel
-  fun taskCancel(task: DownloadTask) {
+  fun taskCancel(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == DOWNLOAD_URL) {
      binding.progress = 0
      Toast.makeText(this@KotlinDownloadActivity, "取消下载", Toast.LENGTH_SHORT)
@@ -136,7 +136,7 @@ class KotlinDownloadActivity : BaseActivity<ActivitySingleBinding>() {
  }

  @Download.onTaskFail
-  fun taskFail(task: DownloadTask) {
+  fun taskFail(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == DOWNLOAD_URL) {
      Toast.makeText(this@KotlinDownloadActivity, "下载失败", Toast.LENGTH_SHORT)
          .show()
--- a/app/src/main/java/com/arialyy/simple/DbTestActivity.java
+++ b/app/src/main/java/com/arialyy/simple/DbTestActivity.java
@@ -1,12 +1,11 @@
 package com.arialyy.simple;

 import android.os.Bundle;
-
 import android.util.Log;
 import android.view.View;
+import com.arialyy.aria.core.common.AbsEntity;
 import com.arialyy.aria.core.download.DTaskWrapper;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.inf.AbsEntity;
 import com.arialyy.aria.orm.DbEntity;
 import com.arialyy.simple.base.BaseActivity;
 import com.arialyy.simple.databinding.ActivityDbTestBinding;
@@ -38,7 +37,7 @@ public class DbTestActivity extends BaseActivity<ActivityDbTestBinding> {
    }
  }

-  private void searchAll(){
+  private void searchAll() {
    long startT = System.currentTimeMillis();
    //List<DTaskWrapper> data = DownloadEntity.findRelationData(DownloadEntity.class);

--- a/app/src/main/java/com/arialyy/simple/core/download/DownloadDialog.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/DownloadDialog.java
@@ -24,7 +24,7 @@ import android.widget.TextView;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.download.DownloadTask;
+import com.arialyy.aria.core.task.DownloadTask;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.frame.core.AbsDialog;
 import com.arialyy.simple.R;
--- a/app/src/main/java/com/arialyy/simple/core/download/DownloadDialogFragment.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/DownloadDialogFragment.java
@@ -8,8 +8,8 @@ import android.widget.Toast;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.inf.IEntity;
+import com.arialyy.aria.core.task.DownloadTask;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.simple.R;
 import com.arialyy.simple.base.BaseDialog;
--- a/app/src/main/java/com/arialyy/simple/core/download/DownloadPopupWindow.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/DownloadPopupWindow.java
@@ -26,8 +26,8 @@ import android.widget.TextView;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.inf.IEntity;
+import com.arialyy.aria.core.task.DownloadTask;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.frame.core.AbsPopupWindow;
 import com.arialyy.simple.R;
--- a/app/src/main/java/com/arialyy/simple/core/download/FtpDownloadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/FtpDownloadActivity.java
@@ -23,11 +23,11 @@ import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
-import com.arialyy.aria.core.common.ProtocolType;
+import com.arialyy.aria.core.ProtocolType;
 import com.arialyy.aria.core.common.controller.ControllerType;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.inf.IEntity;
+import com.arialyy.aria.core.task.DownloadTask;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.frame.util.show.L;
 import com.arialyy.frame.util.show.T;
--- a/app/src/main/java/com/arialyy/simple/core/download/HighestPriorityActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/HighestPriorityActivity.java
@@ -25,10 +25,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.common.AbsEntity;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.download.DownloadTask;
-import com.arialyy.aria.core.inf.AbsEntity;
 import com.arialyy.aria.core.inf.IEntity;
+import com.arialyy.aria.core.task.DownloadTask;
 import com.arialyy.frame.util.show.L;
 import com.arialyy.simple.R;
 import com.arialyy.simple.base.BaseActivity;
--- a/app/src/main/java/com/arialyy/simple/core/download/HttpDownloadModule.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/HttpDownloadModule.java
@@ -33,7 +33,7 @@ public class HttpDownloadModule extends BaseViewModule {
  private final String HTTP_PATH_KEY = "HTTP_PATH_KEY";

  private final String defUrl =
-      "http://hzdown.muzhiwan.com/2017/05/08/nl.noio.kingdom_59104935e56f0.apk1";
+      "http://hzdown.muzhiwan.com/2017/05/08/nl.noio.kingdom_59104935e56f0.apk";
  //"http://9.9.9.205:5000/download/Cyberduck-6.9.4.30164.zip";
  //"http://202.98.201.103:7000/vrs/TPK/ZTC440402001Z.tpk";
  private final String defFilePath =
--- a/app/src/main/java/com/arialyy/simple/core/download/KotlinDownloadActivity.kt
+++ b/app/src/main/java/com/arialyy/simple/core/download/KotlinDownloadActivity.kt
@@ -30,9 +30,8 @@ import androidx.lifecycle.ViewModelProviders
 import com.arialyy.annotations.Download
 import com.arialyy.aria.core.Aria
 import com.arialyy.aria.core.download.DownloadEntity
-import com.arialyy.aria.core.download.DownloadTask
 import com.arialyy.aria.core.inf.IEntity
-import com.arialyy.aria.core.scheduler.ISchedulers
+import com.arialyy.aria.core.listener.ISchedulers
 import com.arialyy.aria.util.ALog
 import com.arialyy.aria.util.CommonUtil
 import com.arialyy.frame.util.show.T
@@ -59,10 +58,22 @@ class KotlinDownloadActivity : BaseActivity<ActivitySingleKotlinBinding>() {
      intent: Intent
    ) {
      if (intent.action == ISchedulers.ARIA_TASK_INFO_ACTION) {
-        ALog.d(TAG, "state = " + intent.getIntExtra(ISchedulers.TASK_STATE, -1))
-        ALog.d(TAG, "type = " + intent.getIntExtra(ISchedulers.TASK_TYPE, -1))
-        ALog.d(TAG, "speed = " + intent.getLongExtra(ISchedulers.TASK_SPEED, -1))
-        ALog.d(TAG, "percent = " + intent.getIntExtra(ISchedulers.TASK_PERCENT, -1))
+        ALog.d(
+            TAG,
+            "state = " + intent.getIntExtra(ISchedulers.TASK_STATE, -1)
+        )
+        ALog.d(
+            TAG, "type = " + intent.getIntExtra(ISchedulers.TASK_TYPE, -1)
+        )
+        ALog.d(
+            TAG,
+            "speed = " + intent.getLongExtra(ISchedulers.TASK_SPEED, -1)
+        )
+        ALog.d(
+            TAG, "percent = " + intent.getIntExtra(
+            ISchedulers.TASK_PERCENT, -1
+        )
+        )
        ALog.d(
            TAG, "entity = " + intent.getParcelableExtra<DownloadEntity>(
            ISchedulers.TASK_ENTITY
@@ -167,28 +178,28 @@ class KotlinDownloadActivity : BaseActivity<ActivitySingleKotlinBinding>() {
  }

  @Download.onWait
-  fun onWait(task: DownloadTask) {
+  fun onWait(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == mUrl) {
      Log.d(TAG, "wait ==> " + task.downloadEntity.fileName)
    }
  }

  @Download.onPre
-  fun onPre(task: DownloadTask) {
+  fun onPre(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == mUrl) {
      binding.stateStr = getString(R.string.stop)
    }
  }

  @Download.onTaskStart
-  fun taskStart(task: DownloadTask) {
+  fun taskStart(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == mUrl) {
      binding.fileSize = task.convertFileSize
    }
  }

  @Download.onTaskRunning
-  fun running(task: DownloadTask) {
+  fun running(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == mUrl) {
      //Log.d(TAG, task.getKey());
      val len = task.fileSize
@@ -202,14 +213,14 @@ class KotlinDownloadActivity : BaseActivity<ActivitySingleKotlinBinding>() {
  }

  @Download.onTaskResume
-  fun taskResume(task: DownloadTask) {
+  fun taskResume(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == mUrl) {
      binding.stateStr = getString(R.string.stop)
    }
  }

  @Download.onTaskStop
-  fun taskStop(task: DownloadTask) {
+  fun taskStop(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == mUrl) {
      binding.stateStr = getString(R.string.resume)
      binding.speed = ""
@@ -217,7 +228,7 @@ class KotlinDownloadActivity : BaseActivity<ActivitySingleKotlinBinding>() {
  }

  @Download.onTaskCancel
-  fun taskCancel(task: DownloadTask) {
+  fun taskCancel(task: com.arialyy.aria.core.task.DownloadTask) {
    if (task.key == mUrl) {
      binding.progress = 0
      binding.stateStr = getString(R.string.start)
@@ -231,7 +242,7 @@ class KotlinDownloadActivity : BaseActivity<ActivitySingleKotlinBinding>() {
   */
  @Download.onTaskFail
  fun taskFail(
-    task: DownloadTask,
+    task: com.arialyy.aria.core.task.DownloadTask,
    e: Exception
  ) {
    if (task.key == mUrl) {
@@ -242,7 +253,7 @@ class KotlinDownloadActivity : BaseActivity<ActivitySingleKotlinBinding>() {
  }

  @Download.onTaskComplete
-  fun taskComplete(task: DownloadTask) {
+  fun taskComplete(task: com.arialyy.aria.core.task.DownloadTask) {

    if (task.key == mUrl) {
      binding.progress = 100
--- a/app/src/main/java/com/arialyy/simple/core/download/SimpleNotification.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/SimpleNotification.java
@@ -22,7 +22,7 @@
 //import android.support.v4.app.NotificationCompat;
 //import com.arialyy.annotations.Download;
 //import com.arialyy.aria.core.Aria;
-//import com.arialyy.aria.core.download.DownloadTask;
+//import com.arialyy.aria.core.task.DownloadTask;
 //import com.arialyy.simple.R;
 //
 ///**
--- a/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java
@@ -31,12 +31,12 @@ import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.processor.IHttpFileLenAdapter;
 import com.arialyy.aria.core.common.controller.ControllerType;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.inf.IEntity;
-import com.arialyy.aria.core.inf.IHttpFileLenAdapter;
-import com.arialyy.aria.core.scheduler.ISchedulers;
+import com.arialyy.aria.core.listener.ISchedulers;
+import com.arialyy.aria.core.task.DownloadTask;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.frame.util.show.T;
--- a/app/src/main/java/com/arialyy/simple/core/download/fragment/DownloadFragment.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/fragment/DownloadFragment.java
@@ -23,8 +23,8 @@ import android.widget.Button;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.inf.IEntity;
+import com.arialyy.aria.core.task.DownloadTask;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.frame.core.AbsFragment;
 import com.arialyy.simple.R;
--- a/app/src/main/java/com/arialyy/simple/core/download/group/ChildHandleDialog.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/group/ChildHandleDialog.java
@@ -27,7 +27,7 @@ import android.widget.TextView;
 import com.arialyy.annotations.DownloadGroup;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.download.DownloadGroupTask;
+import com.arialyy.aria.core.task.DownloadGroupTask;
 import com.arialyy.frame.util.show.L;
 import com.arialyy.simple.R;
 import com.arialyy.simple.base.BaseDialog;
--- a/app/src/main/java/com/arialyy/simple/core/download/group/DownloadGroupActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/group/DownloadGroupActivity.java
@@ -21,11 +21,11 @@ import android.util.Log;
 import android.view.View;
 import com.arialyy.annotations.DownloadGroup;
 import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.processor.IHttpFileLenAdapter;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.download.DownloadGroupEntity;
-import com.arialyy.aria.core.download.DownloadGroupTask;
 import com.arialyy.aria.core.inf.IEntity;
-import com.arialyy.aria.core.inf.IHttpFileLenAdapter;
+import com.arialyy.aria.core.task.DownloadGroupTask;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.frame.util.show.L;
 import com.arialyy.frame.util.show.T;
--- a/app/src/main/java/com/arialyy/simple/core/download/group/FTPDirDownloadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/group/FTPDirDownloadActivity.java
@@ -22,8 +22,8 @@ import com.arialyy.annotations.DownloadGroup;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.common.controller.ControllerType;
 import com.arialyy.aria.core.download.DownloadGroupEntity;
-import com.arialyy.aria.core.download.DownloadGroupTask;
 import com.arialyy.aria.core.inf.IEntity;
+import com.arialyy.aria.core.task.DownloadGroupTask;
 import com.arialyy.frame.util.show.L;
 import com.arialyy.frame.util.show.T;
 import com.arialyy.simple.R;
--- a/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8LiveDLoadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8LiveDLoadActivity.java
@@ -29,8 +29,8 @@ import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.common.controller.ControllerType;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.download.DownloadTask;
-import com.arialyy.aria.core.download.m3u8.ILiveTsUrlConverter;
+import com.arialyy.aria.core.processor.ILiveTsUrlConverter;
+import com.arialyy.aria.core.task.DownloadTask;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.frame.util.show.T;
@@ -200,7 +200,7 @@ public class M3U8LiveDLoadActivity extends BaseActivity<ActivityM3u8LiveBinding>
          Toast.LENGTH_SHORT).show();
      getBinding().setStateStr(getString(R.string.re_start));
      getBinding().setSpeed("");
-      ALog.d(TAG, "md5: " + CommonUtil.getFileMD5(new File(task.getDownloadPath())));
+      ALog.d(TAG, "md5: " + CommonUtil.getFileMD5(new File(task.getFilePath())));
    }
  }

--- a/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8VodDLoadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8VodDLoadActivity.java
@@ -33,11 +33,11 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.common.controller.BuilderController;
 import com.arialyy.aria.core.common.controller.ControllerType;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.download.DownloadTask;
-import com.arialyy.aria.core.download.m3u8.ITsMergeHandler;
-import com.arialyy.aria.core.download.m3u8.IVodTsUrlConverter;
-import com.arialyy.aria.core.download.m3u8.M3U8Entity;
+import com.arialyy.aria.core.download.M3U8Entity;
 import com.arialyy.aria.core.inf.IEntity;
+import com.arialyy.aria.core.processor.ITsMergeHandler;
+import com.arialyy.aria.core.processor.IVodTsUrlConverter;
+import com.arialyy.aria.core.task.DownloadTask;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.frame.util.show.T;
@@ -259,7 +259,7 @@ public class M3U8VodDLoadActivity extends BaseActivity<ActivityM3u8VodBinding> {
          Toast.LENGTH_SHORT).show();
      getBinding().setStateStr(getString(R.string.re_start));
      getBinding().setSpeed("");
-      ALog.d(TAG, "md5: " + CommonUtil.getFileMD5(new File(task.getDownloadPath())));
+      ALog.d(TAG, "md5: " + CommonUtil.getFileMD5(new File(task.getFilePath())));
    }
  }

@@ -350,6 +350,16 @@ public class M3U8VodDLoadActivity extends BaseActivity<ActivityM3u8VodBinding> {
        .generateIndexFile()
        .controller(ControllerType.CREATE_CONTROLLER)
        .create();
+
+    Aria.download(M3U8VodDLoadActivity.this)
+        .load(mUrl)
+        .useServerFileName(true)
+        .setFilePath(mFilePath, true)
+        .asM3U8().setTsUrlConvert(new IVodTsUrlConverter() {
+      @Override public List<String> convert(String m3u8Url, List<String> tsUrls) {
+        return null;
+      }
+    });
  }

  private Class<BuilderController> c = BuilderController.class;
--- a/app/src/main/java/com/arialyy/simple/core/download/m3u8/VideoPlayerFragment.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/m3u8/VideoPlayerFragment.java
@@ -13,7 +13,7 @@ import android.widget.SeekBar;
 import androidx.annotation.RequiresApi;
 import androidx.lifecycle.ViewModelProviders;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.download.m3u8.M3U8Entity;
+import com.arialyy.aria.core.download.M3U8Entity;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.frame.base.BaseFragment;
 import com.arialyy.simple.R;
--- a/app/src/main/java/com/arialyy/simple/core/download/mutil/DownloadAdapter.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/mutil/DownloadAdapter.java
@@ -24,11 +24,11 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.common.AbsEntity;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.download.DownloadGroupEntity;
-import com.arialyy.aria.core.inf.AbsEntity;
-import com.arialyy.aria.core.inf.AbsTaskWrapper;
 import com.arialyy.aria.core.inf.IEntity;
+import com.arialyy.aria.core.wrapper.AbsTaskWrapper;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.simple.R;
 import com.arialyy.simple.base.adapter.AbsHolder;
--- a/app/src/main/java/com/arialyy/simple/core/download/mutil/MultiDownloadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/mutil/MultiDownloadActivity.java
@@ -25,9 +25,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.arialyy.annotations.Download;
 import com.arialyy.annotations.DownloadGroup;
 import com.arialyy.aria.core.Aria;
-import com.arialyy.aria.core.download.DownloadGroupTask;
-import com.arialyy.aria.core.download.DownloadTask;
-import com.arialyy.aria.core.inf.AbsEntity;
+import com.arialyy.aria.core.common.AbsEntity;
+import com.arialyy.aria.core.task.DownloadGroupTask;
+import com.arialyy.aria.core.task.DownloadTask;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.simple.R;
 import com.arialyy.simple.base.BaseActivity;
@@ -54,7 +54,7 @@ public class MultiDownloadActivity extends BaseActivity<ActivityMultiDownloadBin
    List<AbsEntity> temps = Aria.download(this).getTotalTaskList();
    if (temps != null && !temps.isEmpty()) {

-      for (AbsEntity temp : temps){
+      for (AbsEntity temp : temps) {
        ALog.d(TAG, "state = " + temp.getState());
      }
      mData.addAll(temps);
--- a/app/src/main/java/com/arialyy/simple/core/download/mutil/MultiTaskActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/mutil/MultiTaskActivity.java
@@ -26,8 +26,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.arialyy.annotations.Download;
 import com.arialyy.annotations.DownloadGroup;
 import com.arialyy.aria.core.Aria;
-import com.arialyy.aria.core.download.DownloadGroupTask;
-import com.arialyy.aria.core.download.DownloadTask;
+import com.arialyy.aria.core.task.DownloadGroupTask;
+import com.arialyy.aria.core.task.DownloadTask;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.frame.util.FileUtil;
 import com.arialyy.simple.R;
@@ -105,7 +105,7 @@ public class MultiTaskActivity extends BaseActivity<ActivityMultiBinding> {
  }

  @Download.onTaskComplete void taskComplete(DownloadTask task) {
-    Log.d(TAG, FileUtil.getFileMD5(new File(task.getDownloadPath())));
+    Log.d(TAG, FileUtil.getFileMD5(new File(task.getFilePath())));
  }

  //############################### 任务组 ##############################
--- a/app/src/main/java/com/arialyy/simple/core/download/service/DownloadService.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/service/DownloadService.java
@@ -22,7 +22,7 @@ import android.os.IBinder;
 import androidx.annotation.Nullable;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
-import com.arialyy.aria.core.download.DownloadTask;
+import com.arialyy.aria.core.task.DownloadTask;
 import com.arialyy.frame.util.show.T;

 /**
--- a/app/src/main/java/com/arialyy/simple/core/test/AnyRunActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/test/AnyRunActivity.java
@@ -1,7 +1,6 @@
 package com.arialyy.simple.core.test;

 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DTaskWrapper;
--- a/app/src/main/java/com/arialyy/simple/core/upload/FtpUploadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/upload/FtpUploadActivity.java
@@ -25,12 +25,12 @@ import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 import com.arialyy.annotations.Upload;
 import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.processor.FtpInterceptHandler;
+import com.arialyy.aria.core.processor.IFtpUploadInterceptor;
 import com.arialyy.aria.core.common.controller.ControllerType;
-import com.arialyy.aria.core.common.ftp.FtpInterceptHandler;
-import com.arialyy.aria.core.common.ftp.IFtpUploadInterceptor;
 import com.arialyy.aria.core.inf.IEntity;
 import com.arialyy.aria.core.upload.UploadEntity;
-import com.arialyy.aria.core.upload.UploadTask;
+import com.arialyy.aria.core.task.UploadTask;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.frame.util.FileUtil;
--- a/app/src/main/java/com/arialyy/simple/core/upload/HttpUploadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/upload/HttpUploadActivity.java
@@ -23,7 +23,7 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.common.RequestEnum;
 import com.arialyy.aria.core.common.controller.ControllerType;
 import com.arialyy.aria.core.upload.UploadEntity;
-import com.arialyy.aria.core.upload.UploadTask;
+import com.arialyy.aria.core.task.UploadTask;
 import com.arialyy.frame.util.FileUtil;
 import com.arialyy.frame.util.show.L;
 import com.arialyy.simple.R;
--- a/app/src/main/java/com/arialyy/simple/modlue/AnyRunnModule.java
+++ b/app/src/main/java/com/arialyy/simple/modlue/AnyRunnModule.java
@@ -22,7 +22,7 @@ import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.common.controller.ControllerType;
 import com.arialyy.aria.core.download.DownloadEntity;
-import com.arialyy.aria.core.download.DownloadTask;
+import com.arialyy.aria.core.task.DownloadTask;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.frame.util.show.L;
 import com.arialyy.simple.util.AppUtil;
@@ -77,7 +77,7 @@ public class AnyRunnModule {

  @Download.onTaskComplete void taskComplete(DownloadTask task) {
    L.d(TAG, "path ==> " + task.getDownloadEntity().getDownloadPath());
-    L.d(TAG, "md5Code ==> " + CommonUtil.getFileMD5(new File(task.getDownloadPath())));
+    L.d(TAG, "md5Code ==> " + CommonUtil.getFileMD5(new File(task.getFilePath())));
  }

  public void start(String url) {
--- a/app/src/main/java/com/arialyy/simple/util/AppUtil.java
+++ b/app/src/main/java/com/arialyy/simple/util/AppUtil.java
@@ -24,7 +24,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.text.TextUtils;
 import androidx.core.content.FileProvider;
-import com.arialyy.aria.core.inf.AbsEntity;
+import com.arialyy.aria.core.common.AbsEntity;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.aria.util.CommonUtil;
 import com.arialyy.aria.util.FileUtil;