更新上传SDK

王琳
1 parent e63db28f
Showing 14 changed files with 142 additions and 41 deletions
app/build.gradle
app/src/androidTest/java/com/cnlive/demo/upload/ExampleInstrumentedTest.java → app/src/androidTest/java/com/cnlive/demo/rdupload/ExampleInstrumentedTest.java
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/demo/upload/Config.java → app/src/main/java/com/cnlive/demo/rdupload/Config.java
app/src/main/java/com/cnlive/demo/upload/MultiUploader.java → app/src/main/java/com/cnlive/demo/rdupload/MultiUploader.java
app/src/main/java/com/cnlive/demo/upload/activity/MainActivity.java → app/src/main/java/com/cnlive/demo/rdupload/activity/MainActivity.java
app/src/main/java/com/cnlive/demo/upload/activity/UploadActivity.java → app/src/main/java/com/cnlive/demo/rdupload/activity/UploadActivity.java
app/src/main/java/com/cnlive/demo/upload/adapter/FileAdapter.java → app/src/main/java/com/cnlive/demo/rdupload/adapter/FileAdapter.java
app/src/main/java/com/cnlive/demo/upload/adapter/ViewHolder.java → app/src/main/java/com/cnlive/demo/rdupload/adapter/ViewHolder.java
app/src/main/java/com/cnlive/demo/upload/app/MyApplication.java → app/src/main/java/com/cnlive/demo/rdupload/app/MyApplication.java
app/src/main/java/com/cnlive/demo/upload/model/UploadFile.java → app/src/main/java/com/cnlive/demo/rdupload/model/UploadFile.java
app/src/main/java/com/cnlive/demo/upload/utils/DemoUtils.java → app/src/main/java/com/cnlive/demo/rdupload/utils/DemoUtils.java
app/src/main/java/com/cnlive/demo/upload/utils/UploadPartRequestFactory.java → app/src/main/java/com/cnlive/demo/rdupload/utils/UploadPartRequestFactory.java
app/src/test/java/com/cnlive/demo/upload/ExampleUnitTest.java → app/src/test/java/com/cnlive/demo/rdupload/ExampleUnitTest.java
@@ -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:1.0.0'
+    compile 'com.cnlive:lib_upload:2.0.0'
 }
-package com.cnlive.demo.upload;
+package com.cnlive.demo.rdupload;
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cnlive.demo.upload">
+    package="com.cnlive.demo.rdupload">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -9,21 +9,21 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <application
-        android:name=".app.MyApplication"
+        android:name="com.cnlive.demo.rdupload.app.MyApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".activity.MainActivity">
+        <activity android:name="com.cnlive.demo.rdupload.activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.UploadActivity" />
+        <activity android:name="com.cnlive.demo.rdupload.activity.UploadActivity" />
     </application>
 </manifest>
 \ No newline at end of file
-package com.cnlive.demo.upload;
+package com.cnlive.demo.rdupload;
 /**
  * Created by Lynn on 2017/8/14.
@@ -7,5 +7,4 @@ package com.cnlive.demo.upload;
 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 = "";
 }
-package com.cnlive.demo.upload;
+package com.cnlive.demo.rdupload;
 import android.content.Context;
 import android.os.Handler;
@@ -130,7 +130,7 @@ public class MultiUploader {
             final CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest(bucketName, key);
             request.setCannedACL(CNCannedAccessControlList.PublicRead);
             request.setContentType("video/mp4");
-            cnUpload.initiateMultipartUpload(request, userId, filePath, name, des, file, isHorizontalScreen, callback, new CNInitiateMultipartUploadResponseListener() {
+            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);
@@ -339,7 +339,7 @@ public class MultiUploader {
                 }
                 @Override
-                public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult completeMultipartUploadResult, String videoId) {
+                public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult completeMultipartUploadResult) {
                     Log.i(TAG, "complete upload, key = " + key + ", bucketName = " + bucketName + " , uploadId = " + uploadId + "\n" + completeMultipartUploadResult.toString());
                 }
-package com.cnlive.demo.upload.activity;
+package com.cnlive.demo.rdupload.activity;
 import android.app.Activity;
 import android.content.Intent;
@@ -7,7 +7,7 @@ import android.view.Menu;
 import android.view.View;
 import android.widget.Button;
-import com.cnlive.demo.upload.R;
+import com.cnlive.demo.rdupload.R;
 public class MainActivity extends Activity {
-package com.cnlive.demo.upload.activity;
+package com.cnlive.demo.rdupload.activity;
 import android.app.Activity;
 import android.os.Bundle;
@@ -15,12 +15,12 @@ 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;
-import com.cnlive.demo.upload.adapter.FileAdapter;
-import com.cnlive.demo.upload.model.UploadFile;
+import com.cnlive.demo.rdupload.Config;
+import com.cnlive.demo.rdupload.utils.DemoUtils;
+import com.cnlive.demo.rdupload.R;
+import com.cnlive.demo.rdupload.utils.UploadPartRequestFactory;
+import com.cnlive.demo.rdupload.adapter.FileAdapter;
+import com.cnlive.demo.rdupload.model.UploadFile;
 import com.cnlive.lib.upload.listener.CNAbortMultipartUploadResponseListener;
 import com.cnlive.lib.upload.listener.CNCompleteMultipartUploadResponseListener;
 import com.cnlive.lib.upload.listener.CNInitiateMultipartUploadResponseListener;
@@ -40,7 +40,6 @@ import com.cnlive.lib.upload.services.CNListPartsRequest;
 import com.cnlive.lib.upload.services.CNPutObjectRequest;
 import com.cnlive.lib.upload.services.CNUploadPartRequest;
 import com.cnlive.lib.upload.upload.CNUpload;
-import com.ksyun.ks3.model.acl.CannedAccessControlList;
 import org.apache.http.Header;
@@ -50,8 +49,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import static com.cnlive.demo.upload.model.UploadFile.STATUS_FINISH;
-import static com.cnlive.demo.upload.model.UploadFile.STATUS_UPLOADING;
+import static com.cnlive.demo.rdupload.model.UploadFile.STATUS_FINISH;
+import static com.cnlive.demo.rdupload.model.UploadFile.STATUS_UPLOADING;
 /**
  * Created by Lynn on 2017/8/10.
@@ -163,13 +162,13 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
      * @param item
      */
     private void doSingleUpload(final UploadFile item) {
-        CNPutObjectRequest request = new CNPutObjectRequest();
+        CNPutObjectRequest request = new CNPutObjectRequest("testq", item.file.getName(), item.file);
         request.setCannedACL(CNCannedAccessControlList.PublicRead);
         request.setContentType("video/mp4");
-        cnUpload.upload(request, Config.USER_ID, item.file.getPath(), item.file.getName(), "des", null, 1, null, new CNPutObjectResponseListener() {
+        cnUpload.putObject(request, new CNPutObjectResponseListener() {
             @Override
             public void onTaskFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
-                Log.d(TAG, uploadError.getErrorMessage());
+                Log.d(TAG, uploadError.getErrorMessage() + " : " + s + " : " + i);
                 List<UploadFile> uploadFiles = dataSource.get(currentDir
                         .getPath());
                 for (UploadFile file : uploadFiles) {
@@ -183,7 +182,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
             }
             @Override
-            public void onTaskSuccess(int i, Header[] headers, String s) {
+            public void onTaskSuccess(int i, Header[] headers) {
                 Log.i(TAG, "single upload success");
             }
@@ -238,6 +237,78 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                 myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
             }
         });
+//        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() + " : " + s);
+//                List<UploadFile> uploadFiles = dataSource.get(currentDir
+//                        .getPath());
+//                for (UploadFile file : uploadFiles) {
+//                    if (file.file.getPath().equalsIgnoreCase(
+//                            item.file.getPath())) {
+//                        file.status = UploadFile.STATUS_FAIL;
+//                        item.status = UploadFile.STATUS_FAIL;
+//                    }
+//                }
+//                myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
+//            }
+//
+//            @Override
+//            public void onTaskSuccess(int i, Header[] headers, String s) {
+//                Log.i(TAG, "single upload success");
+//            }
+//
+//            @Override
+//            public void onTaskStart() {
+//                List<UploadFile> uploadFiles = dataSource.get(currentDir
+//                        .getPath());
+//                for (UploadFile file : uploadFiles) {
+//                    if (file.file.getPath().equalsIgnoreCase(
+//                            item.file.getPath())) {
+//                        file.status = UploadFile.STATUS_STARTED;
+//                        file.progress = 0;
+//                        item.status = UploadFile.STATUS_STARTED;
+//                        item.progress = 0;
+//                    }
+//                }
+//                myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
+//            }
+//
+//            @Override
+//            public void onTaskFinish() {
+//                List<UploadFile> uploadFiles = dataSource.get(currentDir
+//                        .getPath());
+//                for (UploadFile file : uploadFiles) {
+//                    if (file.file.getPath().equalsIgnoreCase(
+//                            item.file.getPath())) {
+//                        file.status = UploadFile.STATUS_FINISH;
+//                        file.progress = 100;
+//                        item.status = UploadFile.STATUS_FINISH;
+//                        file.progress = 100;
+//                    }
+//                }
+//                myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
+//            }
+//
+//            @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())) {
+//                        file.status = UploadFile.STATUS_UPLOADING;
+//                        file.progress = (int) v;
+//                        item.status = UploadFile.STATUS_UPLOADING;
+//                        item.progress = (int) v;
+//                    }
+//                }
+//                myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
+//            }
+//        });
     }
     /**
@@ -246,10 +317,10 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
      * @param item
      */
     private void doMultipartUpload(final UploadFile item) {
-        CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest();
+        CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest("testq", item.file.getName());
         request.setContentType("video/mp4");
         request.setCannedACL(CNCannedAccessControlList.PublicRead);
-        cnUpload.initiateMultipartUpload(request, Config.USER_ID, item.file.getPath(), item.file.getName(), "des", null, 1, null, new CNInitiateMultipartUploadResponseListener() {
+        cnUpload.initiateMultipartUpload(request, new CNInitiateMultipartUploadResponseListener() {
             @Override
             public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
                 List<UploadFile> uploadFiles = dataSource
@@ -280,6 +351,37 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                 beginMultiUpload(cnInitiateMultipartUploadResult, item);
             }
         });
+//        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
+//                        .get(currentDir.getPath());
+//                for (UploadFile file : uploadFiles) {
+//                    if (file.file.getPath().equalsIgnoreCase(
+//                            item.file.getPath())) {
+//                        file.status = UploadFile.STATUS_INIT_FAIL;
+//                        item.status = UploadFile.STATUS_INIT_FAIL;
+//                    }
+//                }
+//                myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
+//            }
+//
+//            @Override
+//            public void onSuccess(int i, Header[] headers, CNInitiateMultipartUploadResult cnInitiateMultipartUploadResult) {
+//                List<UploadFile> uploadFiles = dataSource
+//                        .get(currentDir.getPath());
+//                for (UploadFile file : uploadFiles) {
+//                    if (file.file.getPath().equalsIgnoreCase(
+//                            item.file.getPath())) {
+//                        file.status = UploadFile.STATUS_INIT;
+//                        item.status = UploadFile.STATUS_INIT;
+//                    }
+//                }
+//                myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
+//
+//                beginMultiUpload(cnInitiateMultipartUploadResult, item);
+//            }
+//        });
     }
     UploadPartRequestFactory localUploadPartRequestFactory;
@@ -434,7 +536,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
             }
             @Override
-            public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult cnCompleteMultipartUploadResult, String videoId) {
+            public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult cnCompleteMultipartUploadResult) {
                 List<UploadFile> uploadFiles = dataSource
                         .get(currentDir.getPath());
                 for (UploadFile file : uploadFiles) {
-package com.cnlive.demo.upload.adapter;
+package com.cnlive.demo.rdupload.adapter;
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -6,9 +6,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import com.cnlive.demo.upload.utils.DemoUtils;
-import com.cnlive.demo.upload.R;
-import com.cnlive.demo.upload.model.UploadFile;
+import com.cnlive.demo.rdupload.utils.DemoUtils;
+import com.cnlive.demo.rdupload.R;
+import com.cnlive.demo.rdupload.model.UploadFile;
 import java.io.File;
 import java.util.ArrayList;
-package com.cnlive.demo.upload.adapter;
+package com.cnlive.demo.rdupload.adapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-package com.cnlive.demo.upload.app;
+package com.cnlive.demo.rdupload.app;
 import android.app.Application;
-package com.cnlive.demo.upload.model;
+package com.cnlive.demo.rdupload.model;
 import android.graphics.drawable.Drawable;
-package com.cnlive.demo.upload.utils;
+package com.cnlive.demo.rdupload.utils;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
-import com.cnlive.demo.upload.R;
+import com.cnlive.demo.rdupload.R;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-package com.cnlive.demo.upload.utils;
+package com.cnlive.demo.rdupload.utils;
 import com.cnlive.lib.upload.services.CNUploadPartRequest;
-package com.cnlive.demo.upload;
+package com.cnlive.demo.rdupload;
 import org.junit.Test;