AnimationDrawable优化

Author: YiiGuxing

composition-avatar/src/main/java/cn/yiiguxing/compositionavatar/CompositionAvatarView.java

@@ -11,6 +11,7 @@
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.support.annotation.FloatRange;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
@@ -178,6 +179,16 @@ private AvatarDrawable findAvatarDrawableById(int id) {
         return null;
     }
 
+    private boolean hasSameDrawable(Drawable drawable) {
+        for (AvatarDrawable d : mDrawables) {
+            if (d.mDrawable == drawable) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * 添加drawable.
      *
@@ -199,10 +210,11 @@ public boolean addDrawable(@NonNull Drawable drawable) {
     public boolean addDrawable(int id, @NonNull Drawable drawable) {
         AvatarDrawable old = findAvatarDrawableById(id);
         if (old != null) {
-            old.mDrawable.setCallback(null);
-            unscheduleDrawable(old.mDrawable);
-
+            Drawable d = old.mDrawable;
             old.mDrawable = drawable;
+            if (!hasSameDrawable(d)) {
+                cleanDrawable(d);
+            }
         } else {
             if (getNumberOfDrawables() >= MAX_DRAWABLE_COUNT) {
                 return false;
@@ -213,9 +225,13 @@ public boolean addDrawable(int id, @NonNull Drawable drawable) {
         }
 
         drawable.setCallback(this);
+        drawable.setVisible(getVisibility() == VISIBLE, true);
         if (drawable.isStateful()) {
             drawable.setState(getDrawableState());
         }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            drawable.setLayoutDirection(getLayoutDirection());
+        }
 
         return true;
     }
@@ -277,8 +293,9 @@ public Drawable removeDrawableById(int id) {
     @NonNull
     public Drawable removeDrawableAt(int index) {
         AvatarDrawable drawable = mDrawables.remove(index);
-        drawable.mDrawable.setCallback(null);
-        unscheduleDrawable(drawable.mDrawable);
+        if (!hasSameDrawable(drawable.mDrawable)) {
+            cleanDrawable(drawable.mDrawable);
+        }
         layoutDrawables();
         return drawable.mDrawable;
     }
@@ -289,14 +306,18 @@ public Drawable removeDrawableAt(int index) {
     public void clearDrawable() {
         if (!mDrawables.isEmpty()) {
             for (AvatarDrawable drawable : mDrawables) {
-                drawable.mDrawable.setCallback(null);
-                unscheduleDrawable(drawable.mDrawable);
+                cleanDrawable(drawable.mDrawable);
             }
             mDrawables.clear();
             layoutDrawables();
         }
     }
 
+    private void cleanDrawable(Drawable drawable) {
+        drawable.setCallback(null);
+        unscheduleDrawable(drawable);
+    }
+
     private void layoutDrawables() {
         mSteinerCircleRadius = 0;
         mOffsetY = 0;
@@ -437,6 +458,30 @@ protected void onDraw(Canvas canvas) {
         }
     }
 
+    @Override
+    public void setVisibility(int visibility) {
+        super.setVisibility(visibility);
+        for (AvatarDrawable drawable : mDrawables) {
+            drawable.mDrawable.setVisible(visibility == VISIBLE, false);
+        }
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        for (AvatarDrawable drawable : mDrawables) {
+            drawable.mDrawable.setVisible(getVisibility() == VISIBLE, false);
+        }
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        for (AvatarDrawable drawable : mDrawables) {
+            drawable.mDrawable.setVisible(false, false);
+        }
+    }
+
     @Override
     protected void drawableStateChanged() {
         super.drawableStateChanged();
@@ -473,6 +518,11 @@ public void invalidateDrawable(@NonNull Drawable drawable) {
         super.invalidateDrawable(drawable);
     }
 
+    @Override
+    public CharSequence getAccessibilityClassName() {
+        return CompositionAvatarView.class.getName();
+    }
+
     private static class AvatarDrawable {
         int mId = View.NO_ID;
         Drawable mDrawable;