添加注释

王琳
1 parent 76084802
Showing 4 changed files with 439 additions and 375 deletions
app/src/main/java/com/cnlive/cnUploadDemo/MultiUploader.java
app/src/main/java/com/cnlive/cnUploadDemo/activity/UploadActivity.java
app/src/main/java/com/cnlive/cnUploadDemo/model/UploadFile.java
app/src/main/java/com/cnlive/cnUploadDemo/utils/UploadPartRequestFactory.java
@@ -31,6 +31,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 /**
@@ -40,389 +41,239 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 public class MultiUploader {
-    private static final String TAG = "MultiUploader";
+    final private String TAG = "MultiUploader";
-    private String bucketName;
     private String key;
     private File file;
-    private int concurrentNo = 2;
-    private long partSize = 5 * 1024 * 1024;
+    private long partSize = 5 * 1024 * 1024; // 5MB
     private String uploadId;
-    private AtomicInteger cur;
     private CNUpload cnUpload;
+    final static private int INIT_DONE = 0;
+    final static private int PARTS_DONE = 1;
+    final static private int COMPLETE_DONE = 2;
+    final static private int GET_UPLOADED_DONE = 3;
-    private static final int INIT_DONE = 0;
-    private static final int PARATS_DONE = 1;
-    private static final int COMPLETE_DONE = 2;
-    private static final int GET_UPLOADED_DONE = 3;
-    private static final int LIMIT_DONE = 4;
+    final List<CNPartETag> doneParts = Collections.synchronizedList(new ArrayList());
-    private boolean pause = false;
-    private boolean isAbortMultipartUpload = false;
-
-    List<CNPartETag> doneParts = Collections.synchronizedList(new ArrayList<CNPartETag>());
-    private List<Integer> leftParts = Collections.synchronizedList(new ArrayList<Integer>());
-    private CNCompleteMultipartUploadResponseListener multiListener;
-    private final MyHandler mHandler = new MyHandler();
-
-    private void create(CNUpload cnUpload, File file, String uploadId, long partSize) {
+    private void create(CNUpload cnUpload, String key, File file, String uploadId, long partSize) {
         this.cnUpload = cnUpload;
+        this.key = key;
         this.file = file;
         this.uploadId = uploadId;
         this.partSize = partSize;
     }
-    public MultiUploader(CNUpload cnUpload, File file, String uploadId, long partSize) {
-        this.create(cnUpload, file, uploadId, partSize);
+    public MultiUploader(CNUpload cnUpload, String key, File file, String uploadId, long partSize) {
+        create(cnUpload, key, file, uploadId, partSize);
     }
-    public MultiUploader(CNUpload cnUpload, File file, String uploadId) {
-        this.create(cnUpload, file, uploadId, this.partSize);
+    public MultiUploader(CNUpload cnUpload, String key, File file, String uploadId) {
+        create(cnUpload, key, file, uploadId, partSize);
     }
-    public MultiUploader(CNUpload cnUpload, File file) {
-        this.create(cnUpload, file, null, this.partSize);
+    public MultiUploader(CNUpload cnUpload, String key, File file) {
+        create(cnUpload, key, file, null, partSize);
     }
-    public MultiUploader(CNUpload cnUpload, File file, long partSize) {
-        this.create(cnUpload, file, null, partSize);
+    public MultiUploader(CNUpload cnUpload, String key, File file, long partSize) {
+        create(cnUpload, key, file, null, partSize);
     }
-    /**
-     * 并发传的块数，默认就是2。一般不用改。根据你自测的性能状况来调整。
-     *
-     * @param no
-     */
-    public void setConcurrentNo(int no) {
-        this.concurrentNo = no;
+    public String getKey() {
+        return key;
     }
-    public void setListener(CNCompleteMultipartUploadResponseListener listener) {
-        this.multiListener = listener;
+    public String getUploadId() {
+        return uploadId;
     }
-    public String getKey() {
-        return this.key;
+    abstract class MyUploadPartResponceHandler implements CNUploadPartResponseListener {
+        private String key;
+        private int partNo;
+        private String uploadId;
+
+        public abstract void onSuccess(int statesCode, Header[] responceHeaders, CNPartETag result, String key, int partNo, String uploadId);
+
+        public abstract void onFailure(int statesCode, UploadError error, Header[] responceHeaders, String response, Throwable throwable
+                , String key, int partNo, String uploadId);
+
+        public abstract void onTaskProgress(double progress, String key, int partNo, String uploadId);
+
+        public MyUploadPartResponceHandler(String key, int partNo, String uploadId) {
+            this.key = key;
+            this.partNo = partNo;
+            this.uploadId = uploadId;
+        }
+
+        @Override
+        public void onTaskProgress(double progress) {
+            onTaskProgress(progress, key, partNo, uploadId);
+        }
+
+        @Override
+        public void onSuccess(int statesCode, Header[] responceHeaders, CNPartETag result) {
+            onSuccess(statesCode, responceHeaders, result, key, partNo, uploadId);
+        }
+
+        @Override
+        public void onFailure(int statesCode, UploadError error, Header[] responceHeaders, String response, Throwable throwable) {
+            onFailure(statesCode, error, responceHeaders, response, throwable, key, partNo, uploadId);
+        }
     }
-    public String getUploadId() {
-        return this.uploadId;
+    private final MyHandler mHandler = new MyHandler();
+
+    class MyHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case INIT_DONE:
+                    uploadParts();
+                    break;
+                case PARTS_DONE:
+                    completeUpload();
+                    break;
+                case GET_UPLOADED_DONE:
+                    List<CNPartETag> res = (List<CNPartETag>) msg.obj;
+                    reUpload(res);
+                    break;
+                default:
+                    break;
+            }
+        }
     }
-    /**
-     * 初始化分块上传
-     *
-     * @param name               文件名
-     * @param des                描述
-     * @param userId             用户id
-     * @param filePath           文件路径
-     * @param file               图片
-     * @param isHorizontalScreen 横竖屏
-     * @param callback           回到地址
-     * @return
+    /*
+      return false, if uploadId hasbeen got
      */
-    public boolean upload(String name, String des, String userId, String filePath, File file, int isHorizontalScreen, String callback) {
-//        pause = false;
-        if (this.uploadId != null) {
-            return false;
-        } else {
-            isAbortMultipartUpload = false;
-            final CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest( key);
-            request.setCannedACL(CNCannedAccessControlList.PublicRead);
-            request.setContentType("video/mp4");
-            cnUpload.initiateMultipartUpload(request, new CNInitiateMultipartUploadResponseListener() {
-                @Override
-                public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
-                    Log.w(TAG, "init multiupload fail, statusCode = " + i, throwable);
-                }
+    public boolean upload() {
+        if (uploadId != null) return false;
+        CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest(key);
+        cnUpload.initiateMultipartUpload(request, new CNInitiateMultipartUploadResponseListener() {
+            @Override
+            public void onFailure(int statesCode, UploadError error, Header[] responceHeaders, String response, Throwable paramThrowable) {
+                Log.w(TAG, "init multiupload fail, statesCode=" + statesCode, paramThrowable);
+            }
-                @Override
-                public void onSuccess(int i, Header[] headers, CNInitiateMultipartUploadResult cnInitiateMultipartUploadResult) {
-                    uploadId = cnInitiateMultipartUploadResult.getUploadId();
-                    Log.d(TAG, "init multiupload success, uploadId = " + uploadId + ", key = " + key + " : " + cnInitiateMultipartUploadResult.getBucket() + " : " + cnInitiateMultipartUploadResult.getKey());
-                    bucketName = cnInitiateMultipartUploadResult.getBucket();
-                    key = cnInitiateMultipartUploadResult.getKey();
-                    mHandler.sendEmptyMessage(INIT_DONE);
-                }
-            });
-            return true;
-        }
+            @Override
+            public void onSuccess(int statesCode, Header[] responceHeaders, CNInitiateMultipartUploadResult result) {
+                uploadId = result.getUploadId();
+                Log.d(TAG, "init multiupload success, uploadId=" + uploadId + ",key=" + key);
+                mHandler.sendEmptyMessage(INIT_DONE);
+            }
+        });
+        return true;
     }
     private List<CNPartETag> convertPart(List<CNPart> list) {
-        ArrayList res = new ArrayList();
-        Iterator iterator = list.iterator();
-
-        while (iterator.hasNext()) {
-            CNPart part = (CNPart) iterator.next();
-            res.add(new CNPartETag(part.getPartNumber(), part.getETag()));
+        List<CNPartETag> res = new ArrayList<CNPartETag>();
+        for (CNPart p : list) {
+            res.add(new CNPartETag(p.getPartNumber(), p.getETag()));
         }
         return res;
     }
-    /**
-     * 罗列出已经上传的块
+    /*
+    Get from ks3 server. call list parts API.
      */
     public void getUploadedParts() {
-        final ArrayList res = new ArrayList();
-        CNListPartsResponseListener listener = new CNListPartsResponseListener() {
+        final List<CNPartETag> res = new ArrayList<CNPartETag>();
+        final CNListPartsResponseListener listPartsResponseHandler = new CNListPartsResponseListener() {
             @Override
-            public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
-                Log.w(TAG, "list parts, statusCode = " + i, throwable);
+            public void onFailure(int statesCode, UploadError error, Header[] responceHeaders, String response, Throwable paramThrowable) {
+                Log.w(TAG, "list parts, statesCode=" + statesCode, paramThrowable);
             }
             @Override
-            public void onSuccess(int i, Header[] headers, CNListPartsResult cnListPartsResult) {
-                res.addAll(convertPart(cnListPartsResult.getCNParts()));
-                Log.e(TAG, "getUploadedParts = " + res.size());
-                if (pause) {
-                    doneParts = res;
-                    pause = false;
-                }
-                if (!cnListPartsResult.isTruncated()) {
+            public void onSuccess(int statesCode, Header[] responceHeaders, CNListPartsResult listPartsResult) {
+                res.addAll(convertPart(listPartsResult.getCNParts()));
+                if (!listPartsResult.isTruncated())
                     mHandler.sendMessage(Message.obtain(mHandler, GET_UPLOADED_DONE, res));
-                } else {
-                    Log.e(TAG, "File size too large. You may not use phone to upload");
-                }
+                else
+                    Log.e(TAG, "File size too largs. You may not use phone to upload");
             }
         };
-        cnUpload.listParts(key, uploadId, listener);
+        cnUpload.listParts(key, uploadId, listPartsResponseHandler);
     }
-    /**
-     * 获取到还没有上传的块
-     *
-     * @param uploadedParts 已经上传的块
-     * @return
-     */
     public List<Integer> getLeftParts(List<CNPartETag> uploadedParts) {
-        ArrayList res = new ArrayList();
+        List<Integer> res = new ArrayList<Integer>();
         long start = 0L;
         int partNumber = 1;
-        HashSet set = new HashSet();
-        Iterator iterator = uploadedParts.iterator();
-
-        while (iterator.hasNext()) {
-            CNPartETag cnPartETag = (CNPartETag) iterator.next();
-            set.add(Integer.valueOf(cnPartETag.getPartNumber()));
+        Set<Integer> set = new HashSet<Integer>();
+        for (CNPartETag p : uploadedParts) {
+            set.add(p.getPartNumber());
         }
-
         while (start < file.length()) {
-            if (!set.contains(Integer.valueOf(partNumber))) {
-                res.add(Integer.valueOf(partNumber));
-            }
-            ++partNumber;
+            if (!set.contains(partNumber))
+                res.add(partNumber);
+            partNumber++;
             start += partSize;
         }
         return res;
     }
-    /**
-     * 继续上传
-     */
     public void reUpload() {
-        if (this.uploadId == null) {
+        if (uploadId == null) {
             Log.i(TAG, "no upload id, cannot reupload");
-        } else {
-            getUploadedParts();
+            return;
         }
+        getUploadedParts();
     }
-    private CNPartETag cnPartETag = new CNPartETag();
-
-    /**
-     * 开始分块上传
-     *
-     * @param startNo
-     * @param N
-     */
-    public void doWithLimit(int startNo, final int N) {
-
-        for (int i = startNo; i < startNo + concurrentNo && i < leftParts.size(); ++i) {
-//            Log.e(TAG, isPause() + " ");
-
-//            if (isPause()) {
-//                break;
-//            } else {
-            final int partNumber = ((Integer) this.leftParts.get(i)).intValue();
-            long offset = partNumber * this.partSize - partSize;
-            CNUploadPartRequest request = new CNUploadPartRequest(key, uploadId, file, offset, partNumber, Math.min(file.length() - offset, partSize));
-            request.setCannedACL(CNCannedAccessControlList.PublicReadWrite);
-            request.setContentType("video/mp4");
-            cnUpload.uploadPart(request, new MyUploadPartResponseHandler(key, partNumber, uploadId) {
+    public void reUpload(final List<CNPartETag> uploadedParts) {
+        final List<Integer> leftParts = getLeftParts(uploadedParts);
+        final int N = leftParts.size() + uploadedParts.size();
+        doneParts.addAll(uploadedParts);
+        if (leftParts.isEmpty())
+            mHandler.sendEmptyMessage(PARTS_DONE);
+        for (Integer partNumber : leftParts) {
+            long offset = partNumber * partSize - partSize;
+            CNUploadPartRequest uploadPartRequest = new CNUploadPartRequest(key, uploadId, file,
+                    offset, partNumber, Math.min(file.length() - offset, partSize));
+            cnUpload.uploadPart(uploadPartRequest, new MyUploadPartResponceHandler(key, partNumber, uploadId) {
                 @Override
-                public void onSuccess(int statusCode, Header[] responseHeaders, CNPartETag result, String key, int partNo, String uploadId) {
-                    cnPartETag = result;
+                public void onSuccess(int statesCode, Header[] responceHeaders, CNPartETag result, String key, int partNo, String uploadId) {
                     result.setPartNumber(partNo);
-                    if (!isAbortMultipartUpload)
-                        doneParts.add(result);
-                    cur.incrementAndGet();
-                    Log.e(TAG, "doneParts = " + doneParts.size() + " ,N = " + N);
-                    if (doneParts.size() >= N) {
-                        mHandler.sendEmptyMessage(PARATS_DONE);
-                    } else if (cur.get() % concurrentNo == 0) {
-                        mHandler.sendMessage(Message.obtain(mHandler, LIMIT_DONE, cur.get(), N));
-                    }
+                    doneParts.add(result);
+                    if (doneParts.size() == N)
+                        mHandler.sendEmptyMessage(PARTS_DONE);
                 }
                 @Override
-                public void onFailure(int statusCode, UploadError error, Header[] responseHeaders, String response, Throwable throwable, String key, int partNo, String uploadId) {
-                    Log.w(TAG, "upload part fail, uploadId = " + uploadId + " ,key = " + key + " ,partNo = " + partNo, throwable);
-                    if (multiListener != null) {
-                        multiListener.onFailure(statusCode, error, responseHeaders, response, throwable);
-                    }
+                public void onFailure(int statesCode, UploadError error, Header[] responceHeaders, String response, Throwable throwable,
+                                      String key, int partNo, String uploadId) {
+                    // you may record this failure info in file, database, or backend
+                    Log.w(TAG, "upload part fail, uploadId=" + uploadId + ",key=" + key + ",partNo=" + partNo, throwable);
                 }
                 @Override
-                public void onTaskProcess(double progress, String key, int partNo, String uploadId) {
-                    if (progress > 99) {
-                        Log.d(TAG, "progress : " + progress + " ,key = " + key + " ,partNo = " + partNo);
-                    }
+                public void onTaskProgress(double progress, String key, int partNo, String uploadId) {
+                    if (progress >= 99)
+                        Log.i(TAG, "progress:" + progress + ",key=" + key + ",partNo" + partNo);
                 }
             });
-//            }
         }
     }
-    /**
-     * 取消分块上传
-     */
-    public void cancelUpload() {
-        CNAbortMultipartUploadRequest request = new CNAbortMultipartUploadRequest(key, uploadId);
-        cnUpload.abortMultipartUpload(request, new CNAbortMultipartUploadResponseListener() {
-            @Override
-            public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
-                Log.e(TAG, "abortMultipart fail , stateCode = " + i, throwable);
-            }
-
-            @Override
-            public void onSuccess(int i, Header[] headers) {
-                Log.e(TAG, "abortMultipart success");
-                isAbortMultipartUpload = true;
-                if (uploadId != null) {
-                    uploadId = null;
-                }
-                if (doneParts != null) doneParts.clear();
-            }
-        });
-    }
-
-    public void reUpload(List<CNPartETag> uploadedParts) {
-        leftParts = getLeftParts(uploadedParts);
-        Log.e(TAG, "reupload uploadedParts = " + uploadedParts.size() + " , leftParts = " + leftParts.size());
-
-        int N = leftParts.size() + uploadedParts.size();
-        cur = new AtomicInteger(0);
-
-//        doneParts.addAll(uploadedParts);
-
-        if (leftParts.isEmpty()) {
-            mHandler.sendEmptyMessage(PARATS_DONE);
-        }
-        Log.e(TAG, "reupload uploadedsize = " + doneParts.size() + " ,N = " + N);
-        doWithLimit(0, N);
-    }
-
     private void uploadParts() {
         reUpload(new ArrayList<CNPartETag>());
     }
-    /**
-     * 组装上传的块
-     */
     private void completeUpload() {
-        if (multiListener == null) {
-            multiListener = new CNCompleteMultipartUploadResponseListener() {
-                @Override
-                public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
-                    Log.w(TAG, "complete upload fail, statusCode = " + i, throwable);
-                }
-
-                @Override
-                public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult completeMultipartUploadResult) {
-                    Log.i(TAG, "complete upload, key = " + key + ", bucketName = " + bucketName + " , uploadId = " + uploadId + "\n" + completeMultipartUploadResult.toString());
-
-                }
-            };
-        }
-        CNCompleteMultipartUploadRequest request = new CNCompleteMultipartUploadRequest(bucketName, key);
-        request.setContentType("video/mp4");
-        request.setCNPartETags(doneParts);
-        request.setUploadId(uploadId);
-        cnUpload.completeMultipartUpload(request, multiListener);
-    }
-
-    class MyHandler extends Handler {
-        MyHandler() {
-
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case INIT_DONE:
-                    uploadParts();
-                    break;
-                case PARATS_DONE:
-                    completeUpload();
-                    break;
-                case COMPLETE_DONE:
-                default:
-                    break;
-                case GET_UPLOADED_DONE:
-                    List res = (List) msg.obj;
-                    reUpload(res);
-                    break;
-                case LIMIT_DONE:
-                    int no = msg.arg1;
-                    int N = msg.arg2;
-                    doWithLimit(no, N);
-                    break;
+        cnUpload.completeMultipartUpload(key, uploadId, doneParts, new CNCompleteMultipartUploadResponseListener() {
+            @Override
+            public void onFailure(int statesCode, UploadError error, Header[] responceHeaders, String response, Throwable paramThrowable) {
+                Log.w(TAG, "complete upload fail, statusCode=" + statesCode, paramThrowable);
             }
-        }
-    }
-
-    abstract class MyUploadPartResponseHandler implements CNUploadPartResponseListener {
-        private String key;
-        private int partNo;
-        private String uploadId;
-
-        public abstract void onSuccess(int statusCode, Header[] responseHeaders, CNPartETag result, String key, int partNo, String uploadId);
-
-        public abstract void onFailure(int statusCode, UploadError error, Header[] responseHeaders, String response, Throwable throwable, String key, int partNo, String uploadId);
-
-        public abstract void onTaskProcess(double progress, String key, int partNo, String uploadId);
-        public MyUploadPartResponseHandler(String key, int partNo, String uploadId) {
-            this.key = key;
-            this.partNo = partNo;
-            this.uploadId = uploadId;
-        }
-
-        @Override
-        public void onTaskProgress(double v) {
-            this.onTaskProcess(v, this.key, this.partNo, this.uploadId);
-        }
-
-        @Override
-        public void onSuccess(int i, Header[] headers, CNPartETag cnPartETag) {
-            this.onSuccess(i, headers, cnPartETag, this.key, this.partNo, this.uploadId);
-        }
-
-        @Override
-        public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
-            this.onFailure(i, uploadError, headers, s, throwable, this.key, this.partNo, this.uploadId);
-        }
+            @Override
+            public void onSuccess(int statesCode, Header[] responceHeaders, CNCompleteMultipartUploadResult result) {
+                Log.i(TAG, "complete upload, key=" + key);
+            }
+        });
     }
-//    public boolean isPause() {
-//        return pause;
-//    }
-
-//    public void setPause(boolean pause) {
-//        this.pause = pause;
-//    }
-
     /**
      * 此暂停方法，会立即暂停，继续上传时，当前块重新上传
      * 也可以通过不上传下一块的方法暂停上传
@@ -431,6 +282,5 @@ public class MultiUploader {
      */
     public void pause(Context context) {
         cnUpload.pause(context);
-        pause = true;
     }
 }
@@ -97,6 +97,11 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
         switchDir(Environment.getExternalStorageDirectory());
     }
+    /**
+     * 选择文件
+     *
+     * @param dir 文件
+     */
     private void switchDir(File dir) {
         if (dir == null || !dir.exists() || dir.isFile())
             throw new IllegalArgumentException("illegal dir");
@@ -152,8 +157,11 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
         return super.onKeyDown(keyCode, event);
     }
+
     /**
      * 上传操作，如果大于16MB，则使用分块上传
+     *
+     * @param item 自定义文件对象
      */
     private void doUpload(final UploadFile item) {
         if (item.file == null) {
@@ -178,7 +186,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     /**
      * 单块上传
      *
-     * @param item
+     * @param item 自定义文件对象
      */
     private void doSingleUpload(final UploadFile item) {
@@ -189,9 +197,16 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
         //设置上传的文件的内容类型
         request.setContentType("video/mp4");
         cnUpload.putObject(request, new CNPutObjectResponseListener() {
+            /**
+             * 上传失败
+             * @param i Http请求返回的状态码，200表示请求成功，400表示客户端请求错误，403表示签名错误或本地日期时间错误
+             * @param uploadError 失败时返回的实体类，包含errorCode、errorMessage、serverError
+             * @param headers Http请求响应报头
+             * @param s 失败时返回的响应正文
+             * @param throwable 出错时抛出的异常
+             */
             @Override
             public void onTaskFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
-                //失败
                 Log.d(TAG, uploadError.getErrorMessage() + " : " + s + " : " + i);
                 List<UploadFile> uploadFiles = dataSource.get(currentDir
                         .getPath());
@@ -205,16 +220,22 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                 myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
             }
+            /**
+             * 上传成功
+             * @param i Http请求返回的状态码
+             * @param headers Http请求响应报头
+             */
             @Override
             public void onTaskSuccess(int i, Header[] headers) {
-                //上传成功
                 Log.i(TAG, "single upload success");
                 getUploadedUrl();
             }
+            /**
+             * 上传开始
+             */
             @Override
             public void onTaskStart() {
-                //上传开始
                 List<UploadFile> uploadFiles = dataSource.get(currentDir
                         .getPath());
                 for (UploadFile file : uploadFiles) {
@@ -229,9 +250,11 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                 myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
             }
+            /**
+             * 上传结束 包括上传成功结束与上传失败结束
+             */
             @Override
             public void onTaskFinish() {
-                //上传结束 包括上传成功结束与上传失败结束
                 List<UploadFile> uploadFiles = dataSource.get(currentDir
                         .getPath());
                 for (UploadFile file : uploadFiles) {
@@ -246,15 +269,20 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                 myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
             }
+            /**
+             * 上传取消
+             */
             @Override
             public void onTaskCancel() {
-                //上传取消
                 Log.d(TAG, "single upload cancel");
             }
+            /**
+             * 上传进度
+             * @param v 返回上传进度
+             */
             @Override
             public void onTaskProgress(double v) {
-                //上传进度
                 List<UploadFile> uploadFiles = dataSource.get(currentDir.getPath());
                 for (UploadFile file : uploadFiles) {
                     if (file.file.getPath().equalsIgnoreCase(item.file.getPath())) {
@@ -272,7 +300,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     /**
      * 初始化分块上传
      *
-     * @param item
+     * @param item 自定义文件对象
      */
     private void doMultipartUpload(final UploadFile item) {
@@ -283,6 +311,14 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
         //设置bucket权限
         request.setCannedACL(CNCannedAccessControlList.PublicRead);
         cnUpload.initiateMultipartUpload(request, new CNInitiateMultipartUploadResponseListener() {
+            /**
+             *
+             * @param i Http请求返回的状态码，200表示请求成功，400表示客户端请求错误，403表示签名错误或本地日期时间错误
+             * @param uploadError 失败时返回的实体类，包含errorCode、errorMessage、serverError
+             * @param headers Http请求响应报头
+             * @param s 失败时返回的响应正文
+             * @param throwable 出错时抛出的异常
+             */
             @Override
             public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
                 //初始化多块上传失败
@@ -298,6 +334,12 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                 myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
             }
+            /**
+             * 初始化多块上传成功
+             * @param i Http请求返回的状态码
+             * @param headers Http请求响应报头
+             * @param cnInitiateMultipartUploadResult 初始化分块上传结果实体类，包含bucketName、objectKey、uploadId（分块上传的文件的标识）信息等
+             */
             @Override
             public void onSuccess(int i, Header[] headers, CNInitiateMultipartUploadResult cnInitiateMultipartUploadResult) {
                 //初始化多块上传成功
@@ -319,6 +361,12 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     UploadPartRequestFactory localUploadPartRequestFactory;
+    /**
+     * 上传分块
+     *
+     * @param initResult 初始化分块上传后获得的result，包含bucketName、objectKey、uploadId
+     * @param item       自定义文件对象
+     */
     private void beginMultiUpload(CNInitiateMultipartUploadResult initResult,
                                   UploadFile item) {
         localUploadPartRequestFactory = new UploadPartRequestFactory(
@@ -336,8 +384,8 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     /**
      * 上传分块
      *
-     * @param requestFactory
-     * @param item
+     * @param requestFactory UploadPartRequest工厂，用于分块上传操作
+     * @param item           自定义文件对象
      */
     private void uploadpart(final UploadPartRequestFactory requestFactory, final UploadFile item) {
         if (requestFactory.hasMoreRequests()) {
@@ -345,6 +393,12 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
             cnUpload.uploadPart(request, new CNUploadPartResponseListener() {
                 double progressInFile = 0;
+                /**
+                 * 上传分块成功
+                 * @param i Http请求返回的状态码
+                 * @param headers Http请求响应报头
+                 * @param cnPartETag
+                 */
                 @Override
                 public void onSuccess(int i, Header[] headers, CNPartETag cnPartETag) {
                     //上传分块成功
@@ -357,6 +411,14 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                     myHandler.sendMessage(message);
                 }
+                /**
+                 * 上传分块失败
+                 * @param i Http请求返回的状态码，200表示请求成功，400表示客户端请求错误，403表示签名错误或本地日期时间错误
+                 * @param uploadError 失败时返回的实体类，包含errorCode、errorMessage、serverError
+                 * @param headers Http请求响应报头
+                 * @param s 失败时返回的响应正文
+                 * @param throwable 出错时抛出的异常
+                 */
                 @Override
                 public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
                     //上传分块失败
@@ -374,6 +436,10 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                     myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
                 }
+                /**
+                 * 上传分块的进度
+                 * @param v  上传分块的进度
+                 */
                 @Override
                 public void onTaskProgress(double v) {
                     //上传分块进度
@@ -415,14 +481,22 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     /**
      * 罗列出已经上传的块
      *
-     * @param request
-     * @param item
+     * @param request 请求封装类，应包含uploadId，
+     *                上传的文件及其指定offset和size信息
+     * @param item    自定义文件对象
      */
     private void listParts(CNListPartsRequest request, final UploadFile item) {
         cnUpload.listParts(request, new CNListPartsResponseListener() {
+            /**
+             * 罗列已经上传的分块失败
+             * @param i Http请求返回的状态码，200表示请求成功，400表示客户端请求错误，403表示签名错误或本地日期时间错误
+             * @param uploadError 失败时返回的实体类，包含errorCode、errorMessage、serverError
+             * @param headers Http请求响应报头
+             * @param s 失败时返回的响应正文
+             * @param throwable 出错时抛出的异常
+             */
             @Override
             public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
-                //罗列已经上传的分块失败
                 List<UploadFile> uploadFiles = dataSource.get(currentDir
                         .getPath());
                 for (UploadFile file : uploadFiles) {
@@ -435,9 +509,14 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                 myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
             }
+            /**
+             *罗列已经上传的分块成功
+             * @param i Http请求返回的状态码
+             * @param headers Http请求响应报头
+             * @param cnListPartsResult 成功时返回CNListPartsResult结果实体类,包含CNOwner及一个Parts容器类
+             */
             @Override
             public void onSuccess(int i, Header[] headers, CNListPartsResult cnListPartsResult) {
-                //罗列已经上传的分块成功
                 Message message = myHandler.obtainMessage();
                 message.what = LIST_PART_FINISH;
                 message.obj = cnListPartsResult;
@@ -452,11 +531,20 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     /**
      * 完成分块上传，组装上传的分块
      *
-     * @param request
-     * @param item
+     * @param request 请求封装类，应包含uploadId，
+     *                上传的文件及其指定offset和size信息
+     * @param item    自定义文件对象
      */
     private void completeUploadPart(CNCompleteMultipartUploadRequest request, final UploadFile item) {
         cnUpload.completeMultipartUpload(request, new CNCompleteMultipartUploadResponseListener() {
+            /**
+             * 组装上传的分块失败
+             * @param i Http请求返回的状态码，200表示请求成功，400表示客户端请求错误，403表示签名错误或本地日期时间错误
+             * @param uploadError 失败时返回的实体类，包含errorCode、errorMessage、serverError
+             * @param headers Http请求响应报头
+             * @param s 失败时返回的响应正文
+             * @param throwable 出错时抛出的异常
+             */
             @Override
             public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
                 List<UploadFile> uploadFiles = dataSource
@@ -473,6 +561,13 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                 myHandler.sendEmptyMessage(0);
             }
+            /**
+             *
+             * @param i Http请求返回的状态码
+             * @param headers Http请求响应报头
+             * @param cnCompleteMultipartUploadResult 成功时返回结果实体类，包含上传的文件的基本信息（objectKey、uploadId等）
+
+             */
             @Override
             public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult cnCompleteMultipartUploadResult) {
                 List<UploadFile> uploadFiles = dataSource
@@ -493,15 +588,29 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     /**
      * 取消分块上传
+     * 取消后下一次需要重新上传
      */
     private void abortMultiUpload() {
         CNAbortMultipartUploadRequest request = new CNAbortMultipartUploadRequest(localUploadPartRequestFactory.getObjectKey(), localUploadPartRequestFactory.getUploadId());
         cnUpload.abortMultipartUpload(request, new CNAbortMultipartUploadResponseListener() {
+            /**
+             * 取消分块上传失败
+             * @param i Http请求返回的状态码，200表示请求成功，400表示客户端请求错误，403表示签名错误或本地日期时间错误
+             * @param uploadError 失败时返回的实体类，包含errorCode、errorMessage、serverError
+             * @param headers Http请求响应报头
+             * @param s 失败时返回的响应正文
+             * @param throwable 出错时抛出的异常
+             */
             @Override
             public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
                 Toast.makeText(UploadActivity.this, "取消分块上传失败", Toast.LENGTH_SHORT).show();
             }
+            /**
+             * 取消分块上传成功
+             * @param i Http请求返回的状态码
+             * @param headers Http请求响应报头
+             */
             @Override
             public void onSuccess(int i, Header[] headers) {
                 Toast.makeText(UploadActivity.this, "取消分块上传成功", Toast.LENGTH_SHORT).show();
@@ -532,6 +641,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                     requestFactory = (UploadPartRequestFactory) bundle
                             .get("requestFactory");
                     item = (UploadFile) bundle.get("uploadFile");
+                    //上传分块
                     uploadpart(requestFactory, item);
                     break;
                 case UPLOAD_PART_FINISH:
@@ -540,8 +650,10 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                             .get("requestFactory");
                     item = (UploadFile) bundle.get("uploadFile");
                     CNListPartsRequest listRequest = new CNListPartsRequest(
-                            requestFactory.getObjectKey(),
-                            requestFactory.getUploadId());
+                            requestFactory.getObjectKey(),//指定的object键
+                            requestFactory.getUploadId() //初始化多块上传得到的uploadId
+                    );
+                    //罗列已上传的块
                     listParts(listRequest, item);
                     break;
                 case LIST_PART_FINISH:
@@ -550,6 +662,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                     item = (UploadFile) bundle.get("uploadFile");
                     CNCompleteMultipartUploadRequest comRequest = new CNCompleteMultipartUploadRequest(
                             listResult);
+                    //组装分块
                     completeUploadPart(comRequest, item);
                     break;
                 default:
@@ -571,7 +684,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
         cnUpload.getUploadedUrlInfo(objectKey, FileType.COMMON_FILE, new OnUploadedUrlInfoListener() {
             /**
              * 返回资源路径
-             * @param s
+             * @param s 资源路径
              */
             @Override
             public void onSuccess(String s) {
@@ -580,8 +693,8 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
             /**
              * 返回错误信息
-             * @param s
-             * @param s1
+             * @param s 返回errorCode
+             * @param s1 返回errorMessage
              */
             @Override
             public void onError(String s, String s1) {
@@ -7,26 +7,95 @@ import java.io.Serializable;
 /**
  * Created by Lynn on 2017/8/10.
+ * 自定义文件对象
  */
 public class UploadFile implements Serializable {
     public static final long serialVersionUID = 1L;
+
+    /**
+     * 文件上传未开始
+     */
     public static final int STATUS_NOT_START = 0;
+
+    /**
+     * 准备上传
+     */
     public static final int STATUS_STARTED = 1;
+
+    /**
+     * 上传中
+     */
     public static final int STATUS_UPLOADING = 2;
+
+    /**
+     * 初始化完成
+     */
     public static final int STATUS_INIT = 3;
+
+    /**
+     * 分块上传
+     */
     public static final int STATUS_UPLOADPART = 4;
+
+    /**
+     * 获取上传的快
+     */
     public static final int STATUS_LISTING = 5;
+
+    /**
+     * 合并完成
+     */
     public static final int STATUS_COMPLETE = 6;
+
+    /**
+     * 完成上传
+     */
     public static final int STATUS_FINISH = 7;
+
+    /**
+     * 上传失败
+     */
     public static final int STATUS_FAIL = 8;
+
+    /**
+     * 上传失败
+     */
     public static final int STATUS_INIT_FAIL = 9;
+
+    /**
+     * 分块上传失败
+     */
     public static final int STATUS_UPLOADPART_FAIL = 10;
+
+    /**
+     * 获取块失败
+     */
     public static final int STATUS_LISTING_FAIL = 11;
+
+    /**
+     * 文件合并失败
+     */
     public static final int STATUS_COMPLETE_FAIL = 12;
+
+    /**
+     * 文件icon
+     */
     public Drawable icon;
+
+    /**
+     * 文件
+     */
     public File file;
+
+    /**
+     * 上传进度
+     */
     public int progress;
+
+    /**
+     * 上传状态
+     */
     public int status;
     @Override
@@ -6,62 +6,94 @@ import java.io.File;
 import java.io.Serializable;
 /**
- *
  * UploadPartRequest工厂，用于分块上传操作
- *
  */
-public class UploadPartRequestFactory implements Serializable{
-	private static final long serialVersionUID = 1L;
-	private String key;
-	private String uploadId;
-	private File file;
-	public int partNumber = 1;
-	private long offset = 0L;
-	private long remainingBytes;
-	public long partSize ;
-	private long uploadedSize;
-	
-	public UploadPartRequestFactory(String objectKey ,  String uploadId , File file , long partSize ) {
-		this.uploadId = uploadId;
-		this.key = objectKey;
-		this.file = file;
-		this.remainingBytes = file.length();
-		this.partSize = partSize;
-		this.partNumber = 1;
-		this.uploadedSize = 0;
-	}
-
-	public synchronized boolean hasMoreRequests() {
-		return this.remainingBytes > 0L;
-	}
-
-	// 计算下一个UploadPartRequest配置参数，并返回对象
-	public synchronized CNUploadPartRequest getNextUploadPartRequest() {
-		boolean bool = this.remainingBytes - this.partSize <= 0L;
-		CNUploadPartRequest localUploadPartRequest = null;
-		uploadedSize = file.length() - this.remainingBytes ;
-		localUploadPartRequest = new CNUploadPartRequest( key,uploadId, file, offset, partNumber++, partSize);
-		this.offset += partSize;
-		this.remainingBytes -= partSize;
-		localUploadPartRequest.setLastPart(bool);
-		return localUploadPartRequest;
-	}	
-	
-	
-	public synchronized long getUploadedSize (){
-		return this.uploadedSize;
-	}
-	
-	public synchronized File getFile(){
-		return this.file;
-	}
-	
-	public synchronized String getUploadId(){
-		return this.uploadId;
-	}
-
-	public synchronized String getObjectKey() {
-		return this.key;
-	}
-	
+public class UploadPartRequestFactory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 指定的Object键
+     */
+    private String key;
+
+    /**
+     * 初始化时得到的uploadId
+     */
+    private String uploadId;
+
+    /**
+     * 需要上传的file
+     */
+    private File file;
+
+    /**
+     * 此分块是第几块
+     */
+    public int partNumber = 1;
+
+    /**
+     * 此分块在文件中内容的起始位置
+     */
+    private long offset = 0L;
+
+    /**
+     * 剩余大小
+     */
+    private long remainingBytes;
+
+    /**
+     * 此分块的大小，单位为Byte
+     */
+    public long partSize;
+
+    /**
+     * 已经上传大小
+     */
+    private long uploadedSize;
+
+    public UploadPartRequestFactory(String objectKey, String uploadId, File file, long partSize) {
+        this.uploadId = uploadId;
+        this.key = objectKey;
+        this.file = file;
+        this.remainingBytes = file.length();
+        this.partSize = partSize;
+        this.partNumber = 1;
+        this.uploadedSize = 0;
+    }
+
+    public synchronized boolean hasMoreRequests() {
+        return this.remainingBytes > 0L;
+    }
+
+    // 计算下一个UploadPartRequest配置参数，并返回对象
+    public synchronized CNUploadPartRequest getNextUploadPartRequest() {
+        boolean bool = this.remainingBytes - this.partSize <= 0L;
+        CNUploadPartRequest localUploadPartRequest = null;
+        uploadedSize = file.length() - this.remainingBytes;
+
+        localUploadPartRequest = new CNUploadPartRequest(key, uploadId, file, offset, partNumber++, partSize);
+
+        this.offset += partSize;
+        this.remainingBytes -= partSize;
+        localUploadPartRequest.setLastPart(bool);
+        return localUploadPartRequest;
+    }
+
+
+    public synchronized long getUploadedSize() {
+        return this.uploadedSize;
+    }
+
+    public synchronized File getFile() {
+        return this.file;
+    }
+
+    public synchronized String getUploadId() {
+        return this.uploadId;
+    }
+
+    public synchronized String getObjectKey() {
+        return this.key;
+    }
+
 }