e
2018-01-30 22:05:25 +08:00
parent 75421b92c4
commit 9ae1d8b530
3 changed files with 23 additions and 15 deletions

View File

@@ -90,7 +90,7 @@ class HttpThreadTask extends AbsThreadTask<UploadEntity, UploadTaskEntity> {
}
uploadFile(writer, mTaskEntity.attachment, uploadFile);
finish(writer);
} catch (IOException e) {
} catch (Exception e) {
e.printStackTrace();
fail();
}

View File

@@ -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() {