From 631017bb67388baccbcd8b4ad3fe61e5e6192b63 Mon Sep 17 00:00:00 2001
From: laoyuyu <511455842@qq.com>
Date: Thu, 31 Jan 2019 21:04:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dftp=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9=E4=B8=8B=E8=BD=BD=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../download/group/FtpDirDownloadUtil.java    |  3 +-
 .../core/download/group/FtpDirInfoThread.java |  1 +
 .../download/group/SubDownloadLoader.java     | 36 ++++++++++++-------
 .../arialyy/aria/core/inf/ITaskWrapper.java   | 12 +++----
 .../core/upload/uploader/FtpThreadTask.java   |  1 -
 .../simple/download/FtpDownloadActivity.java  |  2 +-
 .../group/FTPDirDownloadActivity.java         |  2 +-
 .../simple/upload/FtpUploadActivity.java      |  1 -
 8 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/group/FtpDirDownloadUtil.java b/Aria/src/main/java/com/arialyy/aria/core/download/group/FtpDirDownloadUtil.java
index e04ce09b..ecb73e44 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/download/group/FtpDirDownloadUtil.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/group/FtpDirDownloadUtil.java
@@ -23,7 +23,8 @@ import com.arialyy.aria.core.inf.IEntity;
 import com.arialyy.aria.exception.BaseException;
 
 /**
- * Created by Aria.Lao on 2017/7/27. ftp文件夹下载工具
+ * Created by Aria.Lao on 2017/7/27.
+ * ftp文件夹下载工具
  */
 public class FtpDirDownloadUtil extends AbsGroupUtil {
   private String TAG = "FtpDirDownloadUtil";
diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/group/FtpDirInfoThread.java b/Aria/src/main/java/com/arialyy/aria/core/download/group/FtpDirInfoThread.java
index b9e3ab4c..7f8be3c1 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/download/group/FtpDirInfoThread.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/group/FtpDirInfoThread.java
@@ -69,6 +69,7 @@ class FtpDirInfoThread extends AbsFtpInfoThread<DownloadGroupEntity, DGTaskWrapp
         new String(fileName.getBytes(), Charset.forName(mTaskWrapper.asHttp().getCharSet())));
     entity.setGroupHash(mEntity.getGroupHash());
     entity.setGroupChild(true);
+    entity.setConvertFileSize(CommonUtil.formatFileSize(ftpFile.getSize()));
     entity.setFileSize(ftpFile.getSize());
     entity.insert();
 
diff --git a/Aria/src/main/java/com/arialyy/aria/core/download/group/SubDownloadLoader.java b/Aria/src/main/java/com/arialyy/aria/core/download/group/SubDownloadLoader.java
index 34d6e6f1..4e05cdcb 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/download/group/SubDownloadLoader.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/download/group/SubDownloadLoader.java
@@ -23,13 +23,16 @@ import com.arialyy.aria.core.download.DTaskWrapper;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.download.downloader.Downloader;
 import com.arialyy.aria.core.download.downloader.HttpFileInfoThread;
+import com.arialyy.aria.core.inf.AbsTaskWrapper;
 import com.arialyy.aria.core.scheduler.ISchedulers;
 import com.arialyy.aria.exception.BaseException;
+import com.arialyy.aria.util.ALog;
 
 /**
- * 子任务下载工具，负责创建{@link Downloader}
+ * 子任务下载器，负责创建{@link Downloader}
  */
-class  SubDownloadLoader implements IUtil {
+class SubDownloadLoader implements IUtil {
+  private final String TAG = "SubDownloadLoader";
 
   private Downloader mDownloader;
   private DTaskWrapper mWrapper;
@@ -88,17 +91,24 @@ class  SubDownloadLoader implements IUtil {
   }
 
   @Override public void start() {
-    new Thread(new HttpFileInfoThread(mWrapper, new OnFileInfoCallback() {
-
-      @Override public void onComplete(String url, CompleteInfo info) {
-        mDownloader = new Downloader(mListener, mWrapper);
-        mDownloader.start();
-      }
-
-      @Override public void onFail(String url, BaseException e, boolean needRetry) {
-        mSchedulers.obtainMessage(ISchedulers.FAIL, SubDownloadLoader.this);
-      }
-    })).start();
+    if (mWrapper.getRequestType() == AbsTaskWrapper.D_HTTP) {
+      new Thread(new HttpFileInfoThread(mWrapper, new OnFileInfoCallback() {
+
+        @Override public void onComplete(String url, CompleteInfo info) {
+          mDownloader = new Downloader(mListener, mWrapper);
+          mDownloader.start();
+        }
+
+        @Override public void onFail(String url, BaseException e, boolean needRetry) {
+          mSchedulers.obtainMessage(ISchedulers.FAIL, SubDownloadLoader.this);
+        }
+      })).start();
+    } else if (mWrapper.getRequestType() == AbsTaskWrapper.D_FTP) {
+      mDownloader = new Downloader(mListener, mWrapper);
+      mDownloader.start();
+    } else {
+      ALog.w(TAG, String.format("不识别的类型，requestType：%s", mWrapper.getRequestType()));
+    }
   }
 
   @Override public void resume() {
diff --git a/Aria/src/main/java/com/arialyy/aria/core/inf/ITaskWrapper.java b/Aria/src/main/java/com/arialyy/aria/core/inf/ITaskWrapper.java
index acfd64d5..a3e0ccff 100644
--- a/Aria/src/main/java/com/arialyy/aria/core/inf/ITaskWrapper.java
+++ b/Aria/src/main/java/com/arialyy/aria/core/inf/ITaskWrapper.java
@@ -25,29 +25,29 @@ public interface ITaskWrapper<ENTITY extends AbsEntity> {
   /**
    * HTTP单任务载
    */
-  int D_HTTP = 0x11;
+  int D_HTTP = 1;
   /**
    * HTTP任务组下载
    */
-  int DG_HTTP = 0x12;
+  int DG_HTTP = 2;
 
   /**
    * FTP单文件下载
    */
-  int D_FTP = 0x13;
+  int D_FTP = 3;
   /**
    * FTP文件夹下载，为避免登录过多，子任务由单线程进行处理
    */
-  int D_FTP_DIR = 0x14;
+  int D_FTP_DIR = 4;
 
   /**
    * HTTP单文件上传
    */
-  int U_HTTP = 0xA1;
+  int U_HTTP = 5;
   /**
    * FTP单文件上传
    */
-  int U_FTP = 0xA2;
+  int U_FTP = 6;
 
   ENTITY getEntity();
 }
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 88eddc5d..06c929f2 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
@@ -141,7 +141,6 @@ class FtpThreadTask extends AbsFtpThreadTask<UploadEntity, UTaskWrapper> {
    * 上传
    *
    * @return {@code true}上传成功、{@code false} 上传失败
-   * @throws IOException
    */
   private boolean upload(final FTPClient client, final BufferedRandomAccessFile bis)
       throws IOException {
diff --git a/app/src/main/java/com/arialyy/simple/download/FtpDownloadActivity.java b/app/src/main/java/com/arialyy/simple/download/FtpDownloadActivity.java
index 45fca4fd..74bffff4 100644
--- a/app/src/main/java/com/arialyy/simple/download/FtpDownloadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/download/FtpDownloadActivity.java
@@ -64,7 +64,7 @@ public class FtpDownloadActivity extends BaseActivity<ActivityFtpDownloadBinding
             .setFilePath("/mnt/sdcard/").start();
         break;
       case R.id.stop:
-        Aria.download(this).loadFtp(URL);
+        Aria.download(this).loadFtp(URL).stop();
         break;
       case R.id.cancel:
         Aria.download(this).loadFtp(URL).cancel();
diff --git a/app/src/main/java/com/arialyy/simple/download/group/FTPDirDownloadActivity.java b/app/src/main/java/com/arialyy/simple/download/group/FTPDirDownloadActivity.java
index 5ad018ba..6b91283b 100644
--- a/app/src/main/java/com/arialyy/simple/download/group/FTPDirDownloadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/download/group/FTPDirDownloadActivity.java
@@ -35,7 +35,7 @@ import com.arialyy.simple.widget.SubStateLinearLayout;
  * Created by lyy on 2017/7/6.
  */
 public class FTPDirDownloadActivity extends BaseActivity<ActivityDownloadGroupBinding> {
-  private static final String dir = "ftp://192.168.1.2:21/upload/测试";
+  private static final String dir = "ftp://9.9.9.50:21/upload/测试";
 
   @Bind(R.id.child_list) SubStateLinearLayout mChildList;
 
diff --git a/app/src/main/java/com/arialyy/simple/upload/FtpUploadActivity.java b/app/src/main/java/com/arialyy/simple/upload/FtpUploadActivity.java
index ff55fdf4..5bd4c6b9 100644
--- a/app/src/main/java/com/arialyy/simple/upload/FtpUploadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/upload/FtpUploadActivity.java
@@ -43,7 +43,6 @@ public class FtpUploadActivity extends BaseActivity<ActivityFtpUploadBinding> {
     super.init(savedInstanceState);
     Aria.upload(this).register();
     UploadEntity entity = Aria.upload(this).getUploadEntity(FILE_PATH);
-    ALog.d(TAG, "pare = >" + entity.getPercent());
     if (entity != null) {
       getBinding().setFileSize(CommonUtil.formatFileSize(entity.getFileSize()));
       getBinding().setProgress(entity.isComplete() ? 100