Commit 3d8684b5d4d0ad906411c0865f425ed05c5cbc48

Authored by 朱显松
1 parent 66cfbbee

修正方法传入参数

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