CNLive Android Team / CNUploadDemo · Commits

Commit 794e02c8d47a05cdef393c8d8e2a613eb3146e69

Authored by 王琳
1 parent e63db28f

更新上传SDK

Inline Side-by-side
Showing 14 changed files with 142 additions and 41 deletions
app/build.gradle
  View file @794e02c
... ... @@ -24,5 +24,5 @@ dependencies {
24 24 compile fileTree(include: ['*.jar'], dir: 'libs')
25 25 compile 'com.android.support:appcompat-v7:26.+'
26 26 compile 'com.android.support.constraint:constraint-layout:1.0.2'
27   - compile 'com.cnlive:lib_upload:1.0.0'
  27 + compile 'com.cnlive:lib_upload:2.0.0'
28 28 }
... ...
app/src/androidTest/java/com/cnlive/demo/upload/ExampleInstrumentedTest.java renamed to app/src/androidTest/java/com/cnlive/demo/rdupload/ExampleInstrumentedTest.java
  View file @794e02c
1   -package com.cnlive.demo.upload;
  1 +package com.cnlive.demo.rdupload;
2 2  
3 3 import android.content.Context;
4 4 import android.support.test.InstrumentationRegistry;
... ...
app/src/main/AndroidManifest.xml
  View file @794e02c
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
3   - package="com.cnlive.demo.upload">
  3 + package="com.cnlive.demo.rdupload">
4 4  
5 5 <uses-permission android:name="android.permission.INTERNET" />
6 6 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
... ... @@ -9,21 +9,21 @@
9 9 <uses-permission android:name="android.permission.READ_PHONE_STATE" />
10 10  
11 11 <application
12   - android:name=".app.MyApplication"
  12 + android:name="com.cnlive.demo.rdupload.app.MyApplication"
13 13 android:allowBackup="true"
14 14 android:icon="@mipmap/ic_launcher"
15 15 android:label="@string/app_name"
16 16 android:roundIcon="@mipmap/ic_launcher_round"
17 17 android:supportsRtl="true"
18 18 android:theme="@style/AppTheme">
19   - <activity android:name=".activity.MainActivity">
  19 + <activity android:name="com.cnlive.demo.rdupload.activity.MainActivity">
20 20 <intent-filter>
21 21 <action android:name="android.intent.action.MAIN" />
22 22  
23 23 <category android:name="android.intent.category.LAUNCHER" />
24 24 </intent-filter>
25 25 </activity>
26   - <activity android:name=".activity.UploadActivity" />
  26 + <activity android:name="com.cnlive.demo.rdupload.activity.UploadActivity" />
27 27 </application>
28 28  
29 29 </manifest>
30 30 \ No newline at end of file
... ...
app/src/main/java/com/cnlive/demo/upload/Config.java renamed to app/src/main/java/com/cnlive/demo/rdupload/Config.java
  View file @794e02c
1   -package com.cnlive.demo.upload;
  1 +package com.cnlive.demo.rdupload;
2 2  
3 3 /**
4 4 * Created by Lynn on 2017/8/14.
... ... @@ -7,5 +7,4 @@ package com.cnlive.demo.upload;
7 7 public class Config {
8 8 public static final long PART_SIZE = 5 * 1024 * 1024;
9 9 public static final long MULTI_UPLOAD_THREADHOLD = 16 * 1024 * 1024;
10   - public static String USER_ID = "";
11 10 }
... ...
app/src/main/java/com/cnlive/demo/upload/MultiUploader.java renamed to app/src/main/java/com/cnlive/demo/rdupload/MultiUploader.java
  View file @794e02c
1   -package com.cnlive.demo.upload;
  1 +package com.cnlive.demo.rdupload;
2 2  
3 3 import android.content.Context;
4 4 import android.os.Handler;
... ... @@ -130,7 +130,7 @@ public class MultiUploader {
130 130 final CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest(bucketName, key);
131 131 request.setCannedACL(CNCannedAccessControlList.PublicRead);
132 132 request.setContentType("video/mp4");
133   - cnUpload.initiateMultipartUpload(request, userId, filePath, name, des, file, isHorizontalScreen, callback, new CNInitiateMultipartUploadResponseListener() {
  133 + cnUpload.initiateMultipartUpload(request, new CNInitiateMultipartUploadResponseListener() {
134 134 @Override
135 135 public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
136 136 Log.w(TAG, "init multiupload fail, statusCode = " + i, throwable);
... ... @@ -339,7 +339,7 @@ public class MultiUploader {
339 339 }
340 340  
341 341 @Override
342   - public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult completeMultipartUploadResult, String videoId) {
  342 + public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult completeMultipartUploadResult) {
343 343 Log.i(TAG, "complete upload, key = " + key + ", bucketName = " + bucketName + " , uploadId = " + uploadId + "\n" + completeMultipartUploadResult.toString());
344 344  
345 345 }
... ...
app/src/main/java/com/cnlive/demo/upload/activity/MainActivity.java renamed to app/src/main/java/com/cnlive/demo/rdupload/activity/MainActivity.java
  View file @794e02c
1   -package com.cnlive.demo.upload.activity;
  1 +package com.cnlive.demo.rdupload.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
... ... @@ -7,7 +7,7 @@ import android.view.Menu;
7 7 import android.view.View;
8 8 import android.widget.Button;
9 9  
10   -import com.cnlive.demo.upload.R;
  10 +import com.cnlive.demo.rdupload.R;
11 11  
12 12 public class MainActivity extends Activity {
13 13  
... ...
app/src/main/java/com/cnlive/demo/upload/activity/UploadActivity.java renamed to app/src/main/java/com/cnlive/demo/rdupload/activity/UploadActivity.java
  View file @794e02c
1   -package com.cnlive.demo.upload.activity;
  1 +package com.cnlive.demo.rdupload.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.os.Bundle;
... ... @@ -15,12 +15,12 @@ import android.widget.ListView;
15 15 import android.widget.TextView;
16 16 import android.widget.Toast;
17 17  
18   -import com.cnlive.demo.upload.Config;
19   -import com.cnlive.demo.upload.utils.DemoUtils;
20   -import com.cnlive.demo.upload.R;
21   -import com.cnlive.demo.upload.utils.UploadPartRequestFactory;
22   -import com.cnlive.demo.upload.adapter.FileAdapter;
23   -import com.cnlive.demo.upload.model.UploadFile;
  18 +import com.cnlive.demo.rdupload.Config;
  19 +import com.cnlive.demo.rdupload.utils.DemoUtils;
  20 +import com.cnlive.demo.rdupload.R;
  21 +import com.cnlive.demo.rdupload.utils.UploadPartRequestFactory;
  22 +import com.cnlive.demo.rdupload.adapter.FileAdapter;
  23 +import com.cnlive.demo.rdupload.model.UploadFile;
24 24 import com.cnlive.lib.upload.listener.CNAbortMultipartUploadResponseListener;
25 25 import com.cnlive.lib.upload.listener.CNCompleteMultipartUploadResponseListener;
26 26 import com.cnlive.lib.upload.listener.CNInitiateMultipartUploadResponseListener;
... ... @@ -40,7 +40,6 @@ import com.cnlive.lib.upload.services.CNListPartsRequest;
40 40 import com.cnlive.lib.upload.services.CNPutObjectRequest;
41 41 import com.cnlive.lib.upload.services.CNUploadPartRequest;
42 42 import com.cnlive.lib.upload.upload.CNUpload;
43   -import com.ksyun.ks3.model.acl.CannedAccessControlList;
44 43  
45 44 import org.apache.http.Header;
46 45  
... ... @@ -50,8 +49,8 @@ import java.util.HashMap;
50 49 import java.util.List;
51 50 import java.util.Map;
52 51  
53   -import static com.cnlive.demo.upload.model.UploadFile.STATUS_FINISH;
54   -import static com.cnlive.demo.upload.model.UploadFile.STATUS_UPLOADING;
  52 +import static com.cnlive.demo.rdupload.model.UploadFile.STATUS_FINISH;
  53 +import static com.cnlive.demo.rdupload.model.UploadFile.STATUS_UPLOADING;
55 54  
56 55 /**
57 56 * Created by Lynn on 2017/8/10.
... ... @@ -163,13 +162,13 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
163 162 * @param item
164 163 */
165 164 private void doSingleUpload(final UploadFile item) {
166   - CNPutObjectRequest request = new CNPutObjectRequest();
  165 + CNPutObjectRequest request = new CNPutObjectRequest("testq", item.file.getName(), item.file);
167 166 request.setCannedACL(CNCannedAccessControlList.PublicRead);
168 167 request.setContentType("video/mp4");
169   - cnUpload.upload(request, Config.USER_ID, item.file.getPath(), item.file.getName(), "des", null, 1, null, new CNPutObjectResponseListener() {
  168 + cnUpload.putObject(request, new CNPutObjectResponseListener() {
170 169 @Override
171 170 public void onTaskFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
172   - Log.d(TAG, uploadError.getErrorMessage());
  171 + Log.d(TAG, uploadError.getErrorMessage() + " : " + s + " : " + i);
173 172 List<UploadFile> uploadFiles = dataSource.get(currentDir
174 173 .getPath());
175 174 for (UploadFile file : uploadFiles) {
... ... @@ -183,7 +182,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
183 182 }
184 183  
185 184 @Override
186   - public void onTaskSuccess(int i, Header[] headers, String s) {
  185 + public void onTaskSuccess(int i, Header[] headers) {
187 186 Log.i(TAG, "single upload success");
188 187 }
189 188  
... ... @@ -238,6 +237,78 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
238 237 myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
239 238 }
240 239 });
  240 +// cnUpload.upload(request, Config.USER_ID, item.file.getPath(), item.file.getName(), "des", null, 1, null, new CNPutObjectResponseListener() {
  241 +// @Override
  242 +// public void onTaskFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
  243 +// Log.d(TAG, uploadError.getErrorMessage() + " : " + s);
  244 +// List<UploadFile> uploadFiles = dataSource.get(currentDir
  245 +// .getPath());
  246 +// for (UploadFile file : uploadFiles) {
  247 +// if (file.file.getPath().equalsIgnoreCase(
  248 +// item.file.getPath())) {
  249 +// file.status = UploadFile.STATUS_FAIL;
  250 +// item.status = UploadFile.STATUS_FAIL;
  251 +// }
  252 +// }
  253 +// myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
  254 +// }
  255 +//
  256 +// @Override
  257 +// public void onTaskSuccess(int i, Header[] headers, String s) {
  258 +// Log.i(TAG, "single upload success");
  259 +// }
  260 +//
  261 +// @Override
  262 +// public void onTaskStart() {
  263 +// List<UploadFile> uploadFiles = dataSource.get(currentDir
  264 +// .getPath());
  265 +// for (UploadFile file : uploadFiles) {
  266 +// if (file.file.getPath().equalsIgnoreCase(
  267 +// item.file.getPath())) {
  268 +// file.status = UploadFile.STATUS_STARTED;
  269 +// file.progress = 0;
  270 +// item.status = UploadFile.STATUS_STARTED;
  271 +// item.progress = 0;
  272 +// }
  273 +// }
  274 +// myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
  275 +// }
  276 +//
  277 +// @Override
  278 +// public void onTaskFinish() {
  279 +// List<UploadFile> uploadFiles = dataSource.get(currentDir
  280 +// .getPath());
  281 +// for (UploadFile file : uploadFiles) {
  282 +// if (file.file.getPath().equalsIgnoreCase(
  283 +// item.file.getPath())) {
  284 +// file.status = UploadFile.STATUS_FINISH;
  285 +// file.progress = 100;
  286 +// item.status = UploadFile.STATUS_FINISH;
  287 +// file.progress = 100;
  288 +// }
  289 +// }
  290 +// myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
  291 +// }
  292 +//
  293 +// @Override
  294 +// public void onTaskCancel() {
  295 +// Log.d(TAG, "single upload cancel");
  296 +// }
  297 +//
  298 +// @Override
  299 +// public void onTaskProgress(double v) {
  300 +// List<UploadFile> uploadFiles = dataSource.get(currentDir.getPath());
  301 +// for (UploadFile file : uploadFiles) {
  302 +// if (file.file.getPath().equalsIgnoreCase(item.file.getPath())) {
  303 +// file.status = UploadFile.STATUS_UPLOADING;
  304 +// file.progress = (int) v;
  305 +// item.status = UploadFile.STATUS_UPLOADING;
  306 +// item.progress = (int) v;
  307 +// }
  308 +// }
  309 +// myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
  310 +// }
  311 +// });
241 312 }
242 313  
243 314 /**
... ... @@ -246,10 +317,10 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
246 317 * @param item
247 318 */
248 319 private void doMultipartUpload(final UploadFile item) {
249   - CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest();
  320 + CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest("testq", item.file.getName());
250 321 request.setContentType("video/mp4");
251 322 request.setCannedACL(CNCannedAccessControlList.PublicRead);
252   - cnUpload.initiateMultipartUpload(request, Config.USER_ID, item.file.getPath(), item.file.getName(), "des", null, 1, null, new CNInitiateMultipartUploadResponseListener() {
  323 + cnUpload.initiateMultipartUpload(request, new CNInitiateMultipartUploadResponseListener() {
253 324 @Override
254 325 public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
255 326 List<UploadFile> uploadFiles = dataSource
... ... @@ -280,6 +351,37 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
280 351 beginMultiUpload(cnInitiateMultipartUploadResult, item);
281 352 }
282 353 });
  354 +// cnUpload.initiateMultipartUpload(request, Config.USER_ID, item.file.getPath(), item.file.getName(), "des", null, 1, null, new CNInitiateMultipartUploadResponseListener() {
  355 +// @Override
  356 +// public void onFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
  357 +// List<UploadFile> uploadFiles = dataSource
  358 +// .get(currentDir.getPath());
  359 +// for (UploadFile file : uploadFiles) {
  360 +// if (file.file.getPath().equalsIgnoreCase(
  361 +// item.file.getPath())) {
  362 +// file.status = UploadFile.STATUS_INIT_FAIL;
  363 +// item.status = UploadFile.STATUS_INIT_FAIL;
  364 +// }
  365 +// }
  366 +// myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
  367 +// }
  368 +//
  369 +// @Override
  370 +// public void onSuccess(int i, Header[] headers, CNInitiateMultipartUploadResult cnInitiateMultipartUploadResult) {
  371 +// List<UploadFile> uploadFiles = dataSource
  372 +// .get(currentDir.getPath());
  373 +// for (UploadFile file : uploadFiles) {
  374 +// if (file.file.getPath().equalsIgnoreCase(
  375 +// item.file.getPath())) {
  376 +// file.status = UploadFile.STATUS_INIT;
  377 +// item.status = UploadFile.STATUS_INIT;
  378 +// }
  379 +// }
  380 +// myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
  381 +//
  382 +// beginMultiUpload(cnInitiateMultipartUploadResult, item);
  383 +// }
  384 +// });
283 385 }
284 386  
285 387 UploadPartRequestFactory localUploadPartRequestFactory;
... ... @@ -434,7 +536,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
434 536 }
435 537  
436 538 @Override
437   - public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult cnCompleteMultipartUploadResult, String videoId) {
  539 + public void onSuccess(int i, Header[] headers, CNCompleteMultipartUploadResult cnCompleteMultipartUploadResult) {
438 540 List<UploadFile> uploadFiles = dataSource
439 541 .get(currentDir.getPath());
440 542 for (UploadFile file : uploadFiles) {
... ...
app/src/main/java/com/cnlive/demo/upload/adapter/FileAdapter.java renamed to app/src/main/java/com/cnlive/demo/rdupload/adapter/FileAdapter.java
  View file @794e02c
1   -package com.cnlive.demo.upload.adapter;
  1 +package com.cnlive.demo.rdupload.adapter;
2 2  
3 3 import android.content.Context;
4 4 import android.view.LayoutInflater;
... ... @@ -6,9 +6,9 @@ import android.view.View;
6 6 import android.view.ViewGroup;
7 7 import android.widget.BaseAdapter;
8 8  
9   -import com.cnlive.demo.upload.utils.DemoUtils;
10   -import com.cnlive.demo.upload.R;
11   -import com.cnlive.demo.upload.model.UploadFile;
  9 +import com.cnlive.demo.rdupload.utils.DemoUtils;
  10 +import com.cnlive.demo.rdupload.R;
  11 +import com.cnlive.demo.rdupload.model.UploadFile;
12 12  
13 13 import java.io.File;
14 14 import java.util.ArrayList;
... ...
app/src/main/java/com/cnlive/demo/upload/adapter/ViewHolder.java renamed to app/src/main/java/com/cnlive/demo/rdupload/adapter/ViewHolder.java
  View file @794e02c
1   -package com.cnlive.demo.upload.adapter;
  1 +package com.cnlive.demo.rdupload.adapter;
2 2  
3 3 import android.widget.ImageView;
4 4 import android.widget.LinearLayout;
... ...
app/src/main/java/com/cnlive/demo/upload/app/MyApplication.java renamed to app/src/main/java/com/cnlive/demo/rdupload/app/MyApplication.java
  View file @794e02c
1   -package com.cnlive.demo.upload.app;
  1 +package com.cnlive.demo.rdupload.app;
2 2  
3 3 import android.app.Application;
4 4  
... ...
app/src/main/java/com/cnlive/demo/upload/model/UploadFile.java renamed to app/src/main/java/com/cnlive/demo/rdupload/model/UploadFile.java
  View file @794e02c
1   -package com.cnlive.demo.upload.model;
  1 +package com.cnlive.demo.rdupload.model;
2 2  
3 3 import android.graphics.drawable.Drawable;
4 4  
... ...
app/src/main/java/com/cnlive/demo/upload/utils/DemoUtils.java renamed to app/src/main/java/com/cnlive/demo/rdupload/utils/DemoUtils.java
  View file @794e02c
1   -package com.cnlive.demo.upload.utils;
  1 +package com.cnlive.demo.rdupload.utils;
2 2  
3 3 import android.content.Context;
4 4 import android.content.res.Resources;
5 5 import android.graphics.drawable.Drawable;
6 6  
7   -import com.cnlive.demo.upload.R;
  7 +import com.cnlive.demo.rdupload.R;
8 8  
9 9 import java.text.SimpleDateFormat;
10 10 import java.util.Date;
... ...
app/src/main/java/com/cnlive/demo/upload/utils/UploadPartRequestFactory.java renamed to app/src/main/java/com/cnlive/demo/rdupload/utils/UploadPartRequestFactory.java
  View file @794e02c
1   -package com.cnlive.demo.upload.utils;
  1 +package com.cnlive.demo.rdupload.utils;
2 2  
3 3 import com.cnlive.lib.upload.services.CNUploadPartRequest;
4 4  
... ...
app/src/test/java/com/cnlive/demo/upload/ExampleUnitTest.java renamed to app/src/test/java/com/cnlive/demo/rdupload/ExampleUnitTest.java
  View file @794e02c
1   -package com.cnlive.demo.upload;
  1 +package com.cnlive.demo.rdupload;
2 2  
3 3 import org.junit.Test;
4 4  
... ...