1，完善库

Author: FlyJingFish

library/src/main/java/com/flyjingfish/shapeimageviewlib/ShapeImageView.java

@@ -297,15 +297,17 @@ protected void onDraw(Canvas canvas) {
         drawBgShape(canvas);
         clipPadding(canvas);
         mDrawPath.reset();
+        mAttacher.updateDisplayMatrix();
+        RectF rectF = mAttacher.getDisplayRectF();
         if (shapeType == ShapeType.OVAL) {
-            mDrawPath.addOval(mDrawRectF, Path.Direction.CCW);
+            mDrawPath.addOval(rectF, Path.Direction.CCW);
         } else if (shapeType == ShapeType.RECTANGLE) {
             float leftTopRadius = ViewUtils.getRtlValue(isRtl ? endTopRadius : startTopRadius, this.leftTopRadius);
             float rightTopRadius = ViewUtils.getRtlValue(isRtl ? startTopRadius : endTopRadius, this.rightTopRadius);
             float rightBottomRadius = ViewUtils.getRtlValue(isRtl ? startBottomRadius : endBottomRadius, this.rightBottomRadius);
             float leftBottomRadius = ViewUtils.getRtlValue(isRtl ? endBottomRadius : startBottomRadius, this.leftBottomRadius);
             float[] radius = new float[]{leftTopRadius,leftTopRadius,rightTopRadius,rightTopRadius,rightBottomRadius,rightBottomRadius,leftBottomRadius,leftBottomRadius};
-            mDrawPath.addRoundRect(mDrawRectF,radius,Path.Direction.CCW);
+            mDrawPath.addRoundRect(rectF,radius,Path.Direction.CCW);
         }
 
         if (shapeType == ShapeType.OVAL || shapeType == ShapeType.RECTANGLE) {

library/src/main/java/com/flyjingfish/shapeimageviewlib/ShapeImageViewAttacher.java

@@ -1,14 +1,19 @@
 package com.flyjingfish.shapeimageviewlib;
 
+import android.graphics.Canvas;
 import android.graphics.Matrix;
+import android.graphics.Rect;
+import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.PictureDrawable;
 import android.view.View;
 import android.widget.ImageView;
 
 
 class ShapeImageViewAttacher implements View.OnLayoutChangeListener {
     private final ShapeImageView mImageView;
     private final Matrix mBaseMatrix = new Matrix();
+    private final Matrix mDisplayMatrix = new Matrix();
     private final Matrix mDrawMatrix = new Matrix();
     private ShapeImageView.ShapeScaleType mScaleType;
     private float mAutoCropHeightWidthRatio;
@@ -131,4 +136,89 @@ public Matrix getImageMatrix() {
     public void setAutoCropHeightWidthRatio(float autoCropHeightWidthRatio) {
         this.mAutoCropHeightWidthRatio = autoCropHeightWidthRatio;
     }
+
+    public void updateDisplayMatrix() {
+        Drawable drawable = mImageView.getDrawable();
+        if (drawable == null) {
+            return;
+        }
+        final float viewWidth = getImageViewWidth(mImageView);
+        final float viewHeight = getImageViewHeight(mImageView);
+        final int drawableWidth = drawable.getIntrinsicWidth();
+        final int drawableHeight = drawable.getIntrinsicHeight();
+        mDisplayMatrix.reset();
+        final float widthScale = viewWidth / drawableWidth;
+        final float heightScale = viewHeight / drawableHeight;
+        if (mScaleType == ShapeImageView.ShapeScaleType.CENTER) {
+            mDisplayMatrix.postTranslate((viewWidth - drawableWidth) / 2F,
+                    (viewHeight - drawableHeight) / 2F);
+
+        } else if (mScaleType == ShapeImageView.ShapeScaleType.CENTER_CROP) {
+            float scale = Math.max(widthScale, heightScale);
+            mDisplayMatrix.postScale(scale, scale);
+            mDisplayMatrix.postTranslate((viewWidth - drawableWidth * scale) / 2F,
+                    (viewHeight - drawableHeight * scale) / 2F);
+
+        } else if (mScaleType == ShapeImageView.ShapeScaleType.CENTER_INSIDE) {
+            float scale = Math.min(1.0f, Math.min(widthScale, heightScale));
+            mDisplayMatrix.postScale(scale, scale);
+            mDisplayMatrix.postTranslate((viewWidth - drawableWidth * scale) / 2F,
+                    (viewHeight - drawableHeight * scale) / 2F);
+
+        } else if (this.mScaleType == ShapeImageView.ShapeScaleType.START_CROP||
+                this.mScaleType == ShapeImageView.ShapeScaleType.END_CROP||
+                this.mScaleType == ShapeImageView.ShapeScaleType.AUTO_START_CENTER_CROP||
+                this.mScaleType == ShapeImageView.ShapeScaleType.AUTO_END_CENTER_CROP) {
+            float scale = Math.max(widthScale, heightScale);
+            mDisplayMatrix.postScale(scale, scale);
+            mDisplayMatrix.postTranslate((viewWidth - drawableWidth * scale) / 2F,
+                    (viewHeight - drawableHeight * scale) / 2F);
+        } else {
+            RectF mTempSrc = new RectF(0, 0, drawableWidth, drawableHeight);
+            RectF mTempDst = new RectF(0, 0, viewWidth, viewHeight);
+            switch (mScaleType) {
+                case FIT_CENTER:
+                    mDisplayMatrix.setRectToRect(mTempSrc, mTempDst, Matrix.ScaleToFit.CENTER);
+                    break;
+                case FIT_START:
+                    mDisplayMatrix.setRectToRect(mTempSrc, mTempDst, Matrix.ScaleToFit.START);
+                    break;
+                case FIT_END:
+                    mDisplayMatrix.setRectToRect(mTempSrc, mTempDst, Matrix.ScaleToFit.END);
+                    break;
+                case FIT_XY:
+                    mDisplayMatrix.setRectToRect(mTempSrc, mTempDst, Matrix.ScaleToFit.FILL);
+                    break;
+                default:
+                    break;
+            }
+        }
+        getDisplayRect(mDisplayMatrix);
+    }
+
+    private final RectF mDisplayRectF = new RectF();
+
+    private void getDisplayRect(Matrix matrix) {
+        Drawable drawable = mImageView.getDrawable();
+        if (drawable == null) {
+            return;
+        }
+        mDisplayRectF.set(0, 0, drawable.getIntrinsicWidth(),
+                drawable.getIntrinsicHeight());
+        matrix.mapRect(mDisplayRectF);
+        final float viewWidth = getImageViewWidth(mImageView);
+        final float viewHeight = getImageViewHeight(mImageView);
+        float paddingLeft = ViewUtils.getViewPaddingLeft(mImageView);
+        float paddingTop = mImageView.getPaddingTop();
+        float left = Math.max(mDisplayRectF.left,0)+paddingLeft;
+        float top = Math.max(mDisplayRectF.top,0)+paddingTop;
+        float right = Math.min(mDisplayRectF.right,viewWidth)+paddingLeft;
+        float bottom = Math.min(mDisplayRectF.bottom,viewHeight)+paddingTop;
+        mDisplayRectF.set((int) left, (int) top, (int) right, (int) bottom);
+    }
+
+    public RectF getDisplayRectF() {
+        return mDisplayRectF;
+    }
+
 }