Hua/Aria
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
AriaLyy
2017-03-03 18:12:54 +08:00
parent a3cc5e6e49
commit c66dd16f18
7 changed files with 201 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

2
Aria/src/main/java/com/arialyy/aria/core/command/StartCmd.java
View File

@ -16,6 +16,7 @@
package com.arialyy.aria.core.command;
import android.util.Log;
import com.arialyy.aria.core.inf.ITask;
import com.arialyy.aria.core.inf.ITaskEntity;
@ -30,6 +31,7 @@ class StartCmd<T extends ITaskEntity> extends AbsCmd<T> {
}
@Override public void executeCmd() {
Log.d(TAG, "startCmd");
ITask task = mQueue.getTask(mEntity.getEntity());
if (task == null) {
task = mQueue.createTask(mTargetName, mEntity);

1
Aria/src/main/java/com/arialyy/aria/core/queue/UploadTaskQueue.java
View File

@ -42,6 +42,7 @@ public class UploadTaskQueue extends AbsTaskQueue<UploadTask, UploadTaskEntity,
}
@Override public void startTask(UploadTask task) {
Log.e(TAG, "startTask");
if (mExecutePool.putTask(task)) {
mCachePool.removeTask(task);
//task.getEntity().setFailNum(0);

1
Aria/src/main/java/com/arialyy/aria/core/upload/UploadTask.java
View File

@ -57,6 +57,7 @@ public class UploadTask implements ITask {
}
@Override public void start() {
Log.d(TAG, "task_start");
if (mUtil.isRunning()) {
Log.d(TAG, "任务正在下载");
} else {

8
Aria/src/main/java/com/arialyy/aria/core/upload/UploadUtil.java
View File

@ -58,6 +58,7 @@ public class UploadUtil implements Runnable {
}
public void start() {
Log.d(TAG, "start");
isCancel = false;
isRunning = false;
new Thread(this).start();
@ -69,6 +70,7 @@ public class UploadUtil implements Runnable {
}
@Override public void run() {
Log.e(TAG, "run");
File uploadFile = new File(mUploadEntity.getFilePath());
if (!uploadFile.exists()) {
Log.e(TAG, "【" + mUploadEntity.getFilePath() + "】，文件不存在。");
@ -149,6 +151,7 @@ public class UploadUtil implements Runnable {
*/
private void uploadFile(PrintWriter writer, OutputStream outputStream, String attachment,
File uploadFile) throws IOException {
Log.e(TAG, "uploadFile");
writer.append(PREFIX).append(BOUNDARY).append(LINE_END);
writer.append("Content-Disposition: form-data; name=\"")
.append(attachment)
@ -157,8 +160,7 @@ public class UploadUtil implements Runnable {
.append("\"")
.append(LINE_END);
writer.append("Content-Type: ")
//.append(URLConnection.guessContentTypeFromName(mTaskEntity.uploadEntity.getFileName()))
.append(mTaskEntity.contentType)
.append(URLConnection.guessContentTypeFromName(mTaskEntity.uploadEntity.getFileName()))
.append(LINE_END);
writer.append("Content-Transfer-Encoding: binary").append(LINE_END);
writer.append(LINE_END);
@ -178,7 +180,7 @@ public class UploadUtil implements Runnable {
}
outputStream.flush();
outputStream.close();
//outputStream.close(); //不能调用，否则服务器端异常
inputStream.close();
writer.append(LINE_END);
writer.flush();

37
Aria/src/main/java/com/arialyy/aria/util/MultipartUtility.java
View File

@ -18,8 +18,8 @@ import java.util.List;
/**
* This utility class provides an abstraction layer for sending multipart HTTP
* POST requests to a web server.
* @author www.codejava.net
*
* @author www.codejava.net
*/
public class MultipartUtility {
private final String boundary;
@ -32,12 +32,10 @@ public class MultipartUtility {
/**
* This constructor initializes a new HTTP POST request with content type
* is set to multipart/form-data
* @param requestURL
* @param charset
*
* @throws IOException
*/
public MultipartUtility(String requestURL, String charset)
throws IOException {
public MultipartUtility(String requestURL, String charset) throws IOException {
this.charset = charset;
// creates a unique boundary based on time stamp
@ -48,26 +46,23 @@ public class MultipartUtility {
httpConn.setUseCaches(false);
httpConn.setDoOutput(true); // indicates POST method
httpConn.setDoInput(true);
httpConn.setRequestProperty("Content-Type",
"multipart/form-data; boundary=" + boundary);
httpConn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
//httpConn.setRequestProperty("User-Agent", "CodeJava Agent");
//httpConn.setRequestProperty("Test", "Bonjour");
outputStream = httpConn.getOutputStream();
writer = new PrintWriter(new OutputStreamWriter(outputStream, charset),
true);
writer = new PrintWriter(new OutputStreamWriter(outputStream, charset), true);
}
/**
* Adds a form field to the request
*
* @param name field name
* @param value field value
*/
public void addFormField(String name, String value) {
writer.append("--" + boundary).append(LINE_FEED);
writer.append("Content-Disposition: form-data; name=\"" + name + "\"")
.append(LINE_FEED);
writer.append("Content-Type: text/plain; charset=" + charset).append(
LINE_FEED);
writer.append("Content-Disposition: form-data; name=\"" + name + "\"").append(LINE_FEED);
writer.append("Content-Type: text/plain; charset=" + charset).append(LINE_FEED);
writer.append(LINE_FEED);
writer.append(value).append(LINE_FEED);
writer.flush();
@ -75,21 +70,18 @@ public class MultipartUtility {
/**
* Adds a upload file section to the request
*
* @param fieldName name attribute in <input type="file" name="..." />
* @param uploadFile a File to be uploaded
* @throws IOException
*/
public void addFilePart(String fieldName, File uploadFile)
throws IOException {
public void addFilePart(String fieldName, File uploadFile) throws IOException {
String fileName = uploadFile.getName();
writer.append("--" + boundary).append(LINE_FEED);
writer.append(
"Content-Disposition: form-data; name=\"" + fieldName
+ "\"; filename=\"" + fileName + "\"")
"Content-Disposition: form-data; name=\"" + fieldName + "\"; filename=\"" + fileName + "\"")
.append(LINE_FEED);
writer.append(
"Content-Type: "
+ URLConnection.guessContentTypeFromName(fileName))
writer.append("Content-Type: " + URLConnection.guessContentTypeFromName(fileName))
.append(LINE_FEED);
writer.append("Content-Transfer-Encoding: binary").append(LINE_FEED);
writer.append(LINE_FEED);
@ -110,6 +102,7 @@ public class MultipartUtility {
/**
* Adds a header field to the request.
*
* @param name - name of the header field
* @param value - value of the header field
*/
@ -120,6 +113,7 @@ public class MultipartUtility {
/**
* Completes the request and receives response from the server.
*
* @return a list of Strings as response in case the server returned
* status OK, otherwise an exception is thrown.
* @throws IOException
@ -134,8 +128,7 @@ public class MultipartUtility {
// checks server's status code first
int status = httpConn.getResponseCode();
if (status == HttpURLConnection.HTTP_OK) {
BufferedReader reader = new BufferedReader(new InputStreamReader(
httpConn.getInputStream()));
BufferedReader reader = new BufferedReader(new InputStreamReader(httpConn.getInputStream()));
String line = null;
while ((line = reader.readLine()) != null) {
response.add(line);

137
app/src/main/java/com/arialyy/simple/upload/UploadActivity.java
View File

@ -73,80 +73,85 @@ public class UploadActivity extends BaseActivity<ActivityUploadMeanBinding> {
//test();
}
private void test(){
String charset = "UTF-8";
File uploadFile1 = new File("/sdcard/Download/test.zip");
String requestURL = "http://172.18.104.50:8080/UploadActivity/sign_file";
private void test() {
//String charset = "UTF-8";
//File uploadFile1 = new File("/sdcard/Download/test.zip");
//String requestURL = "http://172.18.104.50:8080/upload/sign_file";
////String requestURL = "http://172.18.104.50:8080/greeting";
//
//try {
// MultipartUtility multipart = new MultipartUtility(requestURL, charset);
//
// //multipart.addHeaderField("Test-Header", "Header-Value");
//
// multipart.addFilePart("file", uploadFile1);
// List<String> response = multipart.finish();
//
// System.out.println("SERVER REPLIED:");
//
// for (String line : response) {
// System.out.println(line);
// }
//} catch (IOException ex) {
// System.err.println(ex);
//}
try {
MultipartUtility multipart = new MultipartUtility(requestURL, charset);
UploadEntity entity = new UploadEntity();
entity.setFilePath("/sdcard/Download/test.zip");
entity.setFileName("test.pdf");
UploadTaskEntity taskEntity = new UploadTaskEntity(entity);
taskEntity.uploadUrl = "http://172.18.104.50:8080/upload/sign_file";
taskEntity.attachment = "file";
UploadUtil util = new UploadUtil(taskEntity, new IUploadListener() {
long fileSize = 0;
//multipart.addHeaderField("Test-Header", "Header-Value");
@Override public void onPre() {
multipart.addFilePart("file", uploadFile1);
List<String> response = multipart.finish();
System.out.println("SERVER REPLIED:");
for (String line : response) {
System.out.println(line);
}
} catch (IOException ex) {
System.err.println(ex);
}
//UploadEntity entity = new UploadEntity();
//entity.setFilePath("/sdcard/Download/test.zip");
//entity.setFileName("test.pdf");
//UploadTaskEntity taskEntity = new UploadTaskEntity(entity);
//taskEntity.uploadUrl = "http://172.18.104.50:8080/UploadActivity/sign_file";
//taskEntity.attachment = "file";
//UploadUtil util = new UploadUtil(taskEntity, new IUploadListener() {
// long fileSize = 0;
//
// @Override public void onPre() {
//
// }
//
// @Override public void onStart(long fileSize) {
// this.fileSize = fileSize;
// }
//
// @Override public void onResume(long resumeLocation) {
//
// }
//
// @Override public void onStop(long stopLocation) {
//
// }
//
// @Override public void onProgress(long currentLocation) {
// int p = (int) (currentLocation * 100 / fileSize);
// mPb.setProgress(p);
// }
//
// @Override public void onCancel() {
//
// }
//
// @Override public void onComplete() {
//
// }
//
// @Override public void onFail() {
//
// }
//});
//util.start();
@Override public void onStart(long fileSize) {
this.fileSize = fileSize;
}
@Override public void onResume(long resumeLocation) {
}
@Override public void onStop(long stopLocation) {
}
@Override public void onProgress(long currentLocation) {
int p = (int) (currentLocation * 100 / fileSize);
mPb.setProgress(p);
}
@Override public void onCancel() {
}
@Override public void onComplete() {
}
@Override public void onFail() {
}
});
util.start();
}
@OnClick(R.id.upload) void upload() {
//Aria.upload(this)
// .load(FILE_PATH)
// .setUploadUrl("http://172.18.104.50:8080/upload/sign_file")
// .setAttachment("file")
// .start();
test();
Aria.upload(this)
.load(FILE_PATH)
.setUploadUrl("http://172.18.104.50:8080/upload/sign_file")
.setAttachment("file")
.start();
//new Thread(new Runnable() {
// @Override public void run() {
// test();
// }
//}).start();
}
@OnClick(R.id.stop) void stop() {