1，修复svg格式图显示bug

Author: FlyJingFish

README-zh.md

@@ -45,7 +45,7 @@ allprojects {
 
 ```gradle
 dependencies {
-    implementation 'com.github.FlyJingFish:ShapeImageView:1.5.3'
+    implementation 'com.github.FlyJingFish:ShapeImageView:1.5.4'
 }
 ```
 ## 第三步，使用说明

README.md

@@ -48,7 +48,7 @@ allprojects {
 
 ```gradle
 dependencies {
-    implementation 'io.github.FlyJingFish:ShapeImageView:1.5.3'
+    implementation 'io.github.FlyJingFish:ShapeImageView:1.5.4'
 }
 ```
 ## The third step, instructions for use

gradle.properties

@@ -19,7 +19,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 PROJ_GROUP=io.github.FlyJingFish
-PROJ_VERSION=1.5.3
+PROJ_VERSION=1.5.4
 PROJ_BASENAME=ShapeImageView
 PROJ_WEBSITEURL=https://github.com/FlyJingFish/ShapeImageView
 PROJ_VCSURL=https://github.com/FlyJingFish/ShapeImageView.git

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

@@ -12,6 +12,7 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.PictureDrawable;
 import android.util.AttributeSet;
+import android.view.View;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
@@ -144,16 +145,16 @@ private void preDrawShaper(Canvas canvas) {
         mShapePaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
         canvas.saveLayer(new RectF(0, 0, canvas.getWidth(), canvas.getHeight()), mShapePaint, Canvas.ALL_SAVE_FLAG);
         mShapeResource.setBounds(paddingLeft, paddingTop, width - paddingRight, height - paddingBottom);
-        float scaleX = 1f;
-        float scaleY = 1f;
         if (mShapeResource instanceof PictureDrawable){
-            scaleX = mShapeResource.getBounds().width() *1f/mShapeResource.getIntrinsicWidth();
-            scaleY = mShapeResource.getBounds().height() *1f/mShapeResource.getIntrinsicHeight();
+            float scaleX = mShapeResource.getBounds().width() *1f/mShapeResource.getIntrinsicWidth();
+            float scaleY = mShapeResource.getBounds().height() *1f/mShapeResource.getIntrinsicHeight();
+            canvas.translate(mShapeResource.getBounds().left, mShapeResource.getBounds().top);
             canvas.scale(scaleX,scaleY);
-        }
-        mShapeResource.draw(canvas);
-        if (mShapeResource instanceof PictureDrawable){
+            canvas.drawPicture(((PictureDrawable) mShapeResource).getPicture());
             canvas.scale(1/scaleX,1/scaleY);
+            canvas.translate(-mShapeResource.getBounds().left,- mShapeResource.getBounds().top);
+        }else {
+            mShapeResource.draw(canvas);
         }
         isDrawShapeClear = true;
     }
@@ -279,16 +280,16 @@ private void drawShape(Canvas canvas) {
             mShapePaint.setXfermode(null);
             canvas.saveLayer(new RectF(0, 0, canvas.getWidth(), canvas.getHeight()), mShapePaint, Canvas.ALL_SAVE_FLAG);
             mShapeResource.setBounds(left, top, right, bottom);
-            float scaleX = 1f;
-            float scaleY = 1f;
             if (mShapeResource instanceof PictureDrawable){
-                scaleX = mShapeResource.getBounds().width() *1f/mShapeResource.getIntrinsicWidth();
-                scaleY = mShapeResource.getBounds().height() *1f/mShapeResource.getIntrinsicHeight();
+                float scaleX = mShapeResource.getBounds().width() *1f/mShapeResource.getIntrinsicWidth();
+                float scaleY = mShapeResource.getBounds().height() *1f/mShapeResource.getIntrinsicHeight();
+                canvas.translate(mShapeResource.getBounds().left, mShapeResource.getBounds().top);
                 canvas.scale(scaleX,scaleY);
-            }
-            mShapeResource.draw(canvas);
-            if (mShapeResource instanceof PictureDrawable){
+                canvas.drawPicture(((PictureDrawable) mShapeResource).getPicture());
                 canvas.scale(1/scaleX,1/scaleY);
+                canvas.translate(-mShapeResource.getBounds().left,- mShapeResource.getBounds().top);
+            }else {
+                mShapeResource.draw(canvas);
             }
         }
         mShapePaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));