CNLive Android Team / NewMediaPicker · Commits

Commit 2c3a12c1155e647de8171c2bf3fa15047fb43016

Authored by 朱显松
1 parent 8c0a429c

取消maxNum=1选择限制

Inline Side-by-side
Showing 4 changed files with 4 additions and 4 deletions
config.gradle
  View file @2c3a12c
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "1.0.5.2", 24 + version: "1.0.5.3",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.media", 26 packeg : "com.cnlive.media",
27 //Lib库名称 27 //Lib库名称
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPickerFragmentView.java
  View file @2c3a12c
@@ -88,7 +88,7 @@ public class MediaPickerFragmentView implements MvpView { @@ -88,7 +88,7 @@ public class MediaPickerFragmentView implements MvpView {
88 } 88 }
89 } 89 }
90 90
91 - } else if (mActivity.mOptions.isSinglePick() || mActivity.mOptions.maxNum == 1) { 91 + } else if (mActivity.mOptions.isSinglePick()) {
92 92
93 if (mActivity.mOptions.isNeedCrop()) { 93 if (mActivity.mOptions.isNeedCrop()) {
94 if (media.mediaType != 1) { 94 if (media.mediaType != 1) {
lib_media/src/main/java/com/cnlive/media/frame/view/MediaView.java
  View file @2c3a12c
@@ -94,7 +94,7 @@ public class MediaView implements MvpView { @@ -94,7 +94,7 @@ public class MediaView implements MvpView {
94 setSelectText(null); 94 setSelectText(null);
95 setTitleBar(); 95 setTitleBar();
96 initFolder(); 96 initFolder();
97 - if (mActivity.needCrop || mActivity.singlePick || mActivity.maxNum == 1) { 97 + if (mActivity.needCrop || mActivity.singlePick) {
98 preview.setVisibility(View.GONE); 98 preview.setVisibility(View.GONE);
99 } else { 99 } else {
100 preview.setVisibility(View.VISIBLE); 100 preview.setVisibility(View.VISIBLE);
lib_media/src/main/java/com/cnlive/media/ui/adapter/MediaAdapter.java
  View file @2c3a12c
@@ -130,7 +130,7 @@ public class MediaAdapter extends BaseRecyclerViewAdapter<Media> { @@ -130,7 +130,7 @@ public class MediaAdapter extends BaseRecyclerViewAdapter<Media> {
130 binding.textViewSize.setText(showTime ? StringUtils.gennerTime(mMedia.duration / 1000) : FileUtils.getSizeByUnit(mMedia.size)); 130 binding.textViewSize.setText(showTime ? StringUtils.gennerTime(mMedia.duration / 1000) : FileUtils.getSizeByUnit(mMedia.size));
131 } 131 }
132 //单选 132 //单选
133 - if (mOptions.singlePick || mOptions.isNeedCrop() || mOptions.maxNum == 1 || (mOptions.getSelectMode() == PickerConfig.PICKER_ONLY_ONE_TYPE && mMedia.mediaType == 3)) { 133 + if (mOptions.singlePick || mOptions.isNeedCrop() || (mOptions.getSelectMode() == PickerConfig.PICKER_ONLY_ONE_TYPE && mMedia.mediaType == 3)) {
134 binding.checkImage.setVisibility(View.GONE); 134 binding.checkImage.setVisibility(View.GONE);
135 } else { 135 } else {
136 binding.checkImage.setVisibility(View.VISIBLE); 136 binding.checkImage.setVisibility(View.VISIBLE);