修改初始化多块上传方法

王琳
1 parent 2b101206
Showing 6 changed files with 27 additions and 9 deletions
.idea/vcs.xml
app/libs/libcnliveupload.jar
app/src/main/java/com/cnlive/demo/upload/Config.java
app/src/main/java/com/cnlive/demo/upload/MultiUploader.java
app/src/main/java/com/cnlive/demo/upload/activity/UploadActivity.java
doc/视讯云上传SDK使用说明文档.pdf
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
 \ No newline at end of file
+package com.cnlive.demo.upload;
+
+/**
+ * Created by Lynn on 2017/8/14.
+ */
+
+public class Config {
+    public static final long PART_SIZE = 5 * 1024 * 1024;
+    public static final long MULTI_UPLOAD_THREADHOLD = 16 * 1024 * 1024;
+    public static String USER_ID = "";
+}
@@ -90,6 +90,7 @@ public class MultiUploader {
     /**
      * 并发传的块数，默认就是2。一般不用改。根据你自测的性能状况来调整。
+     *
      * @param no
      */
     public void setConcurrentNo(int no) {
@@ -129,7 +130,7 @@ public class MultiUploader {
             final CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest(bucketName, key);
             request.setCannedACL(CNCannedAccessControlList.PublicRead);
             request.setContentType("video/mp4");
-            cnUpload.initiateMultipartUpload(name, des, userId, filePath, file, isHorizontalScreen, callback, request, new CNInitiateMultipartUploadResponseListener() {
+            cnUpload.initiateMultipartUpload(request, userId, filePath, name, des, file, isHorizontalScreen, callback, 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);
@@ -338,7 +339,7 @@ public class MultiUploader {
                 }
                 @Override
-                public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult completeMultipartUploadResult) {
+                public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult completeMultipartUploadResult, String videoId) {
                     Log.i(TAG, "complete upload, key = " + key + ", bucketName = " + bucketName + " , uploadId = " + uploadId + "\n" + completeMultipartUploadResult.toString());
                 }
@@ -15,6 +15,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
+import com.cnlive.demo.upload.Config;
 import com.cnlive.demo.upload.utils.DemoUtils;
 import com.cnlive.demo.upload.R;
 import com.cnlive.demo.upload.utils.UploadPartRequestFactory;
@@ -58,8 +59,7 @@ import static com.cnlive.demo.upload.model.UploadFile.STATUS_UPLOADING;
 public class UploadActivity extends Activity implements AdapterView.OnItemClickListener {
     private static final String TAG = "UploadActivity";
-    public static final long PART_SIZE = 5 * 1024 * 1024;
-    public static final long MULTI_UPLOAD_THREADHOLD = 16 * 1024 * 1024;
+
     private CNUpload cnUpload;
     private File currentDir;
     private ListView listView;
@@ -150,7 +150,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
             throw new IllegalArgumentException("file can not be null");
         }
-        if (item.file.length() >= MULTI_UPLOAD_THREADHOLD) {
+        if (item.file.length() >= Config.MULTI_UPLOAD_THREADHOLD) {
             doMultipartUpload(item);
         } else {
             doSingleUpload(item);
@@ -166,7 +166,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
         CNPutObjectRequest request = new CNPutObjectRequest();
         request.setCannedACL(CNCannedAccessControlList.PublicRead);
         request.setContentType("video/mp4");
-        cnUpload.upload(request, "1342671", item.file.getPath(), item.file.getName(), "des", null, 1, null, new CNPutObjectResponseListener() {
+        cnUpload.upload(request, Config.USER_ID, item.file.getPath(), item.file.getName(), "des", null, 1, null, new CNPutObjectResponseListener() {
             @Override
             public void onTaskFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
                 Log.d(TAG, uploadError.getErrorMessage());
@@ -249,7 +249,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
         CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest();
         request.setContentType("video/mp4");
         request.setCannedACL(CNCannedAccessControlList.PublicRead);
-        cnUpload.initiateMultipartUpload(item.file.getName(), "des", "1342671", item.file.getPath(), null, 1, null, request, new CNInitiateMultipartUploadResponseListener() {
+        cnUpload.initiateMultipartUpload(request, Config.USER_ID, item.file.getPath(), item.file.getName(), "des", null, 1, null, new CNInitiateMultipartUploadResponseListener() {
             @Override
             public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
                 List<UploadFile> uploadFiles = dataSource
@@ -288,7 +288,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                                   UploadFile item) {
         localUploadPartRequestFactory = new UploadPartRequestFactory(
                 initResult.getBucket(), initResult.getKey(),
-                initResult.getUploadId(), item.file, PART_SIZE);
+                initResult.getUploadId(), item.file, Config.PART_SIZE);
         Message message = myHandler.obtainMessage();
         message.what = UPLOAD_NEXT_PART;
         Bundle bundle = new Bundle();
@@ -434,7 +434,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
             }
             @Override
-            public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult cnCompleteMultipartUploadResult) {
+            public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult cnCompleteMultipartUploadResult, String videoId) {
                 List<UploadFile> uploadFiles = dataSource
                         .get(currentDir.getPath());
                 for (UploadFile file : uploadFiles) {