Commit 521c2b6d19b43f249119e40c816fbb71a43fb22c
1 parent
be88f8c1
处理最大视频过滤
Showing
3 changed files
with
9 additions
and
5 deletions
app/src/main/java/com/cnlive/strike/debug/MainActivity.java
| @@ -71,7 +71,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe | @@ -71,7 +71,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe | ||
| 71 | .maxImageSize(25 * 1024 * 1024) | 71 | .maxImageSize(25 * 1024 * 1024) |
| 72 | .maxVideoSize(100*1024*1024) | 72 | .maxVideoSize(100*1024*1024) |
| 73 | .isReturnUri(AndroidQUtil.isAndroidQ()) | 73 | .isReturnUri(AndroidQUtil.isAndroidQ()) |
| 74 | - .selectMode(PickerConfig.PICKER_IMAGE_VIDEO) | 74 | + .selectMode(PickerConfig.PICKER_ONLY_ONE_TYPE) |
| 75 | .defaultSelectList(new ArrayList<Media>()) | 75 | .defaultSelectList(new ArrayList<Media>()) |
| 76 | .needCamera(true) | 76 | .needCamera(true) |
| 77 | .builder() | 77 | .builder() |
config.gradle
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPickerFragmentView.java
| @@ -84,7 +84,9 @@ public class MediaPickerFragmentView implements MvpView { | @@ -84,7 +84,9 @@ public class MediaPickerFragmentView implements MvpView { | ||
| 84 | if (mActivity.selects.size() > 0) { | 84 | if (mActivity.selects.size() > 0) { |
| 85 | showMessage(mFragment.getResources().getString(R.string.msg_type_limit)); | 85 | showMessage(mFragment.getResources().getString(R.string.msg_type_limit)); |
| 86 | } else { | 86 | } else { |
| 87 | - MeidaResultObservable.getInstance().finishMedia(true, media); | 87 | + if (isCheckMediaSupport(mActivity, media)) { |
| 88 | + MeidaResultObservable.getInstance().finishMedia(true, media); | ||
| 89 | + } | ||
| 88 | } | 90 | } |
| 89 | 91 | ||
| 90 | } else if (mActivity.mOptions.isSinglePick() || mActivity.mOptions.maxNum == 1) { | 92 | } else if (mActivity.mOptions.isSinglePick() || mActivity.mOptions.maxNum == 1) { |
| @@ -96,7 +98,9 @@ public class MediaPickerFragmentView implements MvpView { | @@ -96,7 +98,9 @@ public class MediaPickerFragmentView implements MvpView { | ||
| 96 | MediaOpenActivityObservable.getInstance().openActivity(new MediaOpenInfo(2, media)); | 98 | MediaOpenActivityObservable.getInstance().openActivity(new MediaOpenInfo(2, media)); |
| 97 | } | 99 | } |
| 98 | } else { | 100 | } else { |
| 99 | - MeidaResultObservable.getInstance().finishMedia(true, media); | 101 | + if (isCheckMediaSupport(mActivity, media)) { |
| 102 | + MeidaResultObservable.getInstance().finishMedia(true, media); | ||
| 103 | + } | ||
| 100 | } | 104 | } |
| 101 | } else { | 105 | } else { |
| 102 | if (isCheckMediaSupport(mActivity, media)) { | 106 | if (isCheckMediaSupport(mActivity, media)) { |
| @@ -193,7 +197,7 @@ public class MediaPickerFragmentView implements MvpView { | @@ -193,7 +197,7 @@ public class MediaPickerFragmentView implements MvpView { | ||
| 193 | } | 197 | } |
| 194 | 198 | ||
| 195 | public void initMediaData(MediaActivity mediaActivity, ArrayList<Folder> medias) { | 199 | public void initMediaData(MediaActivity mediaActivity, ArrayList<Folder> medias) { |
| 196 | - if (medias == null || medias.size() == 0 ||medias.get(0)==null||medias.get(0).getMedias()==null||medias.get(0).getMedias().size()==0|| medias.get(0).getMedias().get(0) == null) { | 200 | + if (medias == null || medias.size() == 0 || medias.get(0) == null || medias.get(0).getMedias() == null || medias.get(0).getMedias().size() == 0 || medias.get(0).getMedias().get(0) == null) { |
| 197 | return; | 201 | return; |
| 198 | } | 202 | } |
| 199 | mediaActivity.allMedias.addAll(medias.get(0).getMedias()); | 203 | mediaActivity.allMedias.addAll(medias.get(0).getMedias()); |