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

王琳
1 parent 794e02c8
Showing 17 changed files with 123 additions and 228 deletions
.idea/misc.xml
app/build.gradle
app/src/androidTest/java/com/cnlive/demo/rdupload/ExampleInstrumentedTest.java
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/demo/rdupload/Config.java → app/src/main/java/com/cnlive/cnUploadDemo/Config.java
app/src/main/java/com/cnlive/demo/rdupload/MultiUploader.java → app/src/main/java/com/cnlive/cnUploadDemo/MultiUploader.java
app/src/main/java/com/cnlive/demo/rdupload/activity/MainActivity.java → app/src/main/java/com/cnlive/cnUploadDemo/activity/MainActivity.java
app/src/main/java/com/cnlive/demo/rdupload/activity/UploadActivity.java → app/src/main/java/com/cnlive/cnUploadDemo/activity/UploadActivity.java
app/src/main/java/com/cnlive/demo/rdupload/adapter/FileAdapter.java → app/src/main/java/com/cnlive/cnUploadDemo/adapter/FileAdapter.java
app/src/main/java/com/cnlive/demo/rdupload/adapter/ViewHolder.java → app/src/main/java/com/cnlive/cnUploadDemo/adapter/ViewHolder.java
app/src/main/java/com/cnlive/demo/rdupload/app/MyApplication.java → app/src/main/java/com/cnlive/cnUploadDemo/app/MyApplication.java
app/src/main/java/com/cnlive/demo/rdupload/model/UploadFile.java → app/src/main/java/com/cnlive/cnUploadDemo/model/UploadFile.java
app/src/main/java/com/cnlive/demo/rdupload/utils/DemoUtils.java → app/src/main/java/com/cnlive/cnUploadDemo/utils/DemoUtils.java
app/src/main/java/com/cnlive/demo/rdupload/utils/UploadPartRequestFactory.java → app/src/main/java/com/cnlive/cnUploadDemo/utils/UploadPartRequestFactory.java
app/src/main/res/layout/activity_dummy.xml
app/src/test/java/com/cnlive/demo/rdupload/ExampleUnitTest.java
lib/libcnliveupload.jar
@@ -27,17 +27,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <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">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 26
     buildToolsVersion "26.0.0"
     defaultConfig {
-        applicationId "com.cnlive.demo.rdupload"
+        applicationId "com.cnlive.cnUploadDemo"
         minSdkVersion 16
         targetSdkVersion 26
         versionCode 1
@@ -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.0'
+    compile 'com.cnlive:lib_upload:2.0.1'
 }
-package com.cnlive.demo.rdupload;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.cnlive.demo.upload", appContext.getPackageName());
-    }
-}
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cnlive.demo.rdupload">
+    package="com.cnlive.cnUploadDemo">
     <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="com.cnlive.demo.rdupload.app.MyApplication"
+        android:name="com.cnlive.cnUploadDemo.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="com.cnlive.demo.rdupload.activity.MainActivity">
+        <activity android:name="com.cnlive.cnUploadDemo.activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.cnlive.demo.rdupload.activity.UploadActivity" />
+        <activity android:name="com.cnlive.cnUploadDemo.activity.UploadActivity" />
     </application>
 </manifest>
 \ No newline at end of file
-package com.cnlive.demo.rdupload;
+package com.cnlive.cnUploadDemo;
 /**
  * Created by Lynn on 2017/8/14.
-package com.cnlive.demo.rdupload;
+package com.cnlive.cnUploadDemo;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
-import com.cnlive.lib.upload.listener.CNAbortMultipartUploadResponseListener;
-import com.cnlive.lib.upload.listener.CNCompleteMultipartUploadResponseListener;
-import com.cnlive.lib.upload.listener.CNInitiateMultipartUploadResponseListener;
-import com.cnlive.lib.upload.listener.CNListPartsResponseListener;
-import com.cnlive.lib.upload.listener.CNUploadPartResponseListener;
-import com.cnlive.lib.upload.model.CNPart;
-import com.cnlive.lib.upload.model.CNPartETag;
-import com.cnlive.lib.upload.model.UploadError;
-import com.cnlive.lib.upload.model.acl.CNCannedAccessControlList;
-import com.cnlive.lib.upload.model.result.CNCompleteMultipartUploadResult;
-import com.cnlive.lib.upload.model.result.CNInitiateMultipartUploadResult;
-import com.cnlive.lib.upload.model.result.CNListPartsResult;
-import com.cnlive.lib.upload.services.CNAbortMultipartUploadRequest;
-import com.cnlive.lib.upload.services.CNCompleteMultipartUploadRequest;
-import com.cnlive.lib.upload.services.CNInitiateMultipartUploadRequest;
-import com.cnlive.lib.upload.services.CNUploadPartRequest;
-import com.cnlive.lib.upload.upload.CNUpload;
+import com.cnlive.libs.upload.listener.CNAbortMultipartUploadResponseListener;
+import com.cnlive.libs.upload.listener.CNCompleteMultipartUploadResponseListener;
+import com.cnlive.libs.upload.listener.CNInitiateMultipartUploadResponseListener;
+import com.cnlive.libs.upload.listener.CNListPartsResponseListener;
+import com.cnlive.libs.upload.listener.CNUploadPartResponseListener;
+import com.cnlive.libs.upload.model.CNPart;
+import com.cnlive.libs.upload.model.CNPartETag;
+import com.cnlive.libs.upload.model.UploadError;
+import com.cnlive.libs.upload.model.acl.CNCannedAccessControlList;
+import com.cnlive.libs.upload.model.result.CNCompleteMultipartUploadResult;
+import com.cnlive.libs.upload.model.result.CNInitiateMultipartUploadResult;
+import com.cnlive.libs.upload.model.result.CNListPartsResult;
+import com.cnlive.libs.upload.services.CNAbortMultipartUploadRequest;
+import com.cnlive.libs.upload.services.CNCompleteMultipartUploadRequest;
+import com.cnlive.libs.upload.services.CNInitiateMultipartUploadRequest;
+import com.cnlive.libs.upload.services.CNUploadPartRequest;
+import com.cnlive.libs.upload.upload.CNUpload;
 import org.apache.http.Header;
-package com.cnlive.demo.rdupload.activity;
+package com.cnlive.cnUploadDemo.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.rdupload.R;
+import com.cnlive.cnUploadDemo.R;
 public class MainActivity extends Activity {
-package com.cnlive.demo.rdupload.activity;
+package com.cnlive.cnUploadDemo.activity;
 import android.app.Activity;
 import android.os.Bundle;
@@ -15,31 +15,33 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
-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;
-import com.cnlive.lib.upload.listener.CNListPartsResponseListener;
-import com.cnlive.lib.upload.listener.CNPutObjectResponseListener;
-import com.cnlive.lib.upload.listener.CNUploadPartResponseListener;
-import com.cnlive.lib.upload.model.CNPartETag;
-import com.cnlive.lib.upload.model.UploadError;
-import com.cnlive.lib.upload.model.acl.CNCannedAccessControlList;
-import com.cnlive.lib.upload.model.result.CNCompleteMultipartUploadResult;
-import com.cnlive.lib.upload.model.result.CNInitiateMultipartUploadResult;
-import com.cnlive.lib.upload.model.result.CNListPartsResult;
-import com.cnlive.lib.upload.services.CNAbortMultipartUploadRequest;
-import com.cnlive.lib.upload.services.CNCompleteMultipartUploadRequest;
-import com.cnlive.lib.upload.services.CNInitiateMultipartUploadRequest;
-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.cnlive.cnUploadDemo.Config;
+import com.cnlive.cnUploadDemo.utils.DemoUtils;
+import com.cnlive.cnUploadDemo.R;
+import com.cnlive.cnUploadDemo.utils.UploadPartRequestFactory;
+import com.cnlive.cnUploadDemo.adapter.FileAdapter;
+import com.cnlive.cnUploadDemo.model.UploadFile;
+import com.cnlive.libs.upload.listener.CNAbortMultipartUploadResponseListener;
+import com.cnlive.libs.upload.listener.CNCompleteMultipartUploadResponseListener;
+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.CNPartETag;
+import com.cnlive.libs.upload.model.UploadError;
+import com.cnlive.libs.upload.model.acl.CNCannedAccessControlList;
+import com.cnlive.libs.upload.model.result.CNCompleteMultipartUploadResult;
+import com.cnlive.libs.upload.model.result.CNInitiateMultipartUploadResult;
+import com.cnlive.libs.upload.model.result.CNListPartsResult;
+import com.cnlive.libs.upload.services.CNAbortMultipartUploadRequest;
+import com.cnlive.libs.upload.services.CNCompleteMultipartUploadRequest;
+import com.cnlive.libs.upload.services.CNInitiateMultipartUploadRequest;
+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.OnUploadedUrlInfoListener;
+import com.cnlive.libs.upload.upload.network.model.FileType;
 import org.apache.http.Header;
@@ -49,8 +51,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import static com.cnlive.demo.rdupload.model.UploadFile.STATUS_FINISH;
-import static com.cnlive.demo.rdupload.model.UploadFile.STATUS_UPLOADING;
+import static com.cnlive.cnUploadDemo.model.UploadFile.STATUS_FINISH;
+import static com.cnlive.cnUploadDemo.model.UploadFile.STATUS_UPLOADING;
 /**
  * Created by Lynn on 2017/8/10.
@@ -67,6 +69,8 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     private FileAdapter adapter;
     private final MyHandler myHandler = new MyHandler();
+    private String objectKey;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -162,9 +166,12 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
      * @param item
      */
     private void doSingleUpload(final UploadFile item) {
-        CNPutObjectRequest request = new CNPutObjectRequest("testq", item.file.getName(), item.file);
+
+
+        objectKey = item.file.getName();
+        CNPutObjectRequest request = new CNPutObjectRequest(getBucketName(), item.file.getName(), item.file);
         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) {
@@ -184,6 +191,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
             @Override
             public void onTaskSuccess(int i, Header[] headers) {
                 Log.i(TAG, "single upload success");
+                getUploadedUrl();
             }
             @Override
@@ -237,78 +245,6 @@ 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);
-//            }
-//        });
     }
     /**
@@ -317,7 +253,9 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
      * @param item
      */
     private void doMultipartUpload(final UploadFile item) {
-        CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest("testq", item.file.getName());
+
+        objectKey = item.file.getName();
+        CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest(getBucketName(), item.file.getName());
         request.setContentType("video/mp4");
         request.setCannedACL(CNCannedAccessControlList.PublicRead);
         cnUpload.initiateMultipartUpload(request, new CNInitiateMultipartUploadResponseListener() {
@@ -351,37 +289,6 @@ 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;
@@ -547,6 +454,8 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
                     }
                 }
                 myHandler.sendEmptyMessage(0);
+
+                getUploadedUrl();
             }
         });
     }
@@ -624,4 +533,43 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
+
+    /**
+     * 获取文件上传后的路径
+     * @param objectKey
+     * @param fileType 文件类型：VIDEO_FILE-->视频文件     COMMON_FILE-->普通文件
+     * @param listener
+     */
+    public void getUploadedUrl() {
+        cnUpload.getUploadedUrlInfo(objectKey, FileType.COMMON_FILE, new OnUploadedUrlInfoListener() {
+            @Override
+            public void onSuccess(String s) {
+                Log.e(TAG, s);
+            }
+
+            @Override
+            public void onError(String s, String s1) {
+                Log.e(TAG, s + " : " + s1);
+            }
+        });
+    }
+
+    /**
+     * 获取上传需要的bucketName
+     *
+     * @return
+     */
+    private String getBucketName() {
+
+        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());
+        }
+        return bucketName;
+    }
+
 }
-package com.cnlive.demo.rdupload.adapter;
+package com.cnlive.cnUploadDemo.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.rdupload.utils.DemoUtils;
-import com.cnlive.demo.rdupload.R;
-import com.cnlive.demo.rdupload.model.UploadFile;
+import com.cnlive.cnUploadDemo.utils.DemoUtils;
+import com.cnlive.cnUploadDemo.R;
+import com.cnlive.cnUploadDemo.model.UploadFile;
 import java.io.File;
 import java.util.ArrayList;
-package com.cnlive.demo.rdupload.adapter;
+package com.cnlive.cnUploadDemo.adapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-package com.cnlive.demo.rdupload.app;
+package com.cnlive.cnUploadDemo.app;
 import android.app.Application;
@@ -14,7 +14,7 @@ public class MyApplication extends Application {
     public void onCreate() {
         super.onCreate();
-        Config.init(this, "60_j5xilfyl12", "8b58d3dcdd828359e6113d5531029801e5d2b53e9a980c", true);
+        Config.init(this, "60_jaxisljz90", "1ee33b54e18a66b94eca7f8149408565b02f749d314926");
     }
 }
-package com.cnlive.demo.rdupload.model;
+package com.cnlive.cnUploadDemo.model;
 import android.graphics.drawable.Drawable;
-package com.cnlive.demo.rdupload.utils;
+package com.cnlive.cnUploadDemo.utils;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
-import com.cnlive.demo.rdupload.R;
+import com.cnlive.cnUploadDemo.R;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-package com.cnlive.demo.rdupload.utils;
+package com.cnlive.cnUploadDemo.utils;
-import com.cnlive.lib.upload.services.CNUploadPartRequest;
+import com.cnlive.libs.upload.services.CNUploadPartRequest;
 import java.io.File;
 import java.io.Serializable;
@@ -6,7 +6,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".activity.MainActivity">
+    tools:context="com.cnlive.cnUploadDemo.activity.MainActivity">
     <Button
         android:id="@+id/uploadBtn"
-package com.cnlive.demo.rdupload;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
 \ No newline at end of file