From a344cd18c30118e92b8bbcbf5532e786492f0f76 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 17 Sep 2020 14:56:32 +0800 Subject: [PATCH] =?UTF-8?q?opt=20=E9=9F=B3=E4=B9=90=E6=B5=AE=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../media/widget/AnimCircleImageView.java | 28 ++++++++++++++---- .../module/media/window/MediaWindow2.java | 2 +- .../module_media_default_music_img.png | Bin 2803 -> 2840 bytes .../src/main/res/values-xhdpi/dimens.xml | 2 +- .../src/main/res/values/dimens.xml | 2 +- 6 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java index 6a0a8daab1..ed1e5019be 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java @@ -17,9 +17,11 @@ import android.util.Log; import android.widget.ImageView; import com.mogo.module.common.utils.CarSeries; +import com.mogo.skin.support.IMogoSkinCompatSupportable; +import com.mogo.skin.support.helper.MogoSkinCompatImageHelperDelegate; @SuppressLint("AppCompatCustomView") -public class AnimCircleImageView extends ImageView { +public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSupportable { Drawable mDrawbleSrc; Context context; Bitmap mBitmapOut; @@ -29,6 +31,8 @@ public class AnimCircleImageView extends ImageView { int diameter; int radius; + MogoSkinCompatImageHelperDelegate imageHelper; + int currentDegree; int savedDegree; boolean isRotateEnable; @@ -47,6 +51,7 @@ public class AnimCircleImageView extends ImageView { public AnimCircleImageView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); + imageHelper = new MogoSkinCompatImageHelperDelegate(this); this.context = context; init(); } @@ -76,6 +81,7 @@ public class AnimCircleImageView extends ImageView { @Override public void setImageResource(int resId) { super.setImageResource(resId); + imageHelper.setImageResource(resId); mDrawbleSrc = getDrawable(); output = null; } @@ -108,14 +114,17 @@ public class AnimCircleImageView extends ImageView { protected void onDraw(Canvas canvas) { Log.d("AnimCircle", "onDraw===="); try { - if (mDrawbleSrc == null) + if (mDrawbleSrc == null) { return; + } - if (getWidth() == 0 || getHeight() == 0) + if (getWidth() == 0 || getHeight() == 0) { return; + } - if (mDrawbleSrc.getClass() == NinePatchDrawable.class) + if (mDrawbleSrc.getClass() == NinePatchDrawable.class) { return; + } if (output == null) { defaultHeight = getHeight(); @@ -185,10 +194,12 @@ public class AnimCircleImageView extends ImageView { x = mBitmapScaled.getWidth() / 2 - radius; y = mBitmapScaled.getHeight() / 2 - radius; - if (x < 0) + if (x < 0) { x = 0; - if (y < 0) + } + if (y < 0) { y = 0; + } Bitmap mBitmapCropped = Bitmap.createBitmap(mBitmapScaled, x, y, diameter, diameter); return mBitmapCropped; } @@ -200,5 +211,10 @@ public class AnimCircleImageView extends ImageView { public void setDelayMilliseconds(int delayMilliseconds) { this.delayMilliseconds = delayMilliseconds; } + + @Override + public void applySkin() { + imageHelper.applySkin(); + } } diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java index be8aba16ba..6601cca455 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java @@ -202,7 +202,7 @@ public class MediaWindow2 implements IMusicView { com.bumptech.glide.request.RequestOptions options = new com.bumptech.glide.request.RequestOptions() .placeholder(R.drawable.module_media_default_music_img); - GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(mCircleImg); +// GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(mCircleImg); }else{ mCircleImg.setImageResource(R.drawable.module_media_default_music_img); } diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png index 4aab1a19b36fe0955b2a16d0cda1163263bbd62a..df81e5d06d441c4f0e6548e2bc83dbc9f330d1ea 100644 GIT binary patch delta 2833 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 delta 2795 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 diff --git a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml index 99b57ab445..28189f70a7 100644 --- a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml @@ -1,6 +1,6 @@ - 881px + 872px 1067px diff --git a/modules/mogo-module-media/src/main/res/values/dimens.xml b/modules/mogo-module-media/src/main/res/values/dimens.xml index 5c97bf7ec3..7514da155f 100644 --- a/modules/mogo-module-media/src/main/res/values/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values/dimens.xml @@ -1,6 +1,6 @@ - 470px + 462px 573px