From 52a4f1e7eafd585dc31ba40cea02a8774178d03f Mon Sep 17 00:00:00 2001
From: AriaLyy <511455842@qq.com>
Date: Fri, 2 Jun 2017 20:12:21 +0800
Subject: [PATCH] =?UTF-8?q?DownloadTarget=20=E6=B7=BB=E5=8A=A0=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BB=BB=E5=8A=A1=E8=BF=9B=E5=BA=A6=E7=99=BE=E5=88=86?=
 =?UTF-8?q?=E6=AF=94=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aria/core/download/DownloadTarget.java        | 13 +++++++++++++
 .../java/com/arialyy/aria/core/inf/AbsTarget.java | 15 +++++++++++++--
 .../simple/download/HighestPriorityActivity.java  |  4 +---
 .../simple/download/SingleTaskActivity.java       |  4 +---
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/DownloadTarget.java b/Aria/src/main/java/com/arialyy/aria/core/download/DownloadTarget.java
index b02306ca..ca2b48b8 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/download/DownloadTarget.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/DownloadTarget.java
@@ -66,6 +66,19 @@ public class DownloadTarget extends AbsTarget<DownloadEntity, DownloadTaskEntity
     return this;
   }
 
+  @Override public int getPercent() {
+    DownloadEntity entity = DownloadEntity.findData(DownloadEntity.class, "downloadUrl=?",
+        this.entity.getDownloadUrl());
+    if (entity == null) {
+      Log.e("DownloadTarget", "下载管理器中没有该任务");
+      return 0;
+    }
+    if (entity.getFileSize() != 0) {
+      return (int) (entity.getCurrentProgress() * 100 / entity.getFileSize());
+    }
+    return super.getPercent();
+  }
+
   /**
    * 给url请求添加头部
    *
diff --git a/Aria/src/main/java/com/arialyy/aria/core/inf/AbsTarget.java b/Aria/src/main/java/com/arialyy/aria/core/inf/AbsTarget.java
index 58803f4c..e98eb937 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/inf/AbsTarget.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/inf/AbsTarget.java
@@ -108,6 +108,15 @@ public class AbsTarget<ENTITY extends IEntity, TASK_ENTITY extends ITaskEntity>
     return false;
   }
 
+  /**
+   * 获取任务进度百分比
+   *
+   * @return 返回任务进度
+   */
+  protected int getPercent() {
+    return 0;
+  }
+
   /**
    * 获取当前任务进度，如果任务存在，则返回当前进度
    *
@@ -118,14 +127,16 @@ public class AbsTarget<ENTITY extends IEntity, TASK_ENTITY extends ITaskEntity>
       DownloadEntity entity = DownloadEntity.findData(DownloadEntity.class, "downloadUrl=?",
           ((DownloadEntity) this.entity).getDownloadUrl());
       if (entity == null) {
-        throw new NullPointerException("下载管理器中没有该任务");
+        Log.e("DownloadTarget", "下载管理器中没有该任务");
+        return -1;
       }
       return entity.getCurrentProgress();
     } else if (entity instanceof UploadEntity) {
       UploadEntity entity = DbEntity.findData(UploadEntity.class, "filePath=?",
           ((UploadEntity) this.entity).getFilePath());
       if (entity == null) {
-        throw new NullPointerException("没有找到该任务");
+        Log.e("DownloadTarget", "下载管理器中没有该任务");
+        return -1;
       }
       return entity.getCurrentProgress();
     }
diff --git a/app/src/main/java/com/arialyy/simple/download/HighestPriorityActivity.java b/app/src/main/java/com/arialyy/simple/download/HighestPriorityActivity.java
index 9194e5d6..00a3e74c 100644
--- a/app/src/main/java/com/arialyy/simple/download/HighestPriorityActivity.java
+++ b/app/src/main/java/com/arialyy/simple/download/HighestPriorityActivity.java
@@ -52,9 +52,7 @@ public class HighestPriorityActivity extends BaseActivity<ActivityHighestPriorit
 
   private void initWidget() {
     if (Aria.download(this).taskExists(DOWNLOAD_URL)) {
-      DownloadTarget target = Aria.download(this).load(DOWNLOAD_URL);
-      int p = (int) (target.getCurrentProgress() * 100 / target.getFileSize());
-      mPb.setProgress(p);
+      mPb.setProgress(Aria.download(this).load(DOWNLOAD_URL).getPercent());
     }
     mAdapter = new DownloadAdapter(this, getModule(DownloadModule.class).getDownloadTaskList());
     mList.setLayoutManager(new LinearLayoutManager(this));
diff --git a/app/src/main/java/com/arialyy/simple/download/SingleTaskActivity.java b/app/src/main/java/com/arialyy/simple/download/SingleTaskActivity.java
index 86e1bc58..e83bcd99 100644
--- a/app/src/main/java/com/arialyy/simple/download/SingleTaskActivity.java
+++ b/app/src/main/java/com/arialyy/simple/download/SingleTaskActivity.java
@@ -165,9 +165,7 @@ public class SingleTaskActivity extends BaseActivity<ActivitySingleBinding> {
 
   private void init() {
     if (Aria.download(this).taskExists(DOWNLOAD_URL)) {
-      DownloadTarget target = Aria.download(this).load(DOWNLOAD_URL);
-      int p = (int) (target.getCurrentProgress() * 100 / target.getFileSize());
-      mPb.setProgress(p);
+      mPb.setProgress(Aria.download(this).load(DOWNLOAD_URL).getPercent());
     }
   }