bug fix

.idea/misc.xml

@@ -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">

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

@@ -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);

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

@@ -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);

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

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

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

@@ -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(URLConnection.guessContentTypeFromName(mTaskEntity.uploadEntity.getFileName()))
-        .append(mTaskEntity.contentType)
         .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();

Aria/src/main/java/com/arialyy/aria/util/MultipartUtility.java

@@ -1,7 +1,7 @@
 package com.arialyy.aria.util;
 
 import java.io.BufferedReader;
- 
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -14,138 +14,131 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
 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;
+  private final String boundary;
-    private static final String LINE_FEED = "\r\n";
+  private static final String LINE_FEED = "\r\n";
-    private HttpURLConnection httpConn;
+  private HttpURLConnection httpConn;
-    private String charset;
+  private String charset;
-    private OutputStream outputStream;
+  private OutputStream outputStream;
-    private PrintWriter writer;
+  private PrintWriter writer;
- 
+
-    /**
+  /**
-     * This constructor initializes a new HTTP POST request with content type
+   * This constructor initializes a new HTTP POST request with content type
-     * is set to multipart/form-data
+   * is set to multipart/form-data
-     * @param requestURL
+   *
-     * @param charset
+   * @throws IOException
-     * @throws IOException
+   */
-     */
+  public MultipartUtility(String requestURL, String charset) throws IOException {
-    public MultipartUtility(String requestURL, String charset)
+    this.charset = charset;
-            throws IOException {
+
-        this.charset = charset;
+    // creates a unique boundary based on time stamp
-         
+    boundary = "===" + System.currentTimeMillis() + "===";
-        // creates a unique boundary based on time stamp
+
-        boundary = "===" + System.currentTimeMillis() + "===";
+    URL url = new URL(requestURL);
-         
+    httpConn = (HttpURLConnection) url.openConnection();
-        URL url = new URL(requestURL);
+    httpConn.setUseCaches(false);
-        httpConn = (HttpURLConnection) url.openConnection();
+    httpConn.setDoOutput(true); // indicates POST method
-        httpConn.setUseCaches(false);
+    httpConn.setDoInput(true);
-        httpConn.setDoOutput(true); // indicates POST method
+    httpConn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
-        httpConn.setDoInput(true);
+    //httpConn.setRequestProperty("User-Agent", "CodeJava Agent");
-        httpConn.setRequestProperty("Content-Type",
+    //httpConn.setRequestProperty("Test", "Bonjour");
-                "multipart/form-data; boundary=" + boundary);
+    outputStream = httpConn.getOutputStream();
-        //httpConn.setRequestProperty("User-Agent", "CodeJava Agent");
+    writer = new PrintWriter(new OutputStreamWriter(outputStream, charset), true);
-        //httpConn.setRequestProperty("Test", "Bonjour");
+  }
-        outputStream = httpConn.getOutputStream();
+
-        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(LINE_FEED);
+    writer.append(value).append(LINE_FEED);
+    writer.flush();
+  }
+
+  /**
+   * 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 {
+    String fileName = uploadFile.getName();
+    writer.append("--" + boundary).append(LINE_FEED);
+    writer.append(
+        "Content-Disposition: form-data; name=\"" + fieldName + "\"; filename=\"" + fileName + "\"")
+        .append(LINE_FEED);
+    writer.append("Content-Type: " + URLConnection.guessContentTypeFromName(fileName))
+        .append(LINE_FEED);
+    writer.append("Content-Transfer-Encoding: binary").append(LINE_FEED);
+    writer.append(LINE_FEED);
+    writer.flush();
+
+    FileInputStream inputStream = new FileInputStream(uploadFile);
+    byte[] buffer = new byte[4096];
+    int bytesRead = -1;
+    while ((bytesRead = inputStream.read(buffer)) != -1) {
+      outputStream.write(buffer, 0, bytesRead);
     }
- 
+    outputStream.flush();
-    /**
+    inputStream.close();
-     * Adds a form field to the request
+
-     * @param name field name
+    writer.append(LINE_FEED);
-     * @param value field value
+    writer.flush();
-     */
+  }
-    public void addFormField(String name, String value) {
+
-        writer.append("--" + boundary).append(LINE_FEED);
+  /**
-        writer.append("Content-Disposition: form-data; name=\"" + name + "\"")
+   * Adds a header field to the request.
-                .append(LINE_FEED);
+   *
-        writer.append("Content-Type: text/plain; charset=" + charset).append(
+   * @param name - name of the header field
-                LINE_FEED);
+   * @param value - value of the header field
-        writer.append(LINE_FEED);
+   */
-        writer.append(value).append(LINE_FEED);
+  public void addHeaderField(String name, String value) {
-        writer.flush();
+    writer.append(name + ": " + value).append(LINE_FEED);
-    }
+    writer.flush();
- 
+  }
-    /**
+
-     * Adds a upload file section to the request
+  /**
-     * @param fieldName name attribute in <input type="file" name="..." />
+   * Completes the request and receives response from the server.
-     * @param uploadFile a File to be uploaded
+   *
-     * @throws IOException
+   * @return a list of Strings as response in case the server returned
-     */
+   * status OK, otherwise an exception is thrown.
-    public void addFilePart(String fieldName, File uploadFile)
+   * @throws IOException
-            throws IOException {
+   */
-        String fileName = uploadFile.getName();
+  public List<String> finish() throws IOException {
-        writer.append("--" + boundary).append(LINE_FEED);
+    List<String> response = new ArrayList<String>();
-        writer.append(
+
-                "Content-Disposition: form-data; name=\"" + fieldName
+    writer.append(LINE_FEED).flush();
-                        + "\"; filename=\"" + fileName + "\"")
+    writer.append("--" + boundary + "--").append(LINE_FEED);
-                .append(LINE_FEED);
+    writer.close();
-        writer.append(
+
-                "Content-Type: "
+    // checks server's status code first
-                        + URLConnection.guessContentTypeFromName(fileName))
+    int status = httpConn.getResponseCode();
-                .append(LINE_FEED);
+    if (status == HttpURLConnection.HTTP_OK) {
-        writer.append("Content-Transfer-Encoding: binary").append(LINE_FEED);
+      BufferedReader reader = new BufferedReader(new InputStreamReader(httpConn.getInputStream()));
-        writer.append(LINE_FEED);
+      String line = null;
-        writer.flush();
+      while ((line = reader.readLine()) != null) {
- 
+        response.add(line);
-        FileInputStream inputStream = new FileInputStream(uploadFile);
+      }
-        byte[] buffer = new byte[4096];
+      reader.close();
-        int bytesRead = -1;
+      httpConn.disconnect();
-        while ((bytesRead = inputStream.read(buffer)) != -1) {
+    } else {
-            outputStream.write(buffer, 0, bytesRead);
+      throw new IOException("Server returned non-OK status: " + status);
-        }
-        outputStream.flush();
-        inputStream.close();
-         
-        writer.append(LINE_FEED);
-        writer.flush();    
-    }
- 
-    /**
-     * Adds a header field to the request.
-     * @param name - name of the header field
-     * @param value - value of the header field
-     */
-    public void addHeaderField(String name, String value) {
-        writer.append(name + ": " + value).append(LINE_FEED);
-        writer.flush();
-    }
-     
-    /**
-     * 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
-     */
-    public List<String> finish() throws IOException {
-        List<String> response = new ArrayList<String>();
- 
-        writer.append(LINE_FEED).flush();
-        writer.append("--" + boundary + "--").append(LINE_FEED);
-        writer.close();
- 
-        // checks server's status code first
-        int status = httpConn.getResponseCode();
-        if (status == HttpURLConnection.HTTP_OK) {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(
-                    httpConn.getInputStream()));
-            String line = null;
-            while ((line = reader.readLine()) != null) {
-                response.add(line);
-            }
-            reader.close();
-            httpConn.disconnect();
-        } else {
-            throw new IOException("Server returned non-OK status: " + status);
-        }
- 
-        return response;
     }
+
+    return response;
+  }
 }

app/src/main/java/com/arialyy/simple/upload/UploadActivity.java

@@ -73,80 +73,85 @@ public class UploadActivity extends BaseActivity<ActivityUploadMeanBinding> {
     //test();
   }
 
-  private void test(){
+  private void test() {
-    String charset = "UTF-8";
+    //String charset = "UTF-8";
-    File uploadFile1 = new File("/sdcard/Download/test.zip");
+    //File uploadFile1 = new File("/sdcard/Download/test.zip");
-    String requestURL = "http://172.18.104.50:8080/UploadActivity/sign_file";
+    //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 {
+    UploadEntity entity = new UploadEntity();
-      MultipartUtility multipart = new MultipartUtility(requestURL, charset);
+    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();
+      @Override public void onStart(long fileSize) {
-    //entity.setFilePath("/sdcard/Download/test.zip");
+        this.fileSize = fileSize;
-    //entity.setFileName("test.pdf");
+      }
-    //UploadTaskEntity taskEntity = new UploadTaskEntity(entity);
+
-    //taskEntity.uploadUrl = "http://172.18.104.50:8080/UploadActivity/sign_file";
+      @Override public void onResume(long resumeLocation) {
-    //taskEntity.attachment = "file";
+
-    //UploadUtil util = new UploadUtil(taskEntity, new IUploadListener() {
+      }
-    //  long fileSize = 0;
+
-    //
+      @Override public void onStop(long stopLocation) {
-    //  @Override public void onPre() {
+
-    //
+      }
-    //  }
+
-    //
+      @Override public void onProgress(long currentLocation) {
-    //  @Override public void onStart(long fileSize) {
+        int p = (int) (currentLocation * 100 / fileSize);
-    //    this.fileSize = fileSize;
+        mPb.setProgress(p);
-    //  }
+      }
-    //
+
-    //  @Override public void onResume(long resumeLocation) {
+      @Override public void onCancel() {
-    //
+
-    //  }
+      }
-    //
+
-    //  @Override public void onStop(long stopLocation) {
+      @Override public void onComplete() {
-    //
+
-    //  }
+      }
-    //
+
-    //  @Override public void onProgress(long currentLocation) {
+      @Override public void onFail() {
-    //    int p = (int) (currentLocation * 100 / fileSize);
+
-    //    mPb.setProgress(p);
+      }
-    //  }
+    });
-    //
+    util.start();
-    //  @Override public void onCancel() {
-    //
-    //  }
-    //
-    //  @Override public void onComplete() {
-    //
-    //  }
-    //
-    //  @Override public void onFail() {
-    //
-    //  }
-    //});
-    //util.start();
   }
 
   @OnClick(R.id.upload) void upload() {
-    //Aria.upload(this)
+    Aria.upload(this)
-    //    .load(FILE_PATH)
+        .load(FILE_PATH)
-    //    .setUploadUrl("http://172.18.104.50:8080/upload/sign_file")
+        .setUploadUrl("http://172.18.104.50:8080/upload/sign_file")
-    //    .setAttachment("file")
+        .setAttachment("file")
-    //    .start();
+        .start();
-    test();
+    //new Thread(new Runnable() {
+    //  @Override public void run() {
+    //    test();
+    //  }
+    //}).start();
   }
 
   @OnClick(R.id.stop) void stop() {