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 4aab1a19b3..df81e5d06d 100644
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png differ
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