From 9ad009d33b57813b09bc9c0f4b2cf3c3b58de5c6 Mon Sep 17 00:00:00 2001
From: laoyuyu <511455842@qq.com>
Date: Fri, 8 Jun 2018 01:17:16 +0800
Subject: [PATCH] bug fix

---
 .../com/arialyy/aria/core/command/normal/ResumeAllCmd.java   | 2 +-
 .../main/java/com/arialyy/aria/core/common/AbsFileer.java    | 5 ++++-
 .../java/com/arialyy/aria/core/common/AbsThreadTask.java     | 1 +
 .../arialyy/aria/core/download/downloader/AbsGroupUtil.java  | 2 +-
 app/src/main/AndroidManifest.xml                             | 4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Aria/src/main/java/com/arialyy/aria/core/command/normal/ResumeAllCmd.java b/Aria/src/main/java/com/arialyy/aria/core/command/normal/ResumeAllCmd.java
index ecdc37df..2a6353ea 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/command/normal/ResumeAllCmd.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/command/normal/ResumeAllCmd.java
@@ -56,7 +56,6 @@ final class ResumeAllCmd<T extends AbsTaskEntity> extends AbsNormalCmd<T> {
    * @param type {@code 1}单任务下载任务；{@code 2}任务组下载任务；{@code 3} 单任务上传任务
    */
   private List<AbsTaskEntity> findTaskData(int type) {
-    // TODO: 2018/4/20 需要测试
     List<AbsTaskEntity> tempList = new ArrayList<>();
     if (type == 1) {
       List<DTEWrapper> wrappers = DbEntity.findRelationData(DTEWrapper.class,
@@ -144,6 +143,7 @@ final class ResumeAllCmd<T extends AbsTaskEntity> extends AbsNormalCmd<T> {
     } else {
       te.getEntity().setState(IEntity.STATE_WAIT);
       createTask(te);
+      sendWaitState();
     }
   }
 }
diff --git a/Aria/src/main/java/com/arialyy/aria/core/common/AbsFileer.java b/Aria/src/main/java/com/arialyy/aria/core/common/AbsFileer.java
index 40ef2e0a..a523335a 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/common/AbsFileer.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/common/AbsFileer.java
@@ -491,7 +491,7 @@ public abstract class AbsFileer<ENTITY extends AbsNormalEntity, TASK_ENTITY exte
   /**
    * 重试线程任务，只有线程创建成功才能重试
    */
-  public void retryThradTask() {
+  public void retryThreadTask() {
     if (mTask == null || mTask.size() == 0) {
       ALog.w(TAG, "没有线程任务");
       return;
@@ -501,6 +501,9 @@ public abstract class AbsFileer<ENTITY extends AbsNormalEntity, TASK_ENTITY exte
       AbsThreadTask task = mTask.get(key);
       if (task != null && !task.isThreadComplete()) {
         task.getConfig().START_LOCATION = task.getCurrentLocation();
+        mConstance.isStop = false;
+        mConstance.isCancel = false;
+        mConstance.isRunning = true;
         ALog.d(TAG, String.format("任务【%s】开始重试，线程__%s__【开始位置：%s，结束位置：%s】", mEntity.getFileName(),
             key, task.getConfig().START_LOCATION, task.getConfig().END_LOCATION));
         mFixedThreadPool.execute(task);
diff --git a/Aria/src/main/java/com/arialyy/aria/core/common/AbsThreadTask.java b/Aria/src/main/java/com/arialyy/aria/core/common/AbsThreadTask.java
index f4d411dd..5be32e19 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/common/AbsThreadTask.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/common/AbsThreadTask.java
@@ -131,6 +131,7 @@ public abstract class AbsThreadTask<ENTITY extends AbsNormalEntity, TASK_ENTITY
    * @return {@code true} 中断，{@code false} 不是中断
    */
   protected boolean isBreak() {
+    ALog.d(TAG, "任务中断");
     return STATE.isCancel || STATE.isStop || taskBreak;
   }
 
diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/downloader/AbsGroupUtil.java b/Aria/src/main/java/com/arialyy/aria/core/download/downloader/AbsGroupUtil.java
index f2ac361e..436a5fab 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/download/downloader/AbsGroupUtil.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/downloader/AbsGroupUtil.java
@@ -504,7 +504,7 @@ public abstract class AbsGroupUtil implements IUtil {
         @Override public void run() {
           Downloader dt = mDownloaderMap.get(subEntity.getUrl());
           if (dt != null) {
-            dt.retryThradTask();
+            dt.retryThreadTask();
           }
         }
       }, 3000);
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d7856d59..dd6efcb9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,10 +15,10 @@
       android:theme="@style/AppTheme.NoActionBar">
     <!--android:name=".test.TestGroupActivity"-->
     <!--android:name=".MainActivity"-->
-        <!--android:name=".download.group.DownloadGroupActivity"-->
     <!--android:name=".test.TestActivity"-->
+        <!--android:name=".test.AnyRunActivity"-->
     <activity
-        android:name=".test.AnyRunActivity"
+        android:name=".download.group.DownloadGroupActivity"
         android:label="@string/app_name">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>