From 6dde7f5555cad6ebbb2fd4e7c88f3677f85c111d Mon Sep 17 00:00:00 2001 From: ryanhoo Date: Tue, 29 Sep 2015 16:12:16 +0800 Subject: [PATCH 1/4] fix(Crop): On some devices crop action always return RESULT_CANCEL --- .../main/java/org/hybridsquad/android/library/CropHelper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/library/src/main/java/org/hybridsquad/android/library/CropHelper.java b/library/src/main/java/org/hybridsquad/android/library/CropHelper.java index 03f6d00..8b333e5 100644 --- a/library/src/main/java/org/hybridsquad/android/library/CropHelper.java +++ b/library/src/main/java/org/hybridsquad/android/library/CropHelper.java @@ -161,8 +161,7 @@ private static Intent buildCropIntent(String action, CropParams params) { .putExtra("return-data", params.returnData) .putExtra("outputFormat", params.outputFormat) .putExtra("noFaceDetection", params.noFaceDetection) - .putExtra("scaleUpIfNeeded", params.scaleUpIfNeeded) - .putExtra(MediaStore.EXTRA_OUTPUT, params.uri); + .putExtra("scaleUpIfNeeded", params.scaleUpIfNeeded); } // Clear Cache From 5eb3a9c615e5bb578b564b0e579a27b7482b1b63 Mon Sep 17 00:00:00 2001 From: ryanhoo Date: Tue, 29 Sep 2015 16:13:02 +0800 Subject: [PATCH 2/4] feat(CropParams): Add a constructor for convenience --- .../java/org/hybridsquad/android/library/CropParams.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/library/src/main/java/org/hybridsquad/android/library/CropParams.java b/library/src/main/java/org/hybridsquad/android/library/CropParams.java index 58623dc..2332ba2 100644 --- a/library/src/main/java/org/hybridsquad/android/library/CropParams.java +++ b/library/src/main/java/org/hybridsquad/android/library/CropParams.java @@ -90,6 +90,12 @@ public CropParams(Context context) { refreshUri(); } + public CropParams(Context context, boolean cropEnabled, boolean compressEnabled) { + this(context); + enable = cropEnabled; + compress = compressEnabled; + } + public void refreshUri() { uri = CropHelper.generateUri(); } From eaf04cf65269b2120dc4d503acea9c261de58519 Mon Sep 17 00:00:00 2001 From: ryanhoo Date: Tue, 29 Sep 2015 16:13:56 +0800 Subject: [PATCH 3/4] update(Version): v3.0.1 --- library/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 378cde4..a19a6d0 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' -version = "3.0.0" +version = "3.0.1" android { compileSdkVersion 20 buildToolsVersion "20.0.0" @@ -12,7 +12,7 @@ android { defaultConfig { minSdkVersion 8 targetSdkVersion 20 - versionCode 15 + versionCode 16 versionName version } buildTypes { From b4acad09a6e867e60bf3f1b05b178e650592340e Mon Sep 17 00:00:00 2001 From: iloveaman Date: Thu, 15 Oct 2015 15:29:12 +0800 Subject: [PATCH 4/4] Update CropHelper.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复魅族手机通过gallery选图后进入裁剪后一直在加载的问题 --- .../org/hybridsquad/android/library/CropHelper.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/library/src/main/java/org/hybridsquad/android/library/CropHelper.java b/library/src/main/java/org/hybridsquad/android/library/CropHelper.java index 8b333e5..0289f9d 100644 --- a/library/src/main/java/org/hybridsquad/android/library/CropHelper.java +++ b/library/src/main/java/org/hybridsquad/android/library/CropHelper.java @@ -127,14 +127,18 @@ private static void onPhotoCropped(CropHandler handler, CropParams cropParams) { // None-Crop Intents public static Intent buildGalleryIntent(CropParams params) { - Intent intent; - if (params.enable) { + Intent intent; + /*if (params.enable) { intent = buildCropIntent(Intent.ACTION_GET_CONTENT, params); } else { intent = new Intent(Intent.ACTION_GET_CONTENT) - .setType("image/*") + .setType("image*//*") .putExtra(MediaStore.EXTRA_OUTPUT, params.uri); - } + }*/ + + intent = new Intent(Intent.ACTION_GET_CONTENT) + .setType("image/*") + .putExtra(MediaStore.EXTRA_OUTPUT, params.uri); return intent; }