CNLive Android Team / NewMediaPicker · Commits

Commit 521c2b6d19b43f249119e40c816fbb71a43fb22c

Authored by 吴奎庆
1 parent be88f8c1

处理最大视频过滤

Inline Side-by-side
Showing 3 changed files with 9 additions and 5 deletions
app/src/main/java/com/cnlive/strike/debug/MainActivity.java
  View file @521c2b6
... ... @@ -71,7 +71,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
71 71 .maxImageSize(25 * 1024 * 1024)
72 72 .maxVideoSize(100*1024*1024)
73 73 .isReturnUri(AndroidQUtil.isAndroidQ())
74   - .selectMode(PickerConfig.PICKER_IMAGE_VIDEO)
  74 + .selectMode(PickerConfig.PICKER_ONLY_ONE_TYPE)
75 75 .defaultSelectList(new ArrayList<Media>())
76 76 .needCamera(true)
77 77 .builder()
... ...
config.gradle
  View file @521c2b6
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "1.0.3.8",
  24 + version: "1.0.3.9",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.media",
27 27 //Lib库名称
... ...
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPickerFragmentView.java
  View file @521c2b6
... ... @@ -84,7 +84,9 @@ public class MediaPickerFragmentView implements MvpView {
84 84 if (mActivity.selects.size() > 0) {
85 85 showMessage(mFragment.getResources().getString(R.string.msg_type_limit));
86 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 92 } else if (mActivity.mOptions.isSinglePick() || mActivity.mOptions.maxNum == 1) {
... ... @@ -96,7 +98,9 @@ public class MediaPickerFragmentView implements MvpView {
96 98 MediaOpenActivityObservable.getInstance().openActivity(new MediaOpenInfo(2, media));
97 99 }
98 100 } else {
99   - MeidaResultObservable.getInstance().finishMedia(true, media);
  101 + if (isCheckMediaSupport(mActivity, media)) {
  102 + MeidaResultObservable.getInstance().finishMedia(true, media);
  103 + }
100 104 }
101 105 } else {
102 106 if (isCheckMediaSupport(mActivity, media)) {
... ... @@ -193,7 +197,7 @@ public class MediaPickerFragmentView implements MvpView {
193 197 }
194 198  
195 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 201 return;
198 202 }
199 203 mediaActivity.allMedias.addAll(medias.get(0).getMedias());
... ...