From 9ae1d8b5305138263f42ed2f61efc911435c24ae Mon Sep 17 00:00:00 2001 From: e <511455842@qq.com> Date: Tue, 30 Jan 2018 22:05:25 +0800 Subject: [PATCH] fix bug https://github.com/AriaLyy/Aria/issues/191#issuecomment-361515367 --- .../core/upload/uploader/HttpThreadTask.java | 2 +- .../upload/uploader/SimpleUploadUtil.java | 32 ++++++++++++------- .../simple/upload/HttpUploadActivity.java | 4 +-- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/Aria/src/main/java/com/arialyy/aria/core/upload/uploader/HttpThreadTask.java b/Aria/src/main/java/com/arialyy/aria/core/upload/uploader/HttpThreadTask.java index 2ac37421..3e108dcd 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/upload/uploader/HttpThreadTask.java +++ b/Aria/src/main/java/com/arialyy/aria/core/upload/uploader/HttpThreadTask.java @@ -90,7 +90,7 @@ class HttpThreadTask extends AbsThreadTask { } uploadFile(writer, mTaskEntity.attachment, uploadFile); finish(writer); - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); fail(); } diff --git a/Aria/src/main/java/com/arialyy/aria/core/upload/uploader/SimpleUploadUtil.java b/Aria/src/main/java/com/arialyy/aria/core/upload/uploader/SimpleUploadUtil.java index 753be0b9..94c9d486 100644 --- a/Aria/src/main/java/com/arialyy/aria/core/upload/uploader/SimpleUploadUtil.java +++ b/Aria/src/main/java/com/arialyy/aria/core/upload/uploader/SimpleUploadUtil.java @@ -17,6 +17,7 @@ package com.arialyy.aria.core.upload.uploader; import com.arialyy.aria.core.common.IUtil; import com.arialyy.aria.core.common.OnFileInfoCallback; +import com.arialyy.aria.core.inf.AbsTaskEntity; import com.arialyy.aria.core.inf.IUploadListener; import com.arialyy.aria.core.upload.UploadEntity; import com.arialyy.aria.core.upload.UploadTaskEntity; @@ -47,19 +48,26 @@ public class SimpleUploadUtil implements IUtil, Runnable { @Override public void run() { mListener.onPre(); - new FtpFileInfoThread(mTaskEntity, new OnFileInfoCallback() { - @Override public void onComplete(String url, int code) { - if (code == FtpFileInfoThread.CODE_COMPLETE) { - mListener.onComplete(); - } else { - mUploader.start(); - } - } + switch (mTaskEntity.requestType) { + case AbsTaskEntity.U_FTP: + new FtpFileInfoThread(mTaskEntity, new OnFileInfoCallback() { + @Override public void onComplete(String url, int code) { + if (code == FtpFileInfoThread.CODE_COMPLETE) { + mListener.onComplete(); + } else { + mUploader.start(); + } + } - @Override public void onFail(String url, String errorMsg, boolean needRetry) { - mListener.onFail(needRetry); - } - }).start(); + @Override public void onFail(String url, String errorMsg, boolean needRetry) { + mListener.onFail(needRetry); + } + }).start(); + break; + case AbsTaskEntity.U_HTTP: + mUploader.start(); + break; + } } @Override public long getFileSize() { diff --git a/app/src/main/java/com/arialyy/simple/upload/HttpUploadActivity.java b/app/src/main/java/com/arialyy/simple/upload/HttpUploadActivity.java index 6485ed54..5d19e08c 100644 --- a/app/src/main/java/com/arialyy/simple/upload/HttpUploadActivity.java +++ b/app/src/main/java/com/arialyy/simple/upload/HttpUploadActivity.java @@ -35,7 +35,7 @@ public class HttpUploadActivity extends BaseActivity { private static final String TAG = "HttpUploadActivity"; @Bind(R.id.pb) HorizontalProgressBarWithNumber mPb; - private static final String FILE_PATH = "/sdcard/large.rar"; + private static final String FILE_PATH = "/mnt/sdcard/gg.zip"; @Override protected int setLayoutId() { return R.layout.activity_upload; @@ -50,7 +50,7 @@ public class HttpUploadActivity extends BaseActivity { @OnClick(R.id.upload) void upload() { Aria.upload(HttpUploadActivity.this) .load(FILE_PATH) - .setUploadUrl("http://172.18.104.66:8080/upload/sign_file") + .setUploadUrl("http://127.0.0.1:8080/upload/") .setAttachment("file") .start(); }