commit

Leney · Mar 21, 2020 · 4f5aa23 · 4f5aa23
1 parent c0007f3
commit 4f5aa23
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 11 deletions.
diff --git a/picture_library/src/main/java/com/luck/picture/lib/PictureSelectorActivity.java b/picture_library/src/main/java/com/luck/picture/lib/PictureSelectorActivity.java
@@ -1337,10 +1337,12 @@ private void requestCamera(Intent data) {
                 int lastIndexOf = config.cameraPath.lastIndexOf("/") + 1;
                 media.setId(lastIndexOf > 0 ? ValueOf.toLong(config.cameraPath.substring(lastIndexOf)) : -1);
                 media.setRealPath(path);
-                if (config.isUseCustomCamera && data != null) {
+                if (config.isUseCustomCamera) {
                     // 自定义拍照时已经在应用沙盒内生成了文件
-                    String mediaPath = data.getStringExtra(PictureConfig.EXTRA_MEDIA_PATH);
-                    media.setAndroidQToPath(mediaPath);
+                    if (data != null) {
+                        String mediaPath = data.getStringExtra(PictureConfig.EXTRA_MEDIA_PATH);
+                        media.setAndroidQToPath(mediaPath);
+                    }
                 }
             } else {
                 File file = new File(config.cameraPath);

diff --git a/picture_library/src/main/java/com/luck/picture/lib/PictureSelectorCameraEmptyActivity.java b/picture_library/src/main/java/com/luck/picture/lib/PictureSelectorCameraEmptyActivity.java
@@ -229,10 +229,12 @@ protected void requestCamera(Intent data) {
                 int lastIndexOf = config.cameraPath.lastIndexOf("/") + 1;
                 media.setId(lastIndexOf > 0 ? ValueOf.toLong(config.cameraPath.substring(lastIndexOf)) : -1);
                 media.setRealPath(path);
-                if (config.isUseCustomCamera && data != null) {
+                if (config.isUseCustomCamera) {
                     // 自定义拍照时已经在应用沙盒内生成了文件
-                    String mediaPath = data.getStringExtra(PictureConfig.EXTRA_MEDIA_PATH);
-                    media.setAndroidQToPath(mediaPath);
+                    if (data != null) {
+                        String mediaPath = data.getStringExtra(PictureConfig.EXTRA_MEDIA_PATH);
+                        media.setAndroidQToPath(mediaPath);
+                    }
                 }
             } else {
                 final File file = new File(config.cameraPath);

diff --git a/ucrop/src/main/java/com/yalantis/ucrop/PictureMultiCuttingActivity.java b/ucrop/src/main/java/com/yalantis/ucrop/PictureMultiCuttingActivity.java
@@ -140,9 +140,9 @@ protected void resetCutData() {
         Bundle extras = intent.getExtras();
         String path = list.get(cutIndex).getPath();
         boolean isHttp = MimeType.isHttp(path);
-        String suffix = MimeType.getLastImgType(path.startsWith("content://")
+        String suffix = MimeType.getLastImgType(MimeType.isContent(path)
                 ? FileUtils.getPath(this, Uri.parse(path)) : path);
-        Uri uri = isHttp || path.startsWith("content://") ? Uri.parse(path) : Uri.fromFile(new File(path));
+        Uri uri = isHttp || MimeType.isContent(path) ? Uri.parse(path) : Uri.fromFile(new File(path));
         extras.putParcelable(UCrop.EXTRA_INPUT_URI, uri);
         File file = Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED) ?
                 getExternalFilesDir(Environment.DIRECTORY_PICTURES) : getCacheDir();

diff --git a/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapCropTask.java b/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapCropTask.java
@@ -19,6 +19,7 @@
 import com.yalantis.ucrop.util.BitmapLoadUtils;
 import com.yalantis.ucrop.util.FileUtils;
 import com.yalantis.ucrop.util.ImageHeaderParser;
+import com.yalantis.ucrop.util.MimeType;
 import com.yalantis.ucrop.util.SdkUtils;
 
 import java.io.File;
@@ -154,7 +155,7 @@ private boolean crop() throws IOException {
         if (shouldCrop) {
             ExifInterface originalExif;
             ParcelFileDescriptor parcelFileDescriptor = null;
-            if (SdkUtils.isQ() && mImageInputPath.startsWith("content://")) {
+            if (SdkUtils.isQ() && MimeType.isContent(mImageInputPath)) {
                 parcelFileDescriptor =
                         getContext().getContentResolver().openFileDescriptor(Uri.parse(mImageInputPath), "r");
                 originalExif = new ExifInterface(new FileInputStream(parcelFileDescriptor.getFileDescriptor()));
@@ -170,7 +171,7 @@ private boolean crop() throws IOException {
             }
             return true;
         } else {
-            if (SdkUtils.isQ() && mImageInputPath.startsWith("content://")) {
+            if (SdkUtils.isQ() && MimeType.isContent(mImageInputPath)) {
                 ParcelFileDescriptor parcelFileDescriptor =
                         getContext().getContentResolver().openFileDescriptor(Uri.parse(mImageInputPath), "r");
                 FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor();

diff --git a/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapLoadTask.java b/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapLoadTask.java
@@ -21,6 +21,7 @@
 import com.yalantis.ucrop.model.ExifInfo;
 import com.yalantis.ucrop.util.BitmapLoadUtils;
 import com.yalantis.ucrop.util.FileUtils;
+import com.yalantis.ucrop.util.MimeType;
 import com.yalantis.ucrop.util.SdkUtils;
 
 import java.io.BufferedInputStream;
@@ -265,7 +266,7 @@ private void downloadFile(@NonNull Uri inputUri, @Nullable Uri outputUri) throws
     protected void onPostExecute(@NonNull BitmapWorkerResult result) {
         if (result.mBitmapWorkerException == null) {
             String inputUriString = mInputUri.toString();
-            mBitmapLoadCallback.onBitmapLoaded(result.mBitmapResult, result.mExifInfo, inputUriString.startsWith("content://") ? inputUriString : mInputUri.getPath(), (mOutputUri == null) ? null : mOutputUri.getPath());
+            mBitmapLoadCallback.onBitmapLoaded(result.mBitmapResult, result.mExifInfo, MimeType.isContent(inputUriString) ? inputUriString : mInputUri.getPath(), (mOutputUri == null) ? null : mOutputUri.getPath());
         } else {
             mBitmapLoadCallback.onFailure(result.mBitmapWorkerException);
         }

diff --git a/ucrop/src/main/java/com/yalantis/ucrop/util/MimeType.java b/ucrop/src/main/java/com/yalantis/ucrop/util/MimeType.java
@@ -122,6 +122,19 @@ public static boolean isGif(String mimeType) {
         return mimeType != null && (mimeType.equals("image/gif") || mimeType.equals("image/GIF"));
     }
 
+    /**
+     * 是否是content://类型
+     *
+     * @param url
+     * @return
+     */
+    public static boolean isContent(String url) {
+        if (TextUtils.isEmpty(url)) {
+            return false;
+        }
+        return url.startsWith("content://");
+    }
+
     /**
      * 获取mimeType
      *