Merge pull request Blankj#1109 from xxjy/1.26.0

布兰柯基 · web-flow · commit 5444390e6e2f · 2019-12-09T00:05:33.000+08:00
fix bug
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ClickUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ClickUtils.java
@@ -3,8 +3,10 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.ColorFilter;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Paint;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -198,7 +200,7 @@ private static Drawable createStyleDrawable(Drawable src, int style, float value
         }
 
         Drawable disable = src.getConstantState().newDrawable().mutate();
-        disable = createAlphaDrawable(pressed, 0.5f);
+        disable = createAlphaDrawable(disable, 0.5f);
 
         StateListDrawable drawable = new StateListDrawable();
         drawable.addState(new int[]{android.R.attr.state_pressed}, pressed);
@@ -208,27 +210,20 @@ private static Drawable createStyleDrawable(Drawable src, int style, float value
     }
 
     private static Drawable createAlphaDrawable(Drawable drawable, float alpha) {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT
-                && !(drawable instanceof ColorDrawable)) {
-            Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-            Canvas myCanvas = new Canvas(bitmap);
-            drawable.setAlpha((int) (alpha * 255));
-            drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
-            drawable.draw(myCanvas);
-            return new BitmapDrawable(Resources.getSystem(), bitmap);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            DrawableWrapperBefore21 drawableWrapper = new DrawableWrapperBefore21(drawable);
+            drawableWrapper.setAlphaFix((int) (alpha * 255));
+            return drawableWrapper;
         }
         drawable.setAlpha((int) (alpha * 255));
         return drawable;
     }
 
     private static Drawable createDarkDrawable(Drawable drawable, float alpha) {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT && !(drawable instanceof ColorDrawable)) {
-            Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-            Canvas myCanvas = new Canvas(bitmap);
-            drawable.setColorFilter(getDarkColorFilter(alpha));
-            drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
-            drawable.draw(myCanvas);
-            return new BitmapDrawable(Resources.getSystem(), bitmap);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            DrawableWrapperBefore21 drawableWrapper = new DrawableWrapperBefore21(drawable);
+            drawableWrapper.setColorFilterFix(getDarkColorFilter(alpha));
+            return drawableWrapper;
         }
         drawable.setColorFilter(getDarkColorFilter(alpha));
         return drawable;
@@ -509,4 +504,60 @@ private static class LazyHolder {
             private static final OnUtilsTouchListener INSTANCE = new OnUtilsTouchListener();
         }
     }
+
+    static class DrawableWrapperBefore21 extends ShadowUtils.DrawableWrapper {
+
+        private BitmapDrawable mBitmapDrawable = null;
+
+        //低版本ColorDrawable.setColorFilter无效，这里直接用画笔画上
+        private Paint mColorPaint = null;
+
+        public DrawableWrapperBefore21(Drawable drawable) {
+            super(drawable);
+            if (drawable instanceof ColorDrawable) {
+                mColorPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
+                mColorPaint.setColor(((ColorDrawable) drawable).getColor());
+            }
+        }
+
+        @Override
+        public void setColorFilter(ColorFilter cf) {
+            //低版本StateListDrawable.selectDrawable会重置ColorFilter
+        }
+
+        public void setColorFilterFix(ColorFilter cf) {
+            super.setColorFilter(cf);
+            if (mColorPaint != null) {
+                mColorPaint.setColorFilter(cf);
+            }
+        }
+
+        @Override
+        public void setAlpha(int alpha) {
+            //低版本StateListDrawable.selectDrawable会重置Alpha
+        }
+
+        public void setAlphaFix(int alpha) {
+            super.setAlpha(alpha);
+            if (mColorPaint != null) {
+                mColorPaint.setColor(((ColorDrawable) getWrappedDrawable()).getColor());
+            }
+        }
+
+        @Override
+        public void draw(Canvas canvas) {
+            if (mBitmapDrawable == null) {
+                Bitmap bitmap = Bitmap.createBitmap(getBounds().width(), getBounds().height(), Bitmap.Config.ARGB_8888);
+                Canvas myCanvas = new Canvas(bitmap);
+                if (mColorPaint != null) {
+                    myCanvas.drawRect(getBounds(), mColorPaint);
+                } else {
+                    super.draw(myCanvas);
+                }
+                mBitmapDrawable = new BitmapDrawable(Resources.getSystem(), bitmap);
+                mBitmapDrawable.setBounds(getBounds());
+            }
+            mBitmapDrawable.draw(canvas);
+        }
+    }
 }
diff --git a/lib/utildebug/src/main/java/com/blankj/utildebug/base/view/BaseContentFloatView.java b/lib/utildebug/src/main/java/com/blankj/utildebug/base/view/BaseContentFloatView.java
@@ -317,7 +317,9 @@ protected void onCreateLayoutParams() {
         post(new Runnable() {
             @Override
             public void run() {
-                wrapWindow();
+                if (getParent() != null) {
+                    wrapWindow();
+                }
             }
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,9 @@ protected void onCreateLayoutParams() {`
`317`	`317`	`post(new Runnable() {`
`318`	`318`	`@Override`
`319`	`319`	`public void run() {`
`320`		`- wrapWindow();`
	`320`	`+ if (getParent() != null) {`
	`321`	`+ wrapWindow();`
	`322`	`+ }`
`321`	`323`	`}`
`322`	`324`	`});`
`323`	`325`	`}`