发布1.0.4

junixapp · Jun 21, 2019 · 18e202a · 18e202a
1 parent 9aaeabd
commit 18e202a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/matisse/build.gradle b/matisse/build.gradle
@@ -37,7 +37,7 @@ publish {
     userOrg = 'li-xiaojun'
     groupId = 'com.lxj'
     artifactId = 'matisse'
-    publishVersion = '1.0.3'
+    publishVersion = '1.0.4'
     repoName = 'jrepo'
     desc = '图片，视频选择和裁剪库，知乎Matisse的增强版。'
     website = 'https://github.com/li-xiaojun/Matisse'

diff --git a/matisse/src/main/java/com/lxj/matisse/ui/MatisseActivity.java b/matisse/src/main/java/com/lxj/matisse/ui/MatisseActivity.java
@@ -182,6 +182,8 @@ public void onBackPressed() {
         super.onBackPressed();
     }
 
+    ArrayList<Uri> selectedUris = new ArrayList<>();
+    ArrayList<String> selectedPaths = new ArrayList<>();
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -195,15 +197,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             int collectionType = resultBundle.getInt(SelectedItemCollection.STATE_COLLECTION_TYPE,
                     SelectedItemCollection.COLLECTION_UNDEFINED);
             if (data.getBooleanExtra(BasePreviewActivity.EXTRA_RESULT_APPLY, false)) {
-                if(mSpec.isCrop && selected.size()==1 && selected.get(0).isImage()){
-                    //start crop
-                    startCrop(this, selected.get(0).uri);
-                    return;
-                }
-
                 Intent result = new Intent();
-                ArrayList<Uri> selectedUris = new ArrayList<>();
-                ArrayList<String> selectedPaths = new ArrayList<>();
+                selectedUris.clear();
+                selectedPaths.clear();
                 if (selected != null) {
                     for (Item item : selected) {
                         selectedUris.add(item.getContentUri());
@@ -213,6 +209,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 result.putParcelableArrayListExtra(MatisseConst.EXTRA_RESULT_SELECTION, selectedUris);
                 result.putStringArrayListExtra(MatisseConst.EXTRA_RESULT_SELECTION_PATH, selectedPaths);
                 result.putExtra(MatisseConst.EXTRA_RESULT_ORIGINAL_ENABLE, mOriginalEnable);
+                if(mSpec.isCrop && selected!=null && selected.size()==1 && selected.get(0).isImage()){
+                    //开启裁剪
+                    startCrop(this, selected.get(0).uri);
+                    return;
+                }
                 setResult(RESULT_OK, result);
                 finish();
             } else {
@@ -232,8 +233,12 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             final Uri resultUri = UCrop.getOutput(data);
             if (resultUri != null) {
                 //finish with result.
-                Intent result = new Intent();
+                Intent result = getIntent();
                 result.putExtra(MatisseConst.EXTRA_RESULT_CROP_PATH, resultUri.getPath());
+                ArrayList<Uri> selectedUris = (ArrayList<Uri>) mSelectedCollection.asListOfUri();
+                result.putParcelableArrayListExtra(MatisseConst.EXTRA_RESULT_SELECTION, selectedUris);
+                ArrayList<String> selectedPaths = (ArrayList<String>) mSelectedCollection.asListOfString();
+                result.putStringArrayListExtra(MatisseConst.EXTRA_RESULT_SELECTION_PATH, selectedPaths);
                 setResult(RESULT_OK, result);
                 finish();
             } else {

diff --git a/sample/src/main/java/com/lxj/matisse/sample/SampleActivity.java b/sample/src/main/java/com/lxj/matisse/sample/SampleActivity.java
@@ -132,7 +132,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 captureText.setText("拍照路径："+capturePath);
             }else if((cropPath = Matisse.obtainCropResult(data))!=null){
                 captureText.setVisibility(View.VISIBLE);
-                captureText.setText("裁剪的路径："+cropPath);
+                String s = "裁剪的路径："+cropPath;
+                s += "\n 原图路径：" + Matisse.obtainSelectPathResult(data).get(0);
+                captureText.setText(s);
             }else {
                 mAdapter.setData(Matisse.obtainSelectUriResult(data), Matisse.obtainSelectPathResult(data));
                 Log.e("OnActivityResult", "originalState: "+String.valueOf(Matisse.obtainOriginalState(data)));