CNLive Android Team / CNUploadDemo · Commits

Commit 137d24a140b39f74a94954ea90715d44241956ce

Authored by 王琳
1 parent 794e02c8

更新上传SDK,添加获取bucketName与上传后资源路径方法

Inline Side-by-side
Showing 17 changed files with 123 additions and 228 deletions
.idea/misc.xml
  View file @137d24a
... ... @@ -27,17 +27,7 @@
27 27 </value>
28 28 </option>
29 29 </component>
30   - <component name="ProjectLevelVcsManager" settingsEditedManually="false">
31   - <OptionsSetting value="true" id="Add" />
32   - <OptionsSetting value="true" id="Remove" />
33   - <OptionsSetting value="true" id="Checkout" />
34   - <OptionsSetting value="true" id="Update" />
35   - <OptionsSetting value="true" id="Status" />
36   - <OptionsSetting value="true" id="Edit" />
37   - <ConfirmationsSetting value="0" id="Add" />
38   - <ConfirmationsSetting value="0" id="Remove" />
39   - </component>
40   - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
  30 + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
41 31 <output url="file://$PROJECT_DIR$/build/classes" />
42 32 </component>
43 33 <component name="ProjectType">
... ...
app/build.gradle
  View file @137d24a
... ... @@ -4,7 +4,7 @@ android {
4 4 compileSdkVersion 26
5 5 buildToolsVersion "26.0.0"
6 6 defaultConfig {
7   - applicationId "com.cnlive.demo.rdupload"
  7 + applicationId "com.cnlive.cnUploadDemo"
8 8 minSdkVersion 16
9 9 targetSdkVersion 26
10 10 versionCode 1
... ... @@ -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:2.0.0'
  27 + compile 'com.cnlive:lib_upload:2.0.1'
28 28 }
... ...
app/src/androidTest/java/com/cnlive/demo/rdupload/ExampleInstrumentedTest.java deleted 100644 → 0
  View file @794e02c
1   -package com.cnlive.demo.rdupload;
2   -
3   -import android.content.Context;
4   -import android.support.test.InstrumentationRegistry;
5   -import android.support.test.runner.AndroidJUnit4;
6   -
7   -import org.junit.Test;
8   -import org.junit.runner.RunWith;
9   -
10   -import static org.junit.Assert.*;
11   -
12   -/**
13   - * Instrumentation test, which will execute on an Android device.
14   - *
15   - * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
16   - */
17   -@RunWith(AndroidJUnit4.class)
18   -public class ExampleInstrumentedTest {
19   - @Test
20   - public void useAppContext() throws Exception {
21   - // Context of the app under test.
22   - Context appContext = InstrumentationRegistry.getTargetContext();
23   -
24   - assertEquals("com.cnlive.demo.upload", appContext.getPackageName());
25   - }
26   -}
app/src/main/AndroidManifest.xml
  View file @137d24a
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.rdupload">
  3 + package="com.cnlive.cnUploadDemo">
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="com.cnlive.demo.rdupload.app.MyApplication"
  12 + android:name="com.cnlive.cnUploadDemo.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="com.cnlive.demo.rdupload.activity.MainActivity">
  19 + <activity android:name="com.cnlive.cnUploadDemo.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="com.cnlive.demo.rdupload.activity.UploadActivity" />
  26 + <activity android:name="com.cnlive.cnUploadDemo.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/rdupload/Config.java renamed to app/src/main/java/com/cnlive/cnUploadDemo/Config.java
  View file @137d24a
1   -package com.cnlive.demo.rdupload;
  1 +package com.cnlive.cnUploadDemo;
2 2  
3 3 /**
4 4 * Created by Lynn on 2017/8/14.
... ...
app/src/main/java/com/cnlive/demo/rdupload/MultiUploader.java renamed to app/src/main/java/com/cnlive/cnUploadDemo/MultiUploader.java
  View file @137d24a
1   -package com.cnlive.demo.rdupload;
  1 +package com.cnlive.cnUploadDemo;
2 2  
3 3 import android.content.Context;
4 4 import android.os.Handler;
5 5 import android.os.Message;
6 6 import android.util.Log;
7 7  
8   -import com.cnlive.lib.upload.listener.CNAbortMultipartUploadResponseListener;
9   -import com.cnlive.lib.upload.listener.CNCompleteMultipartUploadResponseListener;
10   -import com.cnlive.lib.upload.listener.CNInitiateMultipartUploadResponseListener;
11   -import com.cnlive.lib.upload.listener.CNListPartsResponseListener;
12   -import com.cnlive.lib.upload.listener.CNUploadPartResponseListener;
13   -import com.cnlive.lib.upload.model.CNPart;
14   -import com.cnlive.lib.upload.model.CNPartETag;
15   -import com.cnlive.lib.upload.model.UploadError;
16   -import com.cnlive.lib.upload.model.acl.CNCannedAccessControlList;
17   -import com.cnlive.lib.upload.model.result.CNCompleteMultipartUploadResult;
18   -import com.cnlive.lib.upload.model.result.CNInitiateMultipartUploadResult;
19   -import com.cnlive.lib.upload.model.result.CNListPartsResult;
20   -import com.cnlive.lib.upload.services.CNAbortMultipartUploadRequest;
21   -import com.cnlive.lib.upload.services.CNCompleteMultipartUploadRequest;
22   -import com.cnlive.lib.upload.services.CNInitiateMultipartUploadRequest;
23   -import com.cnlive.lib.upload.services.CNUploadPartRequest;
24   -import com.cnlive.lib.upload.upload.CNUpload;
  8 +import com.cnlive.libs.upload.listener.CNAbortMultipartUploadResponseListener;
  9 +import com.cnlive.libs.upload.listener.CNCompleteMultipartUploadResponseListener;
  10 +import com.cnlive.libs.upload.listener.CNInitiateMultipartUploadResponseListener;
  11 +import com.cnlive.libs.upload.listener.CNListPartsResponseListener;
  12 +import com.cnlive.libs.upload.listener.CNUploadPartResponseListener;
  13 +import com.cnlive.libs.upload.model.CNPart;
  14 +import com.cnlive.libs.upload.model.CNPartETag;
  15 +import com.cnlive.libs.upload.model.UploadError;
  16 +import com.cnlive.libs.upload.model.acl.CNCannedAccessControlList;
  17 +import com.cnlive.libs.upload.model.result.CNCompleteMultipartUploadResult;
  18 +import com.cnlive.libs.upload.model.result.CNInitiateMultipartUploadResult;
  19 +import com.cnlive.libs.upload.model.result.CNListPartsResult;
  20 +import com.cnlive.libs.upload.services.CNAbortMultipartUploadRequest;
  21 +import com.cnlive.libs.upload.services.CNCompleteMultipartUploadRequest;
  22 +import com.cnlive.libs.upload.services.CNInitiateMultipartUploadRequest;
  23 +import com.cnlive.libs.upload.services.CNUploadPartRequest;
  24 +import com.cnlive.libs.upload.upload.CNUpload;
25 25  
26 26 import org.apache.http.Header;
27 27  
... ...
app/src/main/java/com/cnlive/demo/rdupload/activity/MainActivity.java renamed to app/src/main/java/com/cnlive/cnUploadDemo/activity/MainActivity.java
  View file @137d24a
1   -package com.cnlive.demo.rdupload.activity;
  1 +package com.cnlive.cnUploadDemo.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.rdupload.R;
  10 +import com.cnlive.cnUploadDemo.R;
11 11  
12 12 public class MainActivity extends Activity {
13 13  
... ...
app/src/main/java/com/cnlive/demo/rdupload/activity/UploadActivity.java renamed to app/src/main/java/com/cnlive/cnUploadDemo/activity/UploadActivity.java
  View file @137d24a
1   -package com.cnlive.demo.rdupload.activity;
  1 +package com.cnlive.cnUploadDemo.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.os.Bundle;
... ... @@ -15,31 +15,33 @@ import android.widget.ListView;
15 15 import android.widget.TextView;
16 16 import android.widget.Toast;
17 17  
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   -import com.cnlive.lib.upload.listener.CNAbortMultipartUploadResponseListener;
25   -import com.cnlive.lib.upload.listener.CNCompleteMultipartUploadResponseListener;
26   -import com.cnlive.lib.upload.listener.CNInitiateMultipartUploadResponseListener;
27   -import com.cnlive.lib.upload.listener.CNListPartsResponseListener;
28   -import com.cnlive.lib.upload.listener.CNPutObjectResponseListener;
29   -import com.cnlive.lib.upload.listener.CNUploadPartResponseListener;
30   -import com.cnlive.lib.upload.model.CNPartETag;
31   -import com.cnlive.lib.upload.model.UploadError;
32   -import com.cnlive.lib.upload.model.acl.CNCannedAccessControlList;
33   -import com.cnlive.lib.upload.model.result.CNCompleteMultipartUploadResult;
34   -import com.cnlive.lib.upload.model.result.CNInitiateMultipartUploadResult;
35   -import com.cnlive.lib.upload.model.result.CNListPartsResult;
36   -import com.cnlive.lib.upload.services.CNAbortMultipartUploadRequest;
37   -import com.cnlive.lib.upload.services.CNCompleteMultipartUploadRequest;
38   -import com.cnlive.lib.upload.services.CNInitiateMultipartUploadRequest;
39   -import com.cnlive.lib.upload.services.CNListPartsRequest;
40   -import com.cnlive.lib.upload.services.CNPutObjectRequest;
41   -import com.cnlive.lib.upload.services.CNUploadPartRequest;
42   -import com.cnlive.lib.upload.upload.CNUpload;
  18 +import com.cnlive.cnUploadDemo.Config;
  19 +import com.cnlive.cnUploadDemo.utils.DemoUtils;
  20 +import com.cnlive.cnUploadDemo.R;
  21 +import com.cnlive.cnUploadDemo.utils.UploadPartRequestFactory;
  22 +import com.cnlive.cnUploadDemo.adapter.FileAdapter;
  23 +import com.cnlive.cnUploadDemo.model.UploadFile;
  24 +import com.cnlive.libs.upload.listener.CNAbortMultipartUploadResponseListener;
  25 +import com.cnlive.libs.upload.listener.CNCompleteMultipartUploadResponseListener;
  26 +import com.cnlive.libs.upload.listener.CNInitiateMultipartUploadResponseListener;
  27 +import com.cnlive.libs.upload.listener.CNListPartsResponseListener;
  28 +import com.cnlive.libs.upload.listener.CNPutObjectResponseListener;
  29 +import com.cnlive.libs.upload.listener.CNUploadPartResponseListener;
  30 +import com.cnlive.libs.upload.model.CNPartETag;
  31 +import com.cnlive.libs.upload.model.UploadError;
  32 +import com.cnlive.libs.upload.model.acl.CNCannedAccessControlList;
  33 +import com.cnlive.libs.upload.model.result.CNCompleteMultipartUploadResult;
  34 +import com.cnlive.libs.upload.model.result.CNInitiateMultipartUploadResult;
  35 +import com.cnlive.libs.upload.model.result.CNListPartsResult;
  36 +import com.cnlive.libs.upload.services.CNAbortMultipartUploadRequest;
  37 +import com.cnlive.libs.upload.services.CNCompleteMultipartUploadRequest;
  38 +import com.cnlive.libs.upload.services.CNInitiateMultipartUploadRequest;
  39 +import com.cnlive.libs.upload.services.CNListPartsRequest;
  40 +import com.cnlive.libs.upload.services.CNPutObjectRequest;
  41 +import com.cnlive.libs.upload.services.CNUploadPartRequest;
  42 +import com.cnlive.libs.upload.upload.CNUpload;
  43 +import com.cnlive.libs.upload.upload.callback.OnUploadedUrlInfoListener;
  44 +import com.cnlive.libs.upload.upload.network.model.FileType;
43 45  
44 46 import org.apache.http.Header;
45 47  
... ... @@ -49,8 +51,8 @@ import java.util.HashMap;
49 51 import java.util.List;
50 52 import java.util.Map;
51 53  
52   -import static com.cnlive.demo.rdupload.model.UploadFile.STATUS_FINISH;
53   -import static com.cnlive.demo.rdupload.model.UploadFile.STATUS_UPLOADING;
  54 +import static com.cnlive.cnUploadDemo.model.UploadFile.STATUS_FINISH;
  55 +import static com.cnlive.cnUploadDemo.model.UploadFile.STATUS_UPLOADING;
54 56  
55 57 /**
56 58 * Created by Lynn on 2017/8/10.
... ... @@ -67,6 +69,8 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
67 69 private FileAdapter adapter;
68 70 private final MyHandler myHandler = new MyHandler();
69 71  
  72 + private String objectKey;
  73 +
70 74 @Override
71 75 protected void onCreate(@Nullable Bundle savedInstanceState) {
72 76 super.onCreate(savedInstanceState);
... ... @@ -162,9 +166,12 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
162 166 * @param item
163 167 */
164 168 private void doSingleUpload(final UploadFile item) {
165   - CNPutObjectRequest request = new CNPutObjectRequest("testq", item.file.getName(), item.file);
  169 +
  170 +
  171 + objectKey = item.file.getName();
  172 + CNPutObjectRequest request = new CNPutObjectRequest(getBucketName(), item.file.getName(), item.file);
166 173 request.setCannedACL(CNCannedAccessControlList.PublicRead);
167   - request.setContentType("video/mp4");
  174 +// request.setContentType("video/mp4");
168 175 cnUpload.putObject(request, new CNPutObjectResponseListener() {
169 176 @Override
170 177 public void onTaskFailure(int i, UploadError uploadError, Header[] headers, String s, Throwable throwable) {
... ... @@ -184,6 +191,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
184 191 @Override
185 192 public void onTaskSuccess(int i, Header[] headers) {
186 193 Log.i(TAG, "single upload success");
  194 + getUploadedUrl();
187 195 }
188 196  
189 197 @Override
... ... @@ -237,78 +245,6 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
237 245 myHandler.sendEmptyMessage(UPDATE_SINGLE_UPLOAD_STATUS);
238 246 }
239 247 });
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   -// });
312 248 }
313 249  
314 250 /**
... ... @@ -317,7 +253,9 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
317 253 * @param item
318 254 */
319 255 private void doMultipartUpload(final UploadFile item) {
320   - CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest("testq", item.file.getName());
  256 +
  257 + objectKey = item.file.getName();
  258 + CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest(getBucketName(), item.file.getName());
321 259 request.setContentType("video/mp4");
322 260 request.setCannedACL(CNCannedAccessControlList.PublicRead);
323 261 cnUpload.initiateMultipartUpload(request, new CNInitiateMultipartUploadResponseListener() {
... ... @@ -351,37 +289,6 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
351 289 beginMultiUpload(cnInitiateMultipartUploadResult, item);
352 290 }
353 291 });
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   -// });
385 292 }
386 293  
387 294 UploadPartRequestFactory localUploadPartRequestFactory;
... ... @@ -547,6 +454,8 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
547 454 }
548 455 }
549 456 myHandler.sendEmptyMessage(0);
  457 +
  458 + getUploadedUrl();
550 459 }
551 460 });
552 461 }
... ... @@ -624,4 +533,43 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
624 533 super.onRequestPermissionsResult(requestCode, permissions, grantResults);
625 534 }
626 535  
  536 +
  537 + /**
  538 + * 获取文件上传后的路径
  539 + * @param objectKey
  540 + * @param fileType 文件类型：VIDEO_FILE-->视频文件 COMMON_FILE-->普通文件
  541 + * @param listener
  542 + */
  543 + public void getUploadedUrl() {
  544 + cnUpload.getUploadedUrlInfo(objectKey, FileType.COMMON_FILE, new OnUploadedUrlInfoListener() {
  545 + @Override
  546 + public void onSuccess(String s) {
  547 + Log.e(TAG, s);
  548 + }
  549 +
  550 + @Override
  551 + public void onError(String s, String s1) {
  552 + Log.e(TAG, s + " : " + s1);
  553 + }
  554 + });
  555 + }
  556 +
  557 + /**
  558 + * 获取上传需要的bucketName
  559 + *
  560 + * @return
  561 + */
  562 + private String getBucketName() {
  563 +
  564 + String bucketName;
  565 + if (cnUpload.getBucketInfo().getErrorCode().equals("0")) {
  566 + Log.e(TAG, cnUpload.getBucketInfo().getErrorMessage());
  567 + bucketName = cnUpload.getBucketInfo().getBucketName();
  568 + } else {
  569 + bucketName = "";
  570 + Log.e(TAG, cnUpload.getBucketInfo().getErrorMessage());
  571 + }
  572 + return bucketName;
  573 + }
  574 +
627 575 }
... ...
app/src/main/java/com/cnlive/demo/rdupload/adapter/FileAdapter.java renamed to app/src/main/java/com/cnlive/cnUploadDemo/adapter/FileAdapter.java
  View file @137d24a
1   -package com.cnlive.demo.rdupload.adapter;
  1 +package com.cnlive.cnUploadDemo.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.rdupload.utils.DemoUtils;
10   -import com.cnlive.demo.rdupload.R;
11   -import com.cnlive.demo.rdupload.model.UploadFile;
  9 +import com.cnlive.cnUploadDemo.utils.DemoUtils;
  10 +import com.cnlive.cnUploadDemo.R;
  11 +import com.cnlive.cnUploadDemo.model.UploadFile;
12 12  
13 13 import java.io.File;
14 14 import java.util.ArrayList;
... ...
app/src/main/java/com/cnlive/demo/rdupload/adapter/ViewHolder.java renamed to app/src/main/java/com/cnlive/cnUploadDemo/adapter/ViewHolder.java
  View file @137d24a
1   -package com.cnlive.demo.rdupload.adapter;
  1 +package com.cnlive.cnUploadDemo.adapter;
2 2  
3 3 import android.widget.ImageView;
4 4 import android.widget.LinearLayout;
... ...
app/src/main/java/com/cnlive/demo/rdupload/app/MyApplication.java renamed to app/src/main/java/com/cnlive/cnUploadDemo/app/MyApplication.java
  View file @137d24a
1   -package com.cnlive.demo.rdupload.app;
  1 +package com.cnlive.cnUploadDemo.app;
2 2  
3 3 import android.app.Application;
4 4  
... ... @@ -14,7 +14,7 @@ public class MyApplication extends Application {
14 14 public void onCreate() {
15 15 super.onCreate();
16 16  
17   - Config.init(this, "60_j5xilfyl12", "8b58d3dcdd828359e6113d5531029801e5d2b53e9a980c", true);
  17 + Config.init(this, "60_jaxisljz90", "1ee33b54e18a66b94eca7f8149408565b02f749d314926");
18 18  
19 19 }
20 20 }
... ...
app/src/main/java/com/cnlive/demo/rdupload/model/UploadFile.java renamed to app/src/main/java/com/cnlive/cnUploadDemo/model/UploadFile.java
  View file @137d24a
1   -package com.cnlive.demo.rdupload.model;
  1 +package com.cnlive.cnUploadDemo.model;
2 2  
3 3 import android.graphics.drawable.Drawable;
4 4  
... ...
app/src/main/java/com/cnlive/demo/rdupload/utils/DemoUtils.java renamed to app/src/main/java/com/cnlive/cnUploadDemo/utils/DemoUtils.java
  View file @137d24a
1   -package com.cnlive.demo.rdupload.utils;
  1 +package com.cnlive.cnUploadDemo.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.rdupload.R;
  7 +import com.cnlive.cnUploadDemo.R;
8 8  
9 9 import java.text.SimpleDateFormat;
10 10 import java.util.Date;
... ...
app/src/main/java/com/cnlive/demo/rdupload/utils/UploadPartRequestFactory.java renamed to app/src/main/java/com/cnlive/cnUploadDemo/utils/UploadPartRequestFactory.java
  View file @137d24a
1   -package com.cnlive.demo.rdupload.utils;
  1 +package com.cnlive.cnUploadDemo.utils;
2 2  
3   -import com.cnlive.lib.upload.services.CNUploadPartRequest;
  3 +import com.cnlive.libs.upload.services.CNUploadPartRequest;
4 4  
5 5 import java.io.File;
6 6 import java.io.Serializable;
... ...
app/src/main/res/layout/activity_dummy.xml
  View file @137d24a
... ... @@ -6,7 +6,7 @@
6 6 android:paddingLeft="@dimen/activity_horizontal_margin"
7 7 android:paddingRight="@dimen/activity_horizontal_margin"
8 8 android:paddingTop="@dimen/activity_vertical_margin"
9   - tools:context=".activity.MainActivity">
  9 + tools:context="com.cnlive.cnUploadDemo.activity.MainActivity">
10 10  
11 11 <Button
12 12 android:id="@+id/uploadBtn"
... ...
app/src/test/java/com/cnlive/demo/rdupload/ExampleUnitTest.java deleted 100644 → 0
  View file @794e02c
1   -package com.cnlive.demo.rdupload;
2   -
3   -import org.junit.Test;
4   -
5   -import static org.junit.Assert.*;
6   -
7   -/**
8   - * Example local unit test, which will execute on the development machine (host).
9   - *
10   - * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
11   - */
12   -public class ExampleUnitTest {
13   - @Test
14   - public void addition_isCorrect() throws Exception {
15   - assertEquals(4, 2 + 2);
16   - }
17   -}
18 0 \ No newline at end of file
lib/libcnliveupload.jar 0 → 100644
View file @137d24a
No preview for this file type