From 07fa10ef006d2feff360704535e08eee93a78149 Mon Sep 17 00:00:00 2001
From: MZ <maozhou3@163.com>
Date: Mon, 11 Jun 2018 17:17:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86android=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=A3=81=E5=89=AA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/devio/takephoto/model/TImage.java     |  6 ++++-
 .../java/org/devio/takephoto/uitl/TUtils.java | 27 ++++++++++---------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/takephoto_library/src/main/java/org/devio/takephoto/model/TImage.java b/takephoto_library/src/main/java/org/devio/takephoto/model/TImage.java
index 35374670..4887f2b3 100644
--- a/takephoto_library/src/main/java/org/devio/takephoto/model/TImage.java
+++ b/takephoto_library/src/main/java/org/devio/takephoto/model/TImage.java
@@ -44,7 +44,11 @@ public void setOriginalPath(String originalPath) {
     }
 
     public String getCompressPath() {
-        return compressPath;
+        if (compressed) {
+            return compressPath;
+        } else {
+            return originalPath;
+        }
     }
 
     public void setCompressPath(String compressPath) {
diff --git a/takephoto_library/src/main/java/org/devio/takephoto/uitl/TUtils.java b/takephoto_library/src/main/java/org/devio/takephoto/uitl/TUtils.java
index 84cbfc8d..d513f4f1 100644
--- a/takephoto_library/src/main/java/org/devio/takephoto/uitl/TUtils.java
+++ b/takephoto_library/src/main/java/org/devio/takephoto/uitl/TUtils.java
@@ -13,14 +13,15 @@
 import android.widget.Toast;
 
 import com.darsh.multipleimageselect.models.Image;
+import com.soundcloud.android.crop.Crop;
+
+import org.devio.takephoto.R;
 import org.devio.takephoto.model.CropOptions;
+import org.devio.takephoto.model.TContextWrap;
 import org.devio.takephoto.model.TException;
 import org.devio.takephoto.model.TExceptionType;
 import org.devio.takephoto.model.TImage;
 import org.devio.takephoto.model.TIntentWap;
-import org.devio.takephoto.R;
-import org.devio.takephoto.model.TContextWrap;
-import com.soundcloud.android.crop.Crop;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -99,7 +100,7 @@ public static void startActivityForResult(TContextWrap contextWrap, TIntentWap i
      * @throws TException
      */
     public static void sendIntentBySafely(TContextWrap contextWrap, List<TIntentWap> intentWapList, int defaultIndex, boolean isCrop)
-        throws TException {
+            throws TException {
         if (defaultIndex + 1 > intentWapList.size()) {
             throw new TException(isCrop ? TExceptionType.TYPE_NO_MATCH_PICK_INTENT : TExceptionType.TYPE_NO_MATCH_CROP_INTENT);
         }
@@ -119,7 +120,7 @@ public static void captureBySafely(TContextWrap contextWrap, TIntentWap intentWa
         List result = contextWrap.getActivity().getPackageManager().queryIntentActivities(intentWap.getIntent(), PackageManager.MATCH_ALL);
         if (result.isEmpty()) {
             Toast.makeText(contextWrap.getActivity(), contextWrap.getActivity().getResources().getText(R.string.tip_no_camera),
-                Toast.LENGTH_SHORT).show();
+                    Toast.LENGTH_SHORT).show();
             throw new TException(TExceptionType.TYPE_NO_CAMERA);
         } else {
             startActivityForResult(contextWrap, intentWap);
@@ -146,7 +147,7 @@ public static void cropWithOtherAppBySafely(TContextWrap contextWrap, Uri imageU
             //                e.printStackTrace();
             //            }
             startActivityForResult(contextWrap,
-                new TIntentWap(IntentUtils.getCropIntentWithOtherApp(imageUri, outPutUri, options), TConstant.RC_CROP));
+                    new TIntentWap(IntentUtils.getCropIntentWithOtherApp(imageUri, outPutUri, options), TConstant.RC_CROP));
         }
     }
 
@@ -162,16 +163,16 @@ public static void cropWithOwnApp(TContextWrap contextWrap, Uri imageUri, Uri ou
         if (options.getAspectX() * options.getAspectY() > 0) {
             if (contextWrap.getFragment() != null) {
                 Crop.of(imageUri, outPutUri)
-                    .withAspect(options.getAspectX(), options.getAspectY())
-                    .start(contextWrap.getActivity(), contextWrap.getFragment());
+                        .withAspect(options.getAspectX(), options.getAspectY())
+                        .start(contextWrap.getActivity(), contextWrap.getFragment());
             } else {
                 Crop.of(imageUri, outPutUri).withAspect(options.getAspectX(), options.getAspectY()).start(contextWrap.getActivity());
             }
         } else if (options.getOutputX() * options.getOutputY() > 0) {
             if (contextWrap.getFragment() != null) {
                 Crop.of(imageUri, outPutUri)
-                    .withMaxSize(options.getOutputX(), options.getOutputY())
-                    .start(contextWrap.getActivity(), contextWrap.getFragment());
+                        .withMaxSize(options.getOutputX(), options.getOutputY())
+                        .start(contextWrap.getActivity(), contextWrap.getFragment());
             } else {
                 Crop.of(imageUri, outPutUri).withMaxSize(options.getOutputX(), options.getOutputY()).start(contextWrap.getActivity());
             }
@@ -197,9 +198,9 @@ public static boolean isReturnData() {
                 return true;
             }
         }
-        //        if (sdk>=21){//5.0或以上版本要求返回数据
-        //            return  true;
-        //        }
+        if (sdk >= 21 && sdk <= 22 || sdk == 25) {//5.0或以上版本要求返回数据
+            return true;
+        }
         return false;
     }