更新SDK，删除获取bucketName方法，增加初始化上传SDK方法

王琳
1 parent 0258382d
Showing 7 changed files with 81 additions and 38 deletions
app/build.gradle
app/src/main/java/com/cnlive/cnUploadDemo/Config.java
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/app/MyApplication.java
app/src/main/java/com/cnlive/cnUploadDemo/utils/UploadPartRequestFactory.java
lib/libcnliveupload.jar
@@ -24,5 +24,5 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:26.+'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.cnlive:lib_upload:2.0.1'
+    compile 'com.cnlive:lib_upload:2.0.2'
 }
@@ -5,6 +5,8 @@ package com.cnlive.cnUploadDemo;
  */
 public class Config {
+    //设置分块大小
     public static final long PART_SIZE = 5 * 1024 * 1024;
+    //设置文件最大值，如果超过则分块上传
     public static final long MULTI_UPLOAD_THREADHOLD = 16 * 1024 * 1024;
 }
@@ -127,7 +127,7 @@ public class MultiUploader {
             return false;
         } else {
             isAbortMultipartUpload = false;
-            final CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest(bucketName, key);
+            final CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest( key);
             request.setCannedACL(CNCannedAccessControlList.PublicRead);
             request.setContentType("video/mp4");
             cnUpload.initiateMultipartUpload(request, new CNInitiateMultipartUploadResponseListener() {
@@ -186,7 +186,7 @@ public class MultiUploader {
                 }
             }
         };
-        cnUpload.listParts(bucketName, key, uploadId, listener);
+        cnUpload.listParts(key, uploadId, listener);
     }
     /**
@@ -246,7 +246,7 @@ public class MultiUploader {
 //            } else {
             final int partNumber = ((Integer) this.leftParts.get(i)).intValue();
             long offset = partNumber * this.partSize - partSize;
-            CNUploadPartRequest request = new CNUploadPartRequest(bucketName, key, uploadId, file, offset, partNumber, Math.min(file.length() - offset, 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) {
@@ -288,7 +288,7 @@ public class MultiUploader {
      * 取消分块上传
      */
     public void cancelUpload() {
-        CNAbortMultipartUploadRequest request = new CNAbortMultipartUploadRequest(bucketName, key, uploadId);
+        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) {
@@ -27,6 +27,7 @@ import com.cnlive.libs.upload.listener.CNInitiateMultipartUploadResponseListener
 import com.cnlive.libs.upload.listener.CNListPartsResponseListener;
 import com.cnlive.libs.upload.listener.CNPutObjectResponseListener;
 import com.cnlive.libs.upload.listener.CNUploadPartResponseListener;
+import com.cnlive.libs.upload.model.CNObjectMetadata;
 import com.cnlive.libs.upload.model.CNPartETag;
 import com.cnlive.libs.upload.model.UploadError;
 import com.cnlive.libs.upload.model.acl.CNCannedAccessControlList;
@@ -40,6 +41,7 @@ import com.cnlive.libs.upload.services.CNListPartsRequest;
 import com.cnlive.libs.upload.services.CNPutObjectRequest;
 import com.cnlive.libs.upload.services.CNUploadPartRequest;
 import com.cnlive.libs.upload.upload.CNUpload;
+import com.cnlive.libs.upload.upload.callback.OnInitListener;
 import com.cnlive.libs.upload.upload.callback.OnUploadedUrlInfoListener;
 import com.cnlive.libs.upload.upload.network.model.FileType;
@@ -71,6 +73,8 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     private String objectKey;
+    private boolean initSuccess;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -82,7 +86,10 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     }
     private void setup() {
+        //实例化上传
         cnUpload = new CNUpload(this);
+        //初始化上传
+        cnUpload.initCNUpload(onInitListener);
         dataSource = new HashMap<String, List<UploadFile>>();
         adapter = new FileAdapter(UploadActivity.this, null);
         listView.setOnItemClickListener(UploadActivity.this);
@@ -148,15 +155,23 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     /**
      * 上传操作，如果大于16MB，则使用分块上传
      */
-    private void doUpload(UploadFile item) {
+    private void doUpload(final UploadFile item) {
         if (item.file == null) {
             throw new IllegalArgumentException("file can not be null");
         }
+        if (!initSuccess) {
+            return;
+        }
+
         if (item.file.length() >= Config.MULTI_UPLOAD_THREADHOLD) {
+
+            //多块上传 当文件超过一定的大小后，SDK内部会根据APP设置的分块大小对文件进行分块，然后进行分块上传
             doMultipartUpload(item);
         } else {
+            //单块上传
             doSingleUpload(item);
+
         }
     }
@@ -167,14 +182,16 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
      */
     private void doSingleUpload(final UploadFile item) {
-
         objectKey = item.file.getName();
-        CNPutObjectRequest request = new CNPutObjectRequest(getBucketName(), item.file.getName(), item.file);
+        CNPutObjectRequest request = new CNPutObjectRequest(item.file.getName(), item.file);
+        //Bucket权限管理
         request.setCannedACL(CNCannedAccessControlList.PublicRead);
-//        request.setContentType("video/mp4");
+        //设置上传的文件的内容类型
+        request.setContentType("video/mp4");
         cnUpload.putObject(request, new CNPutObjectResponseListener() {
             @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());
@@ -190,12 +207,14 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
             @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) {
@@ -212,6 +231,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
             @Override
             public void onTaskFinish() {
+                //上传结束 包括上传成功结束与上传失败结束
                 List<UploadFile> uploadFiles = dataSource.get(currentDir
                         .getPath());
                 for (UploadFile file : uploadFiles) {
@@ -228,11 +248,13 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
             @Override
             public void onTaskCancel() {
+                //上传取消
                 Log.d(TAG, "single upload cancel");
             }
             @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())) {
@@ -255,12 +277,15 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     private void doMultipartUpload(final UploadFile item) {
         objectKey = item.file.getName();
-        CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest(getBucketName(), item.file.getName());
+        CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest(item.file.getName());
+        //设置内容类型
         request.setContentType("video/mp4");
+        //设置bucket权限
         request.setCannedACL(CNCannedAccessControlList.PublicRead);
         cnUpload.initiateMultipartUpload(request, new CNInitiateMultipartUploadResponseListener() {
             @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) {
@@ -275,6 +300,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
             @Override
             public void onSuccess(int i, Header[] headers, CNInitiateMultipartUploadResult cnInitiateMultipartUploadResult) {
+                //初始化多块上传成功
                 List<UploadFile> uploadFiles = dataSource
                         .get(currentDir.getPath());
                 for (UploadFile file : uploadFiles) {
@@ -296,7 +322,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     private void beginMultiUpload(CNInitiateMultipartUploadResult initResult,
                                   UploadFile item) {
         localUploadPartRequestFactory = new UploadPartRequestFactory(
-                initResult.getBucket(), initResult.getKey(),
+                initResult.getKey(),
                 initResult.getUploadId(), item.file, Config.PART_SIZE);
         Message message = myHandler.obtainMessage();
         message.what = UPLOAD_NEXT_PART;
@@ -321,6 +347,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                 @Override
                 public void onSuccess(int i, Header[] headers, CNPartETag cnPartETag) {
+                    //上传分块成功
                     Message message = myHandler.obtainMessage();
                     message.what = UPLOAD_NEXT_PART;
                     Bundle bundle = new Bundle();
@@ -332,6 +359,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                 @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) {
@@ -348,7 +376,8 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                 @Override
                 public void onTaskProgress(double v) {
-                    long uploadedInpart = (long) (v / 100 * request.contentLength);
+                    //上传分块进度
+                    long uploadedInpart = (long) (v / 100 * request.getContentLength());
                     long uploadedInFile = uploadedInpart
                             + requestFactory.getUploadedSize();
                     progressInFile = Double
@@ -393,6 +422,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
         cnUpload.listParts(request, new CNListPartsResponseListener() {
             @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) {
@@ -407,6 +437,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
             @Override
             public void onSuccess(int i, Header[] headers, CNListPartsResult cnListPartsResult) {
+                //罗列已经上传的分块成功
                 Message message = myHandler.obtainMessage();
                 message.what = LIST_PART_FINISH;
                 message.obj = cnListPartsResult;
@@ -464,7 +495,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
      * 取消分块上传
      */
     private void abortMultiUpload() {
-        CNAbortMultipartUploadRequest request = new CNAbortMultipartUploadRequest(localUploadPartRequestFactory.getBucketName(), localUploadPartRequestFactory.getObjectKey(), localUploadPartRequestFactory.getUploadId());
+        CNAbortMultipartUploadRequest request = new CNAbortMultipartUploadRequest(localUploadPartRequestFactory.getObjectKey(), localUploadPartRequestFactory.getUploadId());
         cnUpload.abortMultipartUpload(request, new CNAbortMultipartUploadResponseListener() {
             @Override
             public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
@@ -509,7 +540,6 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                             .get("requestFactory");
                     item = (UploadFile) bundle.get("uploadFile");
                     CNListPartsRequest listRequest = new CNListPartsRequest(
-                            requestFactory.getBucketName(),
                             requestFactory.getObjectKey(),
                             requestFactory.getUploadId());
                     listParts(listRequest, item);
@@ -536,17 +566,23 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     /**
      * 获取文件上传后的路径
-     * @param objectKey
-     * @param fileType 文件类型：VIDEO_FILE-->视频文件     COMMON_FILE-->普通文件
-     * @param listener
      */
     public void getUploadedUrl() {
         cnUpload.getUploadedUrlInfo(objectKey, FileType.COMMON_FILE, new OnUploadedUrlInfoListener() {
+            /**
+             * 返回资源路径
+             * @param s
+             */
             @Override
             public void onSuccess(String s) {
                 Log.e(TAG, s);
             }
+            /**
+             * 返回错误信息
+             * @param s
+             * @param s1
+             */
             @Override
             public void onError(String s, String s1) {
                 Log.e(TAG, s + " : " + s1);
@@ -555,21 +591,30 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     }
     /**
-     * 获取上传需要的bucketName
-     *
-     * @return
+     * 初始化上传方法的回调
+     * 如果返回error，则代表上传SDK没有初始化成功，无法做后续的上传操作
      */
-    private String getBucketName() {
+    private OnInitListener onInitListener = new OnInitListener() {
+        /**
+         * 初始化失败回调
+         * @param s 返回errorCode
+         * @param s1 返回errorMessage
+         */
+        @Override
+        public void onError(String s, String s1) {
+            Log.e(TAG, s + " : " + s1);
+            initSuccess = false;
+        }
-        String bucketName;
-        if (cnUpload.getBucketInfo().getErrorCode().equals("0")) {
-            Log.e(TAG, cnUpload.getBucketInfo().getErrorMessage());
-            bucketName = cnUpload.getBucketInfo().getBucketName();
-        } else {
-            bucketName = "";
-            Log.e(TAG, cnUpload.getBucketInfo().getErrorMessage());
+        /**
+         * 初始化成功回调
+         * @param s 返回bucketName
+         */
+        @Override
+        public void onSuccess(String s) {
+            Log.e(TAG, s);
+            initSuccess = true;
         }
-        return bucketName;
-    }
+    };
 }
@@ -14,6 +14,8 @@ public class MyApplication extends Application {
     public void onCreate() {
         super.onCreate();
+        //初始化上传SDK init(Context, appId, appKey)
+        //appId & appKey 由开放平台应用配置中获取
         Config.init(this, "60_jaxisljz90", "1ee33b54e18a66b94eca7f8149408565b02f749d314926");
     }
@@ -12,7 +12,6 @@ import java.io.Serializable;
  */
 public class UploadPartRequestFactory implements Serializable{
 	private static final long serialVersionUID = 1L;
-	private String bucketName;
 	private String key;
 	private String uploadId;
 	private File file;
@@ -22,9 +21,8 @@ public class UploadPartRequestFactory implements Serializable{
 	public long partSize ;
 	private long uploadedSize;
-	public UploadPartRequestFactory(String bucketName ,String objectKey ,  String uploadId , File file , long partSize ) {
+	public UploadPartRequestFactory(String objectKey ,  String uploadId , File file , long partSize ) {
 		this.uploadId = uploadId;
-		this.bucketName = bucketName;
 		this.key = objectKey;
 		this.file = file;
 		this.remainingBytes = file.length();
@@ -42,7 +40,7 @@ public class UploadPartRequestFactory implements Serializable{
 		boolean bool = this.remainingBytes - this.partSize <= 0L;
 		CNUploadPartRequest localUploadPartRequest = null;
 		uploadedSize = file.length() - this.remainingBytes ;
-		localUploadPartRequest = new CNUploadPartRequest(bucketName, key,uploadId, file, offset, partNumber++, partSize);
+		localUploadPartRequest = new CNUploadPartRequest( key,uploadId, file, offset, partNumber++, partSize);
 		this.offset += partSize;
 		this.remainingBytes -= partSize;
 		localUploadPartRequest.setLastPart(bool);
@@ -58,10 +56,6 @@ public class UploadPartRequestFactory implements Serializable{
 		return this.file;
 	}
-	public synchronized String getBucketName(){
-		return this.bucketName;
-	}
-	
 	public synchronized String getUploadId(){
 		return this.uploadId;
 	}