添加选择视频功能默认拍照

zoubo · Jun 26, 2017 · 1decaa5 · 1decaa5
1 parent 58bd128
commit 1decaa5
Show file tree

Hide file tree

Showing 4 changed files with 310 additions and 305 deletions.
diff --git a/PhotoPicker/src/main/java/me/iwf/photopicker/PhotoPickerActivity.java b/PhotoPicker/src/main/java/me/iwf/photopicker/PhotoPickerActivity.java
@@ -41,7 +41,7 @@ public class PhotoPickerActivity extends AppCompatActivity {
 
   private int maxCount = DEFAULT_MAX_COUNT;
 
-  private String pickMedia;
+  private String pickMedia=PICK_PHOTO;
 
   /**
    * to prevent multiple calls to inflate menu
@@ -77,7 +77,10 @@ protected void onCreate(Bundle savedInstanceState) {
       actionBar.setElevation(25);
     }
 
-    pickMedia = getIntent().getStringExtra(EXTRA_PICK_MEDIA);
+    if(null!=getIntent().getStringExtra(EXTRA_PICK_MEDIA)){
+
+      pickMedia =getIntent().getStringExtra(EXTRA_PICK_MEDIA);
+    }
 
     if (pickMedia.equalsIgnoreCase(PICK_PHOTO)) {
       setTitle(R.string.__picker_title_image);