修复压缩包解码时的闪退问题

xiaojieonly · xiaojieonly · commit a36bcfd4eddb · 2024-11-12T11:44:40.000+08:00
修复低版本Android图像被裁剪的问题
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,9 +26,9 @@ android {
 
     defaultConfig {
         applicationId "com.xjs.ehviewer"
-        minSdkVersion 23
+        minSdkVersion 24
         //noinspection ExpiredTargetSdkVersion
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 111
         versionName "1.9.9.3"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/com/hippo/drawable/PreciselyClipDrawable.java b/app/src/main/java/com/hippo/drawable/PreciselyClipDrawable.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.drawable;
+
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.drawable.ClipDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.DrawableWrapper;
+import android.view.Gravity;
+
+import androidx.annotation.NonNull;
+
+import com.hippo.lib.yorozuya.MathUtils;
+
+/**
+ * Show a part of the original drawable
+ */
+public class PreciselyClipDrawable extends DrawableWrapper {
+
+    private final boolean mClip;
+    private RectF mScale;
+    private Rect mTemp;
+    private int offsetX;
+    private  int offsetY;
+    private  int width;
+    private  int height;
+
+    public PreciselyClipDrawable(Drawable drawable, int offsetX, int offsetY, int width, int height) {
+        super(drawable);
+        this.offsetX = offsetX;
+        this.offsetY = offsetY;
+        this.width = width;
+        this.height = height;
+        float originWidth = drawable.getIntrinsicWidth();
+        float originHeight = drawable.getIntrinsicHeight();
+        if (originWidth <= 0 || originHeight <= 0) {
+            // Can not clip
+            mClip = false;
+        } else {
+            mClip = true;
+            mScale = new RectF();
+            mScale.set(MathUtils.clamp(offsetX / originWidth, 0.0f, 1.0f),
+                    MathUtils.clamp(offsetY / originHeight, 0.0f, 1.0f),
+                    MathUtils.clamp((offsetX + width) / originWidth, 0.0f, 1.0f),
+                    MathUtils.clamp((offsetY + height) / originHeight, 0.0f, 1.0f));
+            mTemp = new Rect();
+        }
+    }
+
+    @Override
+    protected void onBoundsChange(@NonNull Rect bounds) {
+        if (mClip) {
+            if (!mScale.isEmpty()) {
+                mTemp.left = (int) ((mScale.left * bounds.right - mScale.right * bounds.left) /
+                        (mScale.left * (1 - mScale.right) - mScale.right * (1 - mScale.left)));
+                mTemp.right = (int) (((1 - mScale.right) * bounds.left - (1 - mScale.left) * bounds.right) /
+                        (mScale.left * (1 - mScale.right) - mScale.right * (1 - mScale.left)));
+                mTemp.top = (int) ((mScale.top * bounds.bottom - mScale.bottom * bounds.top) /
+                        (mScale.top * (1 - mScale.bottom) - mScale.bottom * (1 - mScale.top)));
+                mTemp.bottom = (int) (((1 - mScale.bottom) * bounds.top - (1 - mScale.top) * bounds.bottom) /
+                        (mScale.top * (1 - mScale.bottom) - mScale.bottom * (1 - mScale.top)));
+                super.onBoundsChange(mTemp);
+            }
+        } else {
+            super.onBoundsChange(bounds);
+        }
+//        super.onBoundsChange(bounds);
+    }
+
+
+    @Override
+    public int getIntrinsicWidth() {
+        if (mClip) {
+            return (int) (super.getIntrinsicWidth() * mScale.width());
+        } else {
+            return super.getIntrinsicWidth();
+        }
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        if (mClip) {
+            return (int) (super.getIntrinsicHeight() * mScale.height());
+        } else {
+            return super.getIntrinsicHeight();
+        }
+    }
+
+    @Override
+    public void draw(@NonNull Canvas canvas) {
+        if (mClip) {
+            if (!mScale.isEmpty()) {
+//                int saveCount = canvas.save();
+                canvas.clipRect(getBounds());
+                super.draw(canvas);
+//                canvas.restoreToCount(saveCount);
+                canvas.restore();
+            }
+        } else {
+            super.draw(canvas);
+        }
+    }
+}
diff --git a/app/src/main/java/com/hippo/drawable/PreciselyClipDrawable.kt b/app/src/main/java/com/hippo/drawable/PreciselyClipDrawable.kt
diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/ArchiveGalleryProvider.java b/app/src/main/java/com/hippo/ehviewer/gallery/ArchiveGalleryProvider.java
@@ -17,6 +17,8 @@
 package com.hippo.ehviewer.gallery;
 
 import android.content.Context;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Process;
 import androidx.annotation.NonNull;
@@ -260,7 +262,7 @@ public void run() {
         }
 
         try {
-          Image image = Image.decode((FileInputStream) stream, false);
+          Image image = Image.decode(BitmapDrawable.createFromStream(stream,null), false);
           if (image != null) {
             notifyPageSucceed(index, image);
           } else {
diff --git a/app/src/main/java/com/hippo/lib/glview/image/ImageWrapper.java b/app/src/main/java/com/hippo/lib/glview/image/ImageWrapper.java
@@ -122,14 +122,14 @@ public int getHeight() {
         return mCut.height();
     }
 
-    /**
-     * @see Image#render(int, int, Bitmap, int, int, int, int)
-     */
-    public void render(int srcX, int srcY, Bitmap dst, int dstX, int dstY,
-                       int width, int height, boolean fillBlank, int defaultColor) {
-        mImage.render(srcX + mCut.left, srcY + mCut.top, dst, dstX, dstY,
-                width, height);
-    }
+//    /**
+//     * @see Image#render(int, int, Bitmap, int, int, int, int)
+//     */
+//    public void render(int srcX, int srcY, Bitmap dst, int dstX, int dstY,
+//                       int width, int height, boolean fillBlank, int defaultColor) {
+//        mImage.render(srcX + mCut.left, srcY + mCut.top, dst, dstX, dstY,
+//                width, height);
+//    }
 
     /**
      * @see Image#texImage(boolean, int, int, int, int)
diff --git a/app/src/main/java/com/hippo/lib/image/Image.kt b/app/src/main/java/com/hippo/lib/image/Image.kt
@@ -20,6 +20,7 @@ package com.hippo.lib.image
 import android.content.Context
 import android.content.res.Resources
 import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.graphics.Canvas
 import android.graphics.ImageDecoder
 import android.graphics.ImageDecoder.ALLOCATOR_DEFAULT
@@ -81,11 +82,11 @@ class Image private constructor(
                 }
                 // Should we lazy decode it?
             } else {
-                mObtainedDrawable=Drawable.createFromStream(source,null)
+                mObtainedDrawable=BitmapDrawable.createFromStream(source,null)
             }
         }
         if (mObtainedDrawable == null) {
-            mObtainedDrawable = drawable
+            mObtainedDrawable = drawable!!
 //            throw IllegalArgumentException("数据解码出错")
         }
     }
@@ -95,8 +96,8 @@ class Image private constructor(
     } else {
         mObtainedDrawable is AnimationDrawable
     }
-    val width = mObtainedDrawable!!.intrinsicWidth
-    val height = mObtainedDrawable!!.intrinsicHeight
+    val width = (mObtainedDrawable as? BitmapDrawable)?.bitmap?.width ?: mObtainedDrawable!!.intrinsicWidth
+    val height = (mObtainedDrawable as? BitmapDrawable)?.bitmap?.height ?: mObtainedDrawable!!.intrinsicHeight
     val isRecycled = mObtainedDrawable == null
 
     var started = false
@@ -129,28 +130,28 @@ class Image private constructor(
         mObtainedDrawable!!.draw(Canvas(mBitmap!!))
     }
 
-    fun render(
-        srcX: Int, srcY: Int, dst: Bitmap, dstX: Int, dstY: Int,
-        width: Int, height: Int
-    ) {
-        check(!hardware) { "Hardware buffer cannot be used in glgallery" }
-        val bitmap: Bitmap = if (animated) {
-            updateBitmap()
-            mBitmap!!
-        } else {
-            (mObtainedDrawable as BitmapDrawable).bitmap
-        }
-        nativeRender(
-            bitmap,
-            srcX,
-            srcY,
-            dst,
-            dstX,
-            dstY,
-            width,
-            height
-        )
-    }
+//    fun render(
+//        srcX: Int, srcY: Int, dst: Bitmap, dstX: Int, dstY: Int,
+//        width: Int, height: Int
+//    ) {
+//        check(!hardware) { "Hardware buffer cannot be used in glgallery" }
+//        val bitmap: Bitmap = if (animated) {
+//            updateBitmap()
+//            mBitmap!!
+//        } else {
+//            (mObtainedDrawable as BitmapDrawable).bitmap
+//        }
+//        nativeRender(
+//            bitmap,
+//            srcX,
+//            srcY,
+//            dst,
+//            dstX,
+//            dstY,
+//            width,
+//            height
+//        )
+//    }
 
     fun texImage(init: Boolean, offsetX: Int, offsetY: Int, width: Int, height: Int) {
         check(!hardware) { "Hardware buffer cannot be used in glgallery" }
@@ -211,6 +212,17 @@ class Image private constructor(
             }
         }
 
+        @JvmStatic
+        fun decode(drawable: Drawable?, hardware: Boolean = true): Image? {
+            try {
+                return Image(null,drawable, hardware = hardware)
+            } catch (e: Exception) {
+                e.printStackTrace()
+                FirebaseCrashlytics.getInstance().recordException(e)
+                return null
+            }
+        }
+
 //        @JvmStatic
 //        fun decode(buffer: ByteBuffer, hardware: Boolean = true, release: () -> Unit? = {}): Image {
 //            val src = ImageDecoder.createSource(buffer)
diff --git a/app/src/main/java/com/hippo/widget/FixedAspectImageView.java b/app/src/main/java/com/hippo/widget/FixedAspectImageView.java
@@ -22,10 +22,12 @@
 import android.util.AttributeSet;
 import android.view.View;
 import androidx.appcompat.widget.AppCompatImageView;
+
+import com.google.android.material.imageview.ShapeableImageView;
 import com.hippo.ehviewer.R;
 import com.hippo.lib.yorozuya.MathUtils;
 
-public class FixedAspectImageView extends AppCompatImageView {
+public class FixedAspectImageView extends ShapeableImageView {
 
     private static final int[] MIN_ATTRS = {
             android.R.attr.minWidth,
diff --git a/app/src/main/java/com/hippo/widget/LoadImageView.java b/app/src/main/java/com/hippo/widget/LoadImageView.java
diff --git a/app/src/main/res/layout/activity_gallery.xml b/app/src/main/res/layout/activity_gallery.xml
