代码优化

xiaojieonly · Nov 7, 2024 · 1ae996e · 1ae996e
1 parent 770fbeb
commit 1ae996e
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 33 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -151,7 +151,7 @@ dependencies {
 //    implementation 'com.alibaba.fastjson2:fastjson2:2.0.47'
 
     implementation 'com.android.support:multidex:1.0.3'
-
+//    implementation 'com.github.bumptech.glide:glide:4.16.0'
     /**
      * 原始依赖
      */

diff --git a/app/src/main/java/com/hippo/lib/image/Image.kt b/app/src/main/java/com/hippo/lib/image/Image.kt
@@ -49,7 +49,6 @@ class Image private constructor(
 ) {
     internal var mObtainedDrawable: Drawable?
     private var mBitmap: Bitmap? = null
-//    public val MAX_BITMAP_SIZE = 100 * 1024 * 1024
 
     init {
         mObtainedDrawable = null
@@ -82,11 +81,11 @@ class Image private constructor(
                 }
                 // Should we lazy decode it?
             } else {
-                mObtainedDrawable = Drawable.createFromStream(source, "image")
+                mObtainedDrawable=Drawable.createFromStream(source,null)
             }
         }
         if (mObtainedDrawable == null) {
-            mObtainedDrawable = drawable!!
+            mObtainedDrawable = drawable
 //            throw IllegalArgumentException("数据解码出错")
         }
     }
@@ -109,12 +108,7 @@ class Image private constructor(
             if (mObtainedDrawable is AnimatedImageDrawable) {
                 (mObtainedDrawable as AnimatedImageDrawable?)?.stop()
             }
-        } else {
-            if (mObtainedDrawable is AnimationDrawable) {
-                (mObtainedDrawable as AnimationDrawable?)?.stop()
-            }
         }
-
         if (mObtainedDrawable is BitmapDrawable) {
             (mObtainedDrawable as BitmapDrawable?)?.bitmap?.recycle()
         }
@@ -180,10 +174,7 @@ class Image private constructor(
         if (!started) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                 (mObtainedDrawable as AnimatedImageDrawable?)?.start()
-            } else {
-                (mObtainedDrawable as AnimationDrawable?)?.start()
             }
-
         }
     }
 

diff --git a/app/src/main/java/com/hippo/widget/LoadImageView.java b/app/src/main/java/com/hippo/widget/LoadImageView.java
@@ -157,7 +157,7 @@ private void clearDrawable() {
 
         // Set drawable null
         setImageDrawable(null);
-        if (imageBitmap!=null){
+        if (imageBitmap != null) {
             imageBitmap.release();
             imageBitmap = null;
         }
@@ -305,6 +305,7 @@ public boolean onGetValue(@NonNull ImageBitmap value, int source) {
         } else {
             setImageDrawable(drawable);
         }
+
         imageBitmap = value;
         return true;
     }
@@ -341,27 +342,32 @@ public void onCancel() {
     @Override
     public void start() {
         Drawable drawable = getImageDrawable();
-        if (drawable instanceof AnimatedImageDrawable animatedImageDrawable) {
-            animatedImageDrawable.start();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            if (drawable instanceof AnimatedImageDrawable animatedImageDrawable) {
+                animatedImageDrawable.start();
+            }
         }
     }
 
     @Override
     public void stop() {
         Drawable drawable = getImageDrawable();
-        if (drawable instanceof AnimatedImageDrawable animatedImageDrawable) {
-            animatedImageDrawable.stop();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            if (drawable instanceof AnimatedImageDrawable animatedImageDrawable) {
+                animatedImageDrawable.stop();
+            }
         }
     }
 
     @Override
     public boolean isRunning() {
         Drawable drawable = getImageDrawable();
-        if (drawable instanceof AnimatedImageDrawable animatedImageDrawable) {
-            return animatedImageDrawable.isRunning();
-        } else {
-            return false;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            if (drawable instanceof AnimatedImageDrawable animatedImageDrawable) {
+                return animatedImageDrawable.isRunning();
+            }
         }
+        return false;
     }
 
     @Override

diff --git a/app/src/main/java/com/hippo/widget/LoadImageViewNew.java b/app/src/main/java/com/hippo/widget/LoadImageViewNew.java
@@ -28,6 +28,7 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
@@ -49,7 +50,7 @@
 import java.lang.annotation.RetentionPolicy;
 
 public class LoadImageViewNew extends FixedAspectImageView implements Unikery<ImageBitmap>,
-        View.OnClickListener, View.OnLongClickListener,Animatable {
+        View.OnClickListener, View.OnLongClickListener, Animatable {
 
     public static final int RETRY_TYPE_NONE = 0;
     public static final int RETRY_TYPE_CLICK = 1;
@@ -211,7 +212,7 @@ public void resetClip() {
         mClipHeight = Integer.MIN_VALUE;
     }
 
-    public void load(){
+    public void load() {
         load(mKey, mUrl, true);
     }
 
@@ -221,7 +222,7 @@ public void load(String key, String url) {
 
 
     public void load(String key, String url, boolean useNetwork) {
-        if (url == null || key == null ) {
+        if (url == null || key == null) {
             return;
         }
 
@@ -238,7 +239,7 @@ public void load(String key, String url, boolean useNetwork) {
                 .setKey(key)
                 .setUrl(url)
                 .setUseNetwork(useNetwork);
-        if (url.contains(DOMAIN_EX)||url.contains(DOMAIN_E)){
+        if (url.contains(DOMAIN_EX) || url.contains(DOMAIN_E)) {
             builder.setOkHttpClient(EhApplication.getOkHttpClient(getContext()));
         }
         mConaco.load(builder);
@@ -345,27 +346,34 @@ public void onCancel() {
     @Override
     public void start() {
         Drawable drawable = getImageDrawable();
-        if (drawable instanceof AnimatedImageDrawable animatedImageDrawable) {
-            animatedImageDrawable.start();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            if (drawable instanceof AnimatedImageDrawable animatedImageDrawable) {
+                animatedImageDrawable.start();
+            }
         }
     }
 
     @Override
     public void stop() {
         Drawable drawable = getImageDrawable();
-        if (drawable instanceof AnimatedImageDrawable animatedImageDrawable) {
-            animatedImageDrawable.stop();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            if (drawable instanceof AnimatedImageDrawable animatedImageDrawable) {
+                animatedImageDrawable.stop();
+            }
         }
+
     }
 
     @Override
     public boolean isRunning() {
         Drawable drawable = getImageDrawable();
-        if (drawable instanceof AnimatedImageDrawable animatedImageDrawable) {
-            return animatedImageDrawable.isRunning();
-        } else {
-            return false;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            if (drawable instanceof AnimatedImageDrawable animatedImageDrawable) {
+                return animatedImageDrawable.isRunning();
+            }
         }
+        return false;
+
     }
 
     @Override