处理默认

吴奎庆
1 parent 8df30b8d
Showing 10 changed files with 41 additions and 33 deletions
app/src/main/java/com/cnlive/strike/debug/MainActivity.java
config.gradle
lib_media/src/main/java/com/cnlive/media/PickerConfig.java
lib_media/src/main/java/com/cnlive/media/frame/presenter/MediaPickerFragmentPresenter.java
lib_media/src/main/java/com/cnlive/media/frame/presenter/MediaPresenter.java
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPickerFragmentView.java
lib_media/src/main/java/com/cnlive/media/frame/view/MediaView.java
lib_media/src/main/java/com/cnlive/media/model/ImagePickerOptions.java
lib_media/src/main/java/com/cnlive/media/ui/activity/MediaActivity.java
lib_media/src/main/java/com/cnlive/media/ui/adapter/MediaAdapter.java
@@ -15,7 +15,6 @@ import com.cnlive.media.PickerConfig;
 import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.utils.AndroidQUtil;
 import com.cnlive.media.utils.GlideCacheUtil;
-import com.cnlive.strike.debug.R;
 import com.cnlive.strike.debug.databinding.ActivityMainBinding;
 import java.io.File;
@@ -70,12 +69,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                         .maxNum(5)
                         .setSelectGif(false)
                         .maxImageSize(25 * 1024 * 1024)
+                        .maxVideoSize(100*1024*1024)
                         .isReturnUri(AndroidQUtil.isAndroidQ())
-                        .selectMode(PickerConfig.PICKER_ONLY_ONE_TYPE)
+                        .selectMode(PickerConfig.PICKER_IMAGE_VIDEO)
                         .defaultSelectList(new ArrayList<Media>())
-                        .needCamera(true)
-                        .cachePath(fileDir + "/strike/file/")
-                        .setJumpCameraMode(PickerConfig.CAMERA_MODE_PIC)
+                        .needCamera(false)
                         .builder()
 //                        .doCrop(1, 1, 900, 900)
                         .start(this, PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE);
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.2.3",
+            version: "1.0.2.4",
             //Lib库前缀
             packeg : "com.cnlive.media",
             //Lib库名称
@@ -10,10 +10,14 @@ public class PickerConfig {
     //视频文件最大时长
     public static final String MAX_TIME = "max_time";
     // 默认视频时长
-    public static final int DEFAULT_MAX_TIME = 60 * 1000;
+    public static final int DEFAULT_MAX_TIME = Integer.MAX_VALUE;
+    //最大选择个数
+    public static final int DEFAULT_MAX_NUM= Integer.MAX_VALUE;
+
+    // 默认视频大小
+    public static final int DEFAULT_MAX_VIDEO_SIZE = Integer.MAX_VALUE;
+    public static final int DEFAULT_MAX_IMAGE_SIZE = Integer.MAX_VALUE;
-    // 默认视频时长
-    public static final int DEFAULT_MAX_VIDEO_TIME = 600 * 1000;
     //界面跳转options的键值
     public static final String INTENT_KEY_OPTIONS = "options";
     //图片选择模式，默认选视频和图片
@@ -40,6 +44,8 @@ public class PickerConfig {
     public static final int PICKER_IMAGE_VIDEO = 101;
     //只能选择一种类型
     public static final int PICKER_ONLY_ONE_TYPE = 103;
+    //视频选一个 图片选九个
+    public static final int PICKER_ONE_VIDEO_TYPE = 103;
     //展示图片的列数行数
     public static int GridSpanCount = 3;
     public static int GridSpace = 4;
@@ -59,7 +59,6 @@ public class MediaPickerFragmentPresenter extends MvpBasePresenter&lt;MediaPickerFr
         mediaPickerActivity.maxNum =  mediaPickerActivity.mOptions .getMaxNum();
         mediaPickerActivity.maxVideoSize =  mediaPickerActivity.mOptions .getMaxVideoSize();
         mediaPickerActivity.selectMode =  mediaPickerActivity.mOptions .getSelectMode();
-        mediaPickerActivity.maxTime =  mediaPickerActivity.mOptions .getMaxTime();
         mediaPickerActivity.isReturnUri =  mediaPickerActivity.mOptions .isReturnUri();
         mediaPickerActivity.isFrendCircle =  mediaPickerActivity.mOptions .isFriendCircle();
         mediaPickerActivity.needCrop =  mediaPickerActivity.mOptions .isNeedCrop();
@@ -36,7 +36,6 @@ public class MediaPresenter extends MvpBasePresenter&lt;MediaView&gt; {
         if (TextUtils.isEmpty(mediaPickerActivity.cachePath)) {
             if (AndroidQUtil.isAndroidQ()) {
                 mediaPickerActivity.cachePath = mediaPickerActivity.getExternalFilesDir("").getPath() + File.separator + "MediaPickerPic";
-
             } else {
                 mediaPickerActivity.cachePath = Environment.getExternalStorageDirectory().getPath() + File.separator + "MediaPickerPic";
             }
@@ -70,7 +69,6 @@ public class MediaPresenter extends MvpBasePresenter&lt;MediaView&gt; {
         mediaPickerActivity.maxNum = mediaPickerActivity.mOptions.getMaxNum();
         mediaPickerActivity.maxVideoSize = mediaPickerActivity.mOptions.getMaxVideoSize();
         mediaPickerActivity.selectMode = mediaPickerActivity.mOptions.getSelectMode();
-        mediaPickerActivity.maxTime = mediaPickerActivity.mOptions.getMaxTime();
         mediaPickerActivity.isReturnUri = mediaPickerActivity.mOptions.isReturnUri();
         mediaPickerActivity.isFrendCircle = mediaPickerActivity.mOptions.isFriendCircle();
         mediaPickerActivity.needCrop = mediaPickerActivity.mOptions.isNeedCrop();
@@ -80,7 +80,14 @@ public class MediaPickerFragmentView implements MvpView {
             @Override
             public void itemClick(Media media) {
                 if (DoublePressed.onDoublePressed()) return;
-                if (mActivity.mOptions.isSinglePick() || mActivity.mOptions.maxNum == 1) {
+                if (PickerConfig.PICKER_ONLY_ONE_TYPE == mActivity.selectMode && media.mediaType == 3) {
+                    if (mActivity.selects.size() > 0) {
+                        showMessage(mFragment.getResources().getString(R.string.msg_type_limit));
+                    } else {
+                        MeidaResultObservable.getInstance().finishMedia(true, media);
+                    }
+
+                } else if (mActivity.mOptions.isSinglePick() || mActivity.mOptions.maxNum == 1) {
                     if (mActivity.mOptions.isNeedCrop()) {
                         if (media.mediaType != 1) {
@@ -160,7 +167,7 @@ public class MediaPickerFragmentView implements MvpView {
             return false;
         }
         //视频时长限制
-        if (media.mediaType == 3 && media.duration > mActivity.maxTime) {
+        if (media.mediaType == 3 && media.duration > mActivity.maxVideoTime) {
             showMessage(mFragment.getResources().getString(R.string.media_msg_time_limit) + (MediaStringUtils.gennerMinSec(mActivity.maxVideoTime / 1000)));
             return false;
         }
@@ -196,7 +203,6 @@ public class MediaPickerFragmentView implements MvpView {
                 mediaActivity.allMedias.get(mediaActivity.allMedias.indexOf(select)).setSelect(true);
             }
         }
-//        List<Media> listMedias = medias.get(0).getMedias();
         if (mediaActivity.needCamera && medias.get(0) != null && medias.get(0).getMedias() != null
                 && medias.get(0).getMedias().get(0) != null && medias.get(0).getMedias().get(0).mediaType != 0) {
             mediaActivity.allMedias.add(0, new Media(0));
@@ -336,8 +336,8 @@ public class MediaView implements MvpView {
             return false;
         }
         //视频时长限制
-        if (media.mediaType == 3 && media.duration > mActivity.maxTime) {
-            showMessage(mActivity.getResources().getString(R.string.media_msg_time_limit) + (MediaStringUtils.gennerMinSec(mActivity.maxTime / 1000)));
+        if (media.mediaType == 3 && media.duration > mActivity.maxVideoTime) {
+            showMessage(mActivity.getResources().getString(R.string.media_msg_time_limit) + (MediaStringUtils.gennerMinSec(mActivity.maxVideoTime / 1000)));
             return false;
         }
         //判断是否支持gif
@@ -17,11 +17,11 @@ public class ImagePickerOptions implements Parcelable {
     }
     //最大个数
-    public int maxNum = 40;
+    public int maxNum = PickerConfig.DEFAULT_MAX_NUM;
     //视频的最大 的大小
-    public long maxVideoSize = 188743680L;
+    public long maxVideoSize = PickerConfig.DEFAULT_MAX_VIDEO_SIZE;
     //图片的最大大小
-    public long maxImageSize = 188743680L;
+    public long maxImageSize = PickerConfig.DEFAULT_MAX_IMAGE_SIZE;
     //是否展示相机
     public boolean needCamera = false;
     //选择模式
@@ -79,11 +79,11 @@ public class MediaActivity extends MvpBindingActivity&lt;MediaView, MediaPresenter,
     // 结果的code
     public int resultCode;
     //最大
-    public int maxNum = 40;
+    public int maxNum = 9;
     //视频的最大 的大小
-    public long maxVideoSize = 188743680L;
+    public long maxVideoSize = Integer.MAX_VALUE;
     //图片的最大大小
-    public long maxImageSize = 188743680L;
+    public long maxImageSize = Integer.MAX_VALUE;
     //是否展示相机
     public boolean needCamera = false;
     //选择模式
@@ -94,8 +94,6 @@ public class MediaActivity extends MvpBindingActivity&lt;MediaView, MediaPresenter,
     public String cachePath;
     //剪辑视频存储路径
     public String videoTrimPath;
-    //是否是朋友圈
-    public boolean friendCircle = false;
     //裁剪的数据
     public ImagePickerCropParams cropParams;
     //是否需要裁剪
@@ -104,8 +102,7 @@ public class MediaActivity extends MvpBindingActivity&lt;MediaView, MediaPresenter,
     public boolean singlePick = false;
     //展示时长
     public boolean showTime = false;
-    public int maxTime = 60 * 60_000;
-    public int maxVideoTime = PickerConfig.DEFAULT_MAX_VIDEO_TIME;
+    public int maxVideoTime = PickerConfig.DEFAULT_MAX_TIME;
     //是否选择Gif
     public boolean selectGift = true;
     //处理返回uri地址
@@ -162,7 +159,8 @@ public class MediaActivity extends MvpBindingActivity&lt;MediaView, MediaPresenter,
             } else if (type == PickerConfig.PICKER_ONLY_ONE_TYPE) {
                 loaderM = MediaLoader.getInstance(this, this);
                 getLoaderManager().initLoader(type, null, (MediaLoader) loaderM);
-            } else if (type == PickerConfig.PICKER_IMAGE) {
+            }
+            else if (type == PickerConfig.PICKER_IMAGE) {
                 loaderM = ImageLoader.getInstance(this, this);
                 getLoaderManager().initLoader(type, null, (ImageLoader) loaderM);
             } else if (type == PickerConfig.PICKER_VIDEO) {
@@ -90,6 +90,7 @@ public class MediaAdapter extends BaseRecyclerViewAdapter&lt;Media&gt; {
                 break;
         }
     }
+
     @Override
     public int getItemViewType(int position) {
         Media meida = getItem(position);
@@ -109,10 +110,11 @@ public class MediaAdapter extends BaseRecyclerViewAdapter&lt;Media&gt; {
     /**
      * 处理图像展示的逻辑
+     *
      * @param mediaViewHolder
      */
     private void showMedia(MediaViewHolder mediaViewHolder, int position) {
-        Media mMedia=getItem(position);
+        Media mMedia = getItem(position);
         binding = (MediaImageItemBinding) mediaViewHolder.getBinding();
         GlideCacheUtil.intoItemImageThumbnail(mContext, mMedia, binding.mediaImage, null);
         if (mMedia.mediaType == 1) {
@@ -122,7 +124,7 @@ public class MediaAdapter extends BaseRecyclerViewAdapter&lt;Media&gt; {
             binding.textViewSize.setText(showTime ? StringUtils.gennerTime(mMedia.duration / 1000) : FileUtils.getSizeByUnit(mMedia.size));
         }
         //单选
-        if (mOptions.singlePick||mOptions.isNeedCrop()||mOptions.maxNum==1) {
+        if (mOptions.singlePick || mOptions.isNeedCrop() || mOptions.maxNum == 1 || (mOptions.getSelectMode() == PickerConfig.PICKER_ONLY_ONE_TYPE && mMedia.mediaType == 3)) {
             binding.checkImage.setVisibility(View.GONE);
         } else {
             binding.checkImage.setVisibility(View.VISIBLE);
@@ -140,14 +142,17 @@ public class MediaAdapter extends BaseRecyclerViewAdapter&lt;Media&gt; {
     /**
      * 处理选中的事件
+     *
      * @param binding
      */
     private void progressSelectItem(MediaImageItemBinding binding, int position) {
-        if (listener != null) listener.itemSelect(getItem(position).isSelect(), getItem(position),position);
+        if (listener != null)
+            listener.itemSelect(getItem(position).isSelect(), getItem(position), position);
     }
     /**
      * 处理相机点击事件
+     *
      * @param mediaViewHolder
      */
     private void showCamera(MediaViewHolder mediaViewHolder, int position) {
@@ -157,6 +162,4 @@ public class MediaAdapter extends BaseRecyclerViewAdapter&lt;Media&gt; {
     }
-
-
 }