CNLive Android Team / CNUploadDemo · Commits

Commit 7b0b4273a80b1f816c280be28a783b4386a68cc6

Authored by 王琳
2 parents d2e6bef4 3d8684b5

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

Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
.idea/modules.xml
  View file @7b0b427
... ... @@ -2,7 +2,8 @@
2 2 <project version="4">
3 3 <component name="ProjectModuleManager">
4 4 <modules>
5   - <module fileurl="file://$PROJECT_DIR$/UploadDemo.iml" filepath="$PROJECT_DIR$/UploadDemo.iml" />
  5 + <module fileurl="file://$PROJECT_DIR$/CNUploadDemo.iml" filepath="$PROJECT_DIR$/CNUploadDemo.iml" />
  6 + <module fileurl="file://E:\android-project\CNUploadDemo\UploadDemo.iml" filepath="E:\android-project\CNUploadDemo\UploadDemo.iml" />
6 7 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
7 8 </modules>
8 9 </component>
... ...
app/src/main/java/com/cnlive/cnUploadDemo/activity/UploadActivity.java
  View file @7b0b427
... ... @@ -191,7 +191,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
191 191 private void doSingleUpload(final UploadFile item) {
192 192  
193 193 objectKey = item.file.getName();
194   - CNPutObjectRequest request = new CNPutObjectRequest(item.file.getName(), item.file);
  194 + CNPutObjectRequest request = new CNPutObjectRequest(objectKey, item.file);
195 195 //Bucket权限管理
196 196 request.setCannedACL(CNCannedAccessControlList.PublicRead);
197 197 //设置上传的文件的内容类型
... ... @@ -305,7 +305,7 @@ public class UploadActivity extends Activity implements AdapterView.OnItemClickL
305 305 private void doMultipartUpload(final UploadFile item) {
306 306  
307 307 objectKey = item.file.getName();
308   - CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest(item.file.getName());
  308 + CNInitiateMultipartUploadRequest request = new CNInitiateMultipartUploadRequest(objectKey);
309 309 //设置内容类型
310 310 request.setContentType("video/mp4");
311 311 //设置bucket权限
... ...