错误文件类型过滤

吴奎庆
1 parent d23df86b
Showing 8 changed files with 62 additions and 23 deletions
app/src/main/java/com/cnlive/strike/debug/MainActivity.java
config.gradle
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/media/entity/Media.java
lib_media/src/main/java/com/cnlive/media/utils/FileTypeUtil.java
lib_media/src/main/java/com/cnlive/media/utils/GlideCacheUtil.java
lib_media/src/main/res/values/strings.xml
@@ -76,14 +76,15 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 new ImagePicker.Builder()
                         .maxNum(9)
                         .setSelectGif(true)
+                        .isSinglePick(true)
                         .maxImageSize(25 * 1024 * 1024)
                         .maxVideoSize(100*1024*1024)
                         .isReturnUri(AndroidQUtil.isAndroidQ())
                         .selectMode(PickerConfig.PICKER_IMAGE_VIDEO)
                         .defaultSelectList(new ArrayList<Media>())
+                        .doCrop(1, 1, 900, 900)
                         .needCamera(true)
                         .builder()
-//                        .doCrop(1, 1, 900, 900)
                         .start(this, PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE);
                 break;
         }
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.6",
+            version: "1.0.8",
             //Lib库前缀
             packeg : "com.cnlive.media",
             //Lib库名称
@@ -94,7 +94,9 @@ public class MediaPickerFragmentView implements MvpView {
                         if (media.mediaType != 1) {
                             showMessage("请选择图片");
                         } else {
-                            MediaOpenActivityObservable.getInstance().openActivity(new MediaOpenInfo(2, media));
+                            if (isCheckMediaSupport(mActivity, media)) {
+                                MediaOpenActivityObservable.getInstance().openActivity(new MediaOpenInfo(2, media));
+                            }
                         }
                     } else {
                         if (isCheckMediaSupport(mActivity, media)) {
@@ -149,7 +151,7 @@ public class MediaPickerFragmentView implements MvpView {
         }
         //文件是否存在
-        if (media.size <= 0) {
+        if (media.size <= 0||media.isFail()) {
             showMessage(mFragment.getResources().getString(R.string.string_file_err));
             return false;
         }
@@ -169,6 +171,12 @@ public class MediaPickerFragmentView implements MvpView {
             showMessage(mFragment.getResources().getString(R.string.media_msg_video_limit));
             return false;
         }
+
+        //文件格式
+        if (media.mediaType == 1 && FileTypeUtil.checkImageType(media.path)) {
+            showMessage(mFragment.getResources().getString(R.string.media_msg_img_limit));
+            return false;
+        }
         //视频时长限制
         if (media.mediaType == 3 && media.duration > mActivity.maxVideoTime) {
             showMessage(mFragment.getResources().getString(R.string.media_msg_time_limit) + (MediaStringUtils.gennerMinSec(mActivity.maxVideoTime / 1000)));
@@ -239,7 +239,7 @@ public class MediaView implements MvpView {
         if (mActivity.selects.indexOf(mMedia) < 0) {
             previewBottomAdapter = new PreviewBottomMediaAdapter(mActivity, 0, mActivity.isPre);
         } else {
-            previewBottomAdapter = new PreviewBottomMediaAdapter(mActivity, mActivity.selects.indexOf(mMedia),true);
+            previewBottomAdapter = new PreviewBottomMediaAdapter(mActivity, mActivity.selects.indexOf(mMedia), true);
         }
         bottomRv.setAdapter(previewBottomAdapter);
         if (mActivity.selects != null && mActivity.selects.size() > 0) {
@@ -315,7 +315,7 @@ public class MediaView implements MvpView {
         }
         //文件是否存在
         //文件是否存在
-        if (media.size <= 0) {
+        if (media.size <= 0 || media.isFail()) {
             showMessage(mActivity.getResources().getString(R.string.string_file_err));
             return false;
         }
@@ -335,6 +335,12 @@ public class MediaView implements MvpView {
             showMessage(mActivity.getResources().getString(R.string.media_msg_video_limit));
             return false;
         }
+
+        //文件格式
+        if (media.mediaType == 1 && FileTypeUtil.checkImageType(media.path)) {
+            showMessage(mActivity.getResources().getString(R.string.media_msg_img_limit));
+            return false;
+        }
         //视频时长限制
         if (media.mediaType == 3 && media.duration > mActivity.maxVideoTime) {
             showMessage(mActivity.getResources().getString(R.string.media_msg_time_limit) + (MediaStringUtils.gennerMinSec(mActivity.maxVideoTime / 1000)));
@@ -454,7 +460,7 @@ public class MediaView implements MvpView {
             barTitle.setText(barTitleText);
             checkLayout.setVisibility(View.GONE);
         } else {
-            if (mActivity.allMedias.get(0).mediaType==0) {
+            if (mActivity.allMedias.get(0).mediaType == 0) {
                 String barTitleText = String.format(mActivity.getResources().getString(R.string.btn_bar_title), mActivity.allMedias.indexOf(media), mActivity.allMedias.size() - 1);
                 barTitle.setText(barTitleText);
                 checkLayout.setVisibility(View.VISIBLE);
@@ -38,6 +38,16 @@ public class Media  implements Parcelable  {
     public int imgHeight;
     public boolean isLongImg;
+    //损坏图片
+    public boolean isFail;
+
+    public boolean isFail() {
+        return isFail;
+    }
+
+    public void setFail(boolean fail) {
+        isFail = fail;
+    }
     public int getImgWidth() {
         return imgWidth;
@@ -223,7 +223,7 @@ public class FileTypeUtil {
     private static final String video_types = ".avi.asf.asx.flv.lsf.lsx.mov.mp3.mp4.mpeg.mpg4";
     private static final String gif_types = ".gif";
-    private static final String no_support_types = ".bmp";
+    private static final String no_support_types = ".bmp.tiff";
     public static boolean checkVideoType(String path) {
         if (TextUtils.isEmpty(path)) return false;
@@ -234,6 +234,15 @@ public class FileTypeUtil {
         if (TextUtils.isEmpty(type)) return false;
         return !video_types.contains(type);
     }
+    public static boolean checkImageType(String path) {
+        if (TextUtils.isEmpty(path)) return false;
+        int end = path.lastIndexOf(".");
+        if (end <= 0) return false;
+
+        String type = path.substring(end);
+        if (TextUtils.isEmpty(type)) return false;
+        return no_support_types.contains(type);
+    }
     public static boolean isGif(String path) {
         if (TextUtils.isEmpty(path)) return false;
@@ -329,16 +329,16 @@ public class GlideCacheUtil {
             }
             if (AndroidQUtil.isAndroidQ()) {
                 view.setTag(mediaUri.toString());
-                showAndroidQ(context, media.mediaType, mediaUri, view, loading, option);
+                showAndroidQ(context, media, mediaUri, view, loading, option);
             } else {
                 if (media.mediaType == 1) {
-                    showNoAndroidQ(context, media.mediaType, media.fileUri, view, loading, option);
+                    showNoAndroidQ(context, media, media.fileUri, view, loading, option);
                 } else if (media.mediaType == 3) {
                     if (ThumbnailsUtils.thumbnails.containsKey(media.id + "")) {
-                        showVideoNoAndroidQ(context, media.mediaType, ThumbnailsUtils.thumbnails.get(media.id + ""), view, loading, option);
+                        showVideoNoAndroidQ(context, media, ThumbnailsUtils.thumbnails.get(media.id + ""), view, loading, option);
                     } else {
                         view.setTag(media.id);
-                        showVideoThumbnail(context, media.mediaType, media.id, media.path, view, loading, option);
+                        showVideoThumbnail(context, media, media.id, media.path, view, loading, option);
                     }
                 }
             }
@@ -349,13 +349,14 @@ public class GlideCacheUtil {
         }
     }
-    private static void showAndroidQUri(Context context, Uri path, ImageView view, ProgressBar loading, RequestOptions option) {
+    private static void showAndroidQUri(Context context, Media media, Uri path, ImageView view, ProgressBar loading, RequestOptions option) {
         RequestBuilder rb = Glide.with(context).load(path);
         rb.listener(new RequestListener() {
             @Override
             public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
                 view.setScaleType(ImageView.ScaleType.CENTER);
                 if (loading != null) loading.setVisibility(View.GONE);
+                media.setFail(true);
                 return false;
             }
@@ -369,7 +370,7 @@ public class GlideCacheUtil {
         rb.apply(option).into(view);
     }
-    private static void showAndroidQ(Context context, int mediaType, Uri mediaUri, ImageView view, ProgressBar loading, RequestOptions option) {
+    private static void showAndroidQ(Context context, Media media, Uri mediaUri, ImageView view, ProgressBar loading, RequestOptions option) {
         Observable.create(new ObservableOnSubscribe<Bitmap>() {
             @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@@ -391,14 +392,14 @@ public class GlideCacheUtil {
             @Override
             public void onNext(Bitmap bean) {
                 if (view.getTag() != null && mediaUri.toString().equals(view.getTag())) {
-                    showThumbnail(context, bean, view, loading, option);
+                    showThumbnail(context, media,bean, view, loading, option);
                 }
             }
             @Override
             public void onError(Throwable e) {
                 if (view.getTag() != null && mediaUri.toString().equals(view.getTag())) {
-                    showAndroidQUri(context, mediaUri, view, loading, option);
+                    showAndroidQUri(context,media, mediaUri, view, loading, option);
                 }
                 if (loading != null) loading.setVisibility(View.GONE);
             }
@@ -410,13 +411,14 @@ public class GlideCacheUtil {
         });
     }
-    private static void showVideoNoAndroidQ(Context context, int mediaType, String path, ImageView view, ProgressBar loading, RequestOptions option) {
+    private static void showVideoNoAndroidQ(Context context, Media media, String path, ImageView view, ProgressBar loading, RequestOptions option) {
         RequestBuilder rb = Glide.with(context).load(path);
         rb.listener(new RequestListener() {
             @Override
             public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
                 view.setScaleType(ImageView.ScaleType.CENTER);
                 if (loading != null) loading.setVisibility(View.GONE);
+                media.setFail(true);
                 return false;
             }
@@ -430,13 +432,14 @@ public class GlideCacheUtil {
         rb.thumbnail(0.05f).apply(option).into(view);
     }
-    private static void showNoAndroidQ(Context context, int mediaType, String path, ImageView view, ProgressBar loading, RequestOptions option) {
+    private static void showNoAndroidQ(Context context, Media media, String path, ImageView view, ProgressBar loading, RequestOptions option) {
         RequestBuilder rb = Glide.with(context).load(path);
         rb.listener(new RequestListener() {
             @Override
             public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
                 view.setScaleType(ImageView.ScaleType.CENTER);
                 if (loading != null) loading.setVisibility(View.GONE);
+                media.setFail(true);
                 return false;
             }
@@ -451,7 +454,7 @@ public class GlideCacheUtil {
     }
-    private static void showVideoThumbnail(Context context, int mediaType, long id, String path, ImageView view, ProgressBar loading, RequestOptions option) {
+    private static void showVideoThumbnail(Context context, Media media, long id, String path, ImageView view, ProgressBar loading, RequestOptions option) {
 //        // 步骤1：创建被观察者 =  Flowable
         Flowable.create(new FlowableOnSubscribe<Bitmap>() {
             @Override
@@ -472,12 +475,12 @@ public class GlideCacheUtil {
                     @Override
                     public void onNext(Bitmap thumbnails) {
                         if (view.getTag() != null && view.getTag().toString().equals(id + ""))
-                            showThumbnail(context, thumbnails, view, loading, option);
+                            showThumbnail(context, media, thumbnails, view, loading, option);
                     }
                     @Override
                     public void onError(Throwable t) {
-                        showNoAndroidQ(context, mediaType, path, view, loading, option);
+                        showNoAndroidQ(context, media, path, view, loading, option);
                         if (loading != null) loading.setVisibility(View.GONE);
                     }
@@ -488,13 +491,14 @@ public class GlideCacheUtil {
     }
-    private static void showThumbnail(Context context, Bitmap bm, ImageView view, ProgressBar loading, RequestOptions option) {
+    private static void showThumbnail(Context context, Media media, Bitmap bm, ImageView view, ProgressBar loading, RequestOptions option) {
         RequestBuilder rb = Glide.with(context).load(bm);
         rb.listener(new RequestListener() {
             @Override
             public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
                 view.setScaleType(ImageView.ScaleType.CENTER);
                 if (loading != null) loading.setVisibility(View.GONE);
+                media.setFail(true);
                 return false;
             }
@@ -40,6 +40,7 @@
     <string name="media_msg_time_limit">请压缩和剪切后上传，时长最大只支持</string>
     <string name="media_msg_video_limit">不支持这种格式的视频</string>
+    <string name="media_msg_img_limit">不支持这种格式的图片</string>
     <string name="msg_gif_limit">请选择其他图片,Gif格式不被支持</string>
     <string name="select_null">请选择文件</string>
@@ -64,6 +65,6 @@
     <string name="msg_no_camera">没有系统相机</string>
     <string name="msg_no_camera_permission">相机开启失败,请开启系统相机权限</string>
     <string name="msg_error_camera">相机开启失败</string>
-    <string name="string_file_err">文件以损坏</string>
+    <string name="string_file_err">文件已损坏</string>
 </resources>