diff --git a/build.gradle b/build.gradle index 51cdacf..cd0d4d5 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0-alpha13' + classpath 'com.android.tools.build:gradle:3.4.0-alpha01' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files classpath 'com.novoda:bintray-release:0.5.0' diff --git a/library/src/main/java/com/linchaolong/android/imagepicker/ImagePicker.java b/library/src/main/java/com/linchaolong/android/imagepicker/ImagePicker.java index 4f6d4ba..99464f7 100644 --- a/library/src/main/java/com/linchaolong/android/imagepicker/ImagePicker.java +++ b/library/src/main/java/com/linchaolong/android/imagepicker/ImagePicker.java @@ -359,12 +359,16 @@ private void handlePickImageInner(Activity activity, Fragment fragment, Uri imag // 打开裁剪图片界面 CropImage.ActivityBuilder builder = CropImage.activity(imageUri); // 裁剪配置 - callback.cropConfig(builder); + if (callback != null) { + callback.cropConfig(builder); + } // 启动裁剪界面 if (activity != null) { builder.start(activity); }else{ - builder.start(fragment.getActivity(), fragment); + if (fragment.getActivity() != null) { + builder.start(fragment.getActivity(), fragment); + } } }