解决直接调起拍照，并裁剪后无法返回图片的bug，考虑到改动很少，所以该bug解决后未上传到远程仓库

jeasonlzy · Mar 22, 2017 · bb4490c · bb4490c
1 parent 32d77d9
commit bb4490c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/app/src/main/java/com/lzy/imagepickerdemo/wxdemo/WxDemoActivity.java b/app/src/main/java/com/lzy/imagepickerdemo/wxdemo/WxDemoActivity.java
@@ -53,7 +53,7 @@ private void initImagePicker() {
         ImagePicker imagePicker = ImagePicker.getInstance();
         imagePicker.setImageLoader(new GlideImageLoader());   //设置图片加载器
         imagePicker.setShowCamera(true);                      //显示拍照按钮
-        imagePicker.setCrop(false);                           //允许裁剪（单选才有效）
+        imagePicker.setCrop(true);                           //允许裁剪（单选才有效）
         imagePicker.setSaveRectangle(true);                   //是否按矩形区域保存
         imagePicker.setSelectLimit(maxImgCount);              //选中数量限制
         imagePicker.setStyle(CropImageView.Style.RECTANGLE);  //裁剪框的形状
@@ -96,6 +96,13 @@ public void onItemClick(View view, int position) {
                     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                         switch (position) {
                             case 0: // 直接调起相机
+                                /**
+                                 * 0.4.7 目前直接调起相机不支持裁剪，如果开启裁剪后不会返回图片，请注意，后续版本会解决
+                                 *
+                                 * 但是当前直接依赖的版本已经解决，考虑到版本改动很少，所以这次没有上传到远程仓库
+                                 *
+                                 * 如果实在有所需要，请直接下载源码引用。
+                                 */
                                 //打开选择,本次允许选择的数量
                                 ImagePicker.getInstance().setSelectLimit(maxImgCount - selImageList.size());
                                 Intent intent = new Intent(WxDemoActivity.this, ImageGridActivity.class);

diff --git a/bintray.gradle b/bintray.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "0.4.7"              // 数据仓库依赖第三部分
+version = "0.4.8"              // 数据仓库依赖第三部分
 
 def siteUrl = 'https://github.com/jeasonlzy0216/NineGridView'
 def gitUrl = 'https://github.com/jeasonlzy0216/NineGridView.git'

diff --git a/imagepicker/src/main/java/com/lzy/imagepicker/ui/ImageGridActivity.java b/imagepicker/src/main/java/com/lzy/imagepicker/ui/ImageGridActivity.java
@@ -322,8 +322,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     setResult(ImagePicker.RESULT_CODE_ITEMS, intent);   //单选不需要裁剪，返回数据
                     finish();
                 }
-            }
-            if (directPhoto){
+            } else if (directPhoto){
                 finish();
             }
         }