From 426c148370677ae2daf8fd879d4a76bdfd2b7f3d Mon Sep 17 00:00:00 2001
From: laoyuyu <511455842@qq.com>
Date: Fri, 1 Jun 2018 20:11:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AD=E6=96=AD=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aria/core/common/AbsFtpThreadTask.java    |   2 +-
 .../aria/core/common/AbsThreadTask.java       | 109 ++++++++++--------
 .../download/downloader/FtpThreadTask.java    |   8 +-
 .../download/downloader/HttpThreadTask.java   |  10 +-
 .../core/upload/uploader/FtpThreadTask.java   |   6 +-
 app/src/main/AndroidManifest.xml              |   7 +-
 .../arialyy/simple/test/AnyRunnModule.java    |   2 +-
 7 files changed, 81 insertions(+), 63 deletions(-)

diff --git a/Aria/src/main/java/com/arialyy/aria/core/common/AbsFtpThreadTask.java b/Aria/src/main/java/com/arialyy/aria/core/common/AbsFtpThreadTask.java
index 3bce5644..70c0f142 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/common/AbsFtpThreadTask.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/common/AbsFtpThreadTask.java
@@ -87,7 +87,7 @@ public abstract class AbsFtpThreadTask<ENTITY extends AbsNormalEntity, TASK_ENTI
       int reply = client.getReplyCode();
       if (!FTPReply.isPositiveCompletion(reply)) {
         client.disconnect();
-        fail(STATE.CURRENT_LOCATION,
+        fail(mChildCurrentLocation,
             "无法连接到ftp服务器，错误码为：" + reply + "，msg:" + client.getReplyString(), null);
         return null;
       }
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 7d84d0fa..43c8d57b 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
@@ -24,7 +24,6 @@ import com.arialyy.aria.core.upload.UploadEntity;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.aria.util.ErrorHelp;
 import com.arialyy.aria.util.NetUtils;
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -61,15 +60,12 @@ public abstract class AbsThreadTask<ENTITY extends AbsNormalEntity, TASK_ENTITY
   protected int mConnectTimeOut; //连接超时时间
   protected int mReadTimeOut; //流读取的超时时间
   protected boolean isNotNetRetry = false;  //断网情况是否重试
+  protected boolean taskBreak = false;  //任务中断
 
   private Thread mConfigThread = new Thread(new Runnable() {
     @Override public void run() {
       final long currentTemp = mChildCurrentLocation;
-      try {
-        writeConfig(false, currentTemp);
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
+      writeConfig(false, currentTemp);
     }
   });
 
@@ -108,35 +104,43 @@ public abstract class AbsThreadTask<ENTITY extends AbsNormalEntity, TASK_ENTITY
     }
   }
 
+  /**
+   * 任务是否中断，中断条件：
+   * 1、任务取消
+   * 2、任务停止
+   * 3、手动中断 {@link #taskBreak}
+   *
+   * @return {@code true} 中断，{@code false} 不是中断
+   */
+  protected boolean isBreak() {
+    return STATE.isCancel || STATE.isStop || taskBreak;
+  }
+
   /**
    * 停止任务
    */
   public void stop() {
     synchronized (AriaManager.LOCK) {
-      try {
-        if (mConfig.SUPPORT_BP) {
-          final long currentTemp = mChildCurrentLocation;
-          STATE.STOP_NUM++;
-          ALog.d(TAG, "任务【"
-              + mConfig.TEMP_FILE.getName()
-              + "】thread__"
-              + mConfig.THREAD_ID
-              + "__停止【停止位置： "
-              + currentTemp
-              + "】");
-          writeConfig(false, currentTemp);
-          if (STATE.isStop()) {
-            ALog.i(TAG, "任务【" + mConfig.TEMP_FILE.getName() + "】已停止");
-            STATE.isRunning = false;
-            mListener.onStop(STATE.CURRENT_LOCATION);
-          }
-        } else {
+      if (mConfig.SUPPORT_BP) {
+        final long currentTemp = mChildCurrentLocation;
+        STATE.STOP_NUM++;
+        ALog.d(TAG, "任务【"
+            + mConfig.TEMP_FILE.getName()
+            + "】thread__"
+            + mConfig.THREAD_ID
+            + "__停止【停止位置： "
+            + currentTemp
+            + "】");
+        writeConfig(false, currentTemp);
+        if (STATE.isStop()) {
           ALog.i(TAG, "任务【" + mConfig.TEMP_FILE.getName() + "】已停止");
           STATE.isRunning = false;
           mListener.onStop(STATE.CURRENT_LOCATION);
         }
-      } catch (IOException e) {
-        e.printStackTrace();
+      } else {
+        ALog.i(TAG, "任务【" + mConfig.TEMP_FILE.getName() + "】已停止");
+        STATE.isRunning = false;
+        mListener.onStop(STATE.CURRENT_LOCATION);
       }
     }
   }
@@ -146,6 +150,11 @@ public abstract class AbsThreadTask<ENTITY extends AbsNormalEntity, TASK_ENTITY
    */
   protected void progress(long len) {
     synchronized (AriaManager.LOCK) {
+      if (STATE.CURRENT_LOCATION > mEntity.getFileSize()) {
+        taskBreak = true;
+        fail(mChildCurrentLocation, "下载失败，下载长度超出文件大小", null, false);
+        return;
+      }
       mChildCurrentLocation += len;
       STATE.CURRENT_LOCATION += len;
       if (System.currentTimeMillis() - mLastSaveTime > 5000
@@ -182,27 +191,36 @@ public abstract class AbsThreadTask<ENTITY extends AbsNormalEntity, TASK_ENTITY
     }
   }
 
+  /**
+   * 线程任务失败
+   *
+   * @param subCurrentLocation 当前线程下载进度
+   * @param msg 自定义信息
+   * @param ex 异常信息
+   */
+  protected void fail(final long subCurrentLocation, String msg, Exception ex) {
+    fail(subCurrentLocation, msg, ex, true);
+  }
+
   /**
    * 任务失败
+   *
+   * @param subCurrentLocation 当前子线程进度
    */
-  protected void fail(final long currentLocation, String msg, Exception ex) {
+  protected void fail(final long subCurrentLocation, String msg, Exception ex, boolean needRetry) {
     synchronized (AriaManager.LOCK) {
-      try {
-        if (ex != null) {
-          ALog.e(TAG, msg + "\n" + ALog.getExceptionString(ex));
-        } else {
-          ALog.e(TAG, msg);
-        }
-        if (mConfig.SUPPORT_BP) {
-          writeConfig(false, currentLocation);
-          retryThis(STATE.START_THREAD_NUM != 1);
-        } else {
-          ALog.e(TAG, "任务【" + mConfig.TEMP_FILE.getName() + "】执行失败");
-          mListener.onFail(true);
-          ErrorHelp.saveError(TAG, "", ALog.getExceptionString(ex));
-        }
-      } catch (IOException e) {
-        e.printStackTrace();
+      if (ex != null) {
+        ALog.e(TAG, msg + "\n" + ALog.getExceptionString(ex));
+      } else {
+        ALog.e(TAG, msg);
+      }
+      if (mConfig.SUPPORT_BP) {
+        writeConfig(false, subCurrentLocation);
+        retryThis(STATE.START_THREAD_NUM != 1);
+      } else {
+        ALog.e(TAG, "任务【" + mConfig.TEMP_FILE.getName() + "】执行失败");
+        mListener.onFail(true);
+        ErrorHelp.saveError(TAG, "", ALog.getExceptionString(ex));
       }
     }
   }
@@ -233,9 +251,8 @@ public abstract class AbsThreadTask<ENTITY extends AbsNormalEntity, TASK_ENTITY
           mFailNum++;
           ALog.w(TAG,
               "任务【" + mConfig.TEMP_FILE.getName() + "】thread__" + mConfig.THREAD_ID + "__正在重试");
-          final long retryLocation =
+          mConfig.START_LOCATION =
               mChildCurrentLocation == 0 ? mConfig.START_LOCATION : mChildCurrentLocation;
-          mConfig.START_LOCATION = retryLocation;
           AbsThreadTask.this.run();
         }
       }, RETRY_INTERVAL);
@@ -253,7 +270,7 @@ public abstract class AbsThreadTask<ENTITY extends AbsNormalEntity, TASK_ENTITY
   /**
    * 将记录写入到配置文件
    */
-  protected void writeConfig(boolean isComplete, final long record) throws IOException {
+  protected void writeConfig(boolean isComplete, final long record) {
     if (mConfig.THREAD_RECORD != null) {
       mConfig.THREAD_RECORD.isComplete = isComplete;
       if (0 < record && record < mConfig.END_LOCATION) {
diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/downloader/FtpThreadTask.java b/Aria/src/main/java/com/arialyy/aria/core/download/downloader/FtpThreadTask.java
index d0f17778..d9dc4b4c 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/download/downloader/FtpThreadTask.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/downloader/FtpThreadTask.java
@@ -101,7 +101,9 @@ class FtpThreadTask extends AbsFtpThreadTask<DownloadEntity, DownloadTaskEntity>
         readNormal(is);
       }
 
-      if (STATE.isCancel || STATE.isStop) return;
+      if (isBreak()){
+        return;
+      }
       ALog.i(TAG, "任务【" + mConfig.TEMP_FILE.getName() + "】线程__" + mConfig.THREAD_ID + "__下载完毕");
       writeConfig(true, 1);
       STATE.COMPLETE_THREAD_NUM++;
@@ -146,7 +148,7 @@ class FtpThreadTask extends AbsFtpThreadTask<DownloadEntity, DownloadTaskEntity>
       fic = Channels.newChannel(is);
       ByteBuffer bf = ByteBuffer.allocate(mBufSize);
       while ((len = fic.read(bf)) != -1) {
-        if (STATE.isCancel || STATE.isStop) {
+        if (isBreak()) {
           break;
         }
         if (mSleepTime > 0) {
@@ -189,7 +191,7 @@ class FtpThreadTask extends AbsFtpThreadTask<DownloadEntity, DownloadTaskEntity>
       byte[] buffer = new byte[mBufSize];
       int len;
       while ((len = is.read(buffer)) != -1) {
-        if (STATE.isCancel || STATE.isStop) {
+        if (isBreak()) {
           break;
         }
         if (mSleepTime > 0) Thread.sleep(mSleepTime);
diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/downloader/HttpThreadTask.java b/Aria/src/main/java/com/arialyy/aria/core/download/downloader/HttpThreadTask.java
index 74d50cfb..6e290f81 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/download/downloader/HttpThreadTask.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/downloader/HttpThreadTask.java
@@ -101,7 +101,7 @@ final class HttpThreadTask extends AbsThreadTask<DownloadEntity, DownloadTaskEnt
         }
       }
 
-      if (STATE.isCancel || STATE.isStop) {
+      if (isBreak()) {
         return;
       }
       handleComplete();
@@ -142,7 +142,7 @@ final class HttpThreadTask extends AbsThreadTask<DownloadEntity, DownloadTaskEnt
       fic = Channels.newChannel(is);
       ByteBuffer bf = ByteBuffer.allocate(mBufSize);
       while ((len = fic.read(bf)) != -1) {
-        if (STATE.isCancel || STATE.isStop) {
+        if (isBreak()) {
           break;
         }
         if (mSleepTime > 0) {
@@ -192,7 +192,7 @@ final class HttpThreadTask extends AbsThreadTask<DownloadEntity, DownloadTaskEnt
     byte[] buffer = new byte[mBufSize];
     int len;
     while ((len = is.read(buffer)) != -1) {
-      if (STATE.isCancel || STATE.isStop) {
+      if (isBreak()) {
         break;
       }
       if (mSleepTime > 0) {
@@ -205,10 +205,8 @@ final class HttpThreadTask extends AbsThreadTask<DownloadEntity, DownloadTaskEnt
 
   /**
    * 处理完成配置文件的更新或事件回调
-   *
-   * @throws IOException
    */
-  private void handleComplete() throws IOException {
+  private void handleComplete() {
     //支持断点的处理
     if (mConfig.SUPPORT_BP) {
       if (mChildCurrentLocation == mConfig.END_LOCATION) {
diff --git a/Aria/src/main/java/com/arialyy/aria/core/upload/uploader/FtpThreadTask.java b/Aria/src/main/java/com/arialyy/aria/core/upload/uploader/FtpThreadTask.java
index 3a1db27f..7b179478 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/upload/uploader/FtpThreadTask.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/upload/uploader/FtpThreadTask.java
@@ -82,7 +82,9 @@ class FtpThreadTask extends AbsFtpThreadTask<UploadEntity, UploadTaskEntity> {
         file.seek(mConfig.START_LOCATION);
       }
       upload(client, file);
-      if (STATE.isCancel || STATE.isStop) return;
+      if (isBreak()) {
+        return;
+      }
       ALog.i(TAG, "任务【" + mConfig.TEMP_FILE.getName() + "】线程__" + mConfig.THREAD_ID + "__上传完毕");
       writeConfig(true, 1);
       STATE.COMPLETE_THREAD_NUM++;
@@ -131,7 +133,7 @@ class FtpThreadTask extends AbsFtpThreadTask<UploadEntity, UploadTaskEntity> {
 
         @Override public void onFtpInputStream(FTPClient client, long totalBytesTransferred,
             int bytesTransferred, long streamSize) {
-          if ((STATE.isCancel || STATE.isStop) && !isStoped) {
+          if (isBreak() && !isStoped) {
             try {
               isStoped = true;
               client.abor();
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c65e5e79..a81e9694 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.arialyy.simple">
 
-  <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -15,10 +14,10 @@
       android:supportsRtl="true"
       android:theme="@style/AppTheme.NoActionBar">
     <!--android:name=".test.TestGroupActivity"-->
-        <!--android:name=".test.TestActivity"-->
-        <!--android:name=".test.AnyRunActivity"-->
+    <!--android:name=".test.TestActivity"-->
+    <!--android:name=".MainActivity"-->
     <activity
-    android:name=".MainActivity"
+        android:name=".test.AnyRunActivity"
         android:label="@string/app_name">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
diff --git a/app/src/main/java/com/arialyy/simple/test/AnyRunnModule.java b/app/src/main/java/com/arialyy/simple/test/AnyRunnModule.java
index 998acc63..ff23272b 100644
--- a/app/src/main/java/com/arialyy/simple/test/AnyRunnModule.java
+++ b/app/src/main/java/com/arialyy/simple/test/AnyRunnModule.java
@@ -68,7 +68,7 @@ public class AnyRunnModule {
         .load(url)
         //.addHeader("Accept-Encoding", "gzip")
         .setRequestMode(RequestEnum.GET)
-        .setFilePath(Environment.getExternalStorageDirectory().getPath() + "/abcd.mp4")
+        .setFilePath(Environment.getExternalStorageDirectory().getPath() + "/abcds.exe")
         //.resetState()
         .start();
     //String[] urls = new String[] {