Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNUploadDemo

王琳
2 parents d2e6bef4 3d8684b5
Showing 2 changed files with 4 additions and 3 deletions
.idea/modules.xml
app/src/main/java/com/cnlive/cnUploadDemo/activity/UploadActivity.java
@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/UploadDemo.iml" filepath="$PROJECT_DIR$/UploadDemo.iml" />
+      <module fileurl="file://$PROJECT_DIR$/CNUploadDemo.iml" filepath="$PROJECT_DIR$/CNUploadDemo.iml" />
+      <module fileurl="file://E:\android-project\CNUploadDemo\UploadDemo.iml" filepath="E:\android-project\CNUploadDemo\UploadDemo.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
@@ -191,7 +191,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     private void doSingleUpload(final UploadFile item) {
         objectKey = item.file.getName();
-        CNPutObjectRequest request = new CNPutObjectRequest(item.file.getName(), item.file);
+        CNPutObjectRequest request = new CNPutObjectRequest(objectKey, item.file);
         //Bucket权限管理
         request.setCannedACL(CNCannedAccessControlList.PublicRead);
         //设置上传的文件的内容类型
@@ -305,7 +305,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
     private void doMultipartUpload(final UploadFile item) {
         objectKey = item.file.getName();
-        CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest(item.file.getName());
+        CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest(objectKey);
         //设置内容类型
         request.setContentType("video/mp4");
         //设置bucket权限