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 ed1e5019be..2217bbdab2 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
@@ -18,6 +18,7 @@ import android.widget.ImageView;
import com.mogo.module.common.utils.CarSeries;
import com.mogo.skin.support.IMogoSkinCompatSupportable;
+import com.mogo.skin.support.helper.MogoSkinCompatHelperDelegate;
import com.mogo.skin.support.helper.MogoSkinCompatImageHelperDelegate;
@SuppressLint("AppCompatCustomView")
@@ -30,6 +31,8 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
int defaultHeight;
int diameter;
int radius;
+ PaintFlagsDrawFilter drawFilter = new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG|Paint.FILTER_BITMAP_FLAG);
+ Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
MogoSkinCompatImageHelperDelegate imageHelper;
@@ -81,6 +84,7 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
@Override
public void setImageResource(int resId) {
super.setImageResource(resId);
+ Log.d("AnimCircle", "setImageResource: " + MogoSkinCompatHelperDelegate.isSupport());
imageHelper.setImageResource(resId);
mDrawbleSrc = getDrawable();
output = null;
@@ -112,7 +116,7 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
@Override
protected void onDraw(Canvas canvas) {
- Log.d("AnimCircle", "onDraw====");
+// Log.d("AnimCircle", "onDraw====");
try {
if (mDrawbleSrc == null) {
return;
@@ -131,7 +135,8 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
defaultWidth = getWidth();
diameter = (defaultHeight > defaultWidth ? defaultWidth : defaultHeight);
radius = diameter / 2;
- mBitmapOut = getCuttedPicture(mDrawbleSrc);
+// mBitmapOut = getCuttedPicture(mDrawbleSrc);
+ mBitmapOut = ((BitmapDrawable) mDrawbleSrc).getBitmap();
Paint paint = new Paint();
Rect rect = new Rect(0, 0, mBitmapOut.getWidth(),
@@ -156,9 +161,9 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
if (isRotateEnable) {
currentDegree = (currentDegree + mRotateAngleStep) % 360;
canvas.save();
- canvas.setDrawFilter(new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG|Paint.FILTER_BITMAP_FLAG));
+ canvas.setDrawFilter(drawFilter);
canvas.rotate(currentDegree, defaultWidth / 2, defaultHeight / 2);
- canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, null);
+ canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, mPaint);
canvas.restore();
if (isRotateEnable) {
removeCallbacks(loopInvalidate);
@@ -167,9 +172,9 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
}
} else {
canvas.save();
- canvas.setDrawFilter(new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG|Paint.FILTER_BITMAP_FLAG));
+ canvas.setDrawFilter(drawFilter);
canvas.rotate(currentDegree, defaultWidth / 2, defaultHeight / 2);
- canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, null);
+ canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, mPaint);
canvas.restore();
}
} catch (Exception e) {
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 6601cca455..ccb2cb0cc8 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
@@ -12,6 +12,7 @@ import android.widget.TextView;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.voice.AIAssist;
import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
+import com.mogo.module.common.glide.SkinAbleBitmapTarget;
import com.mogo.module.media.MediaConstants;
import com.mogo.module.media.R;
import com.mogo.module.media.ServiceMediaHandler;
@@ -92,6 +93,11 @@ public class MediaWindow2 implements IMusicView {
return;
}
+ if(!ServiceMediaHandler.getIMogoStatusManager().isMainPageOnResume()){
+ Log.d(TAG, "not in front");
+ return;
+ }
+
if (!mHasAddWindow) {
mHasAddWindow = true;
mWindowView =
@@ -199,10 +205,14 @@ public class MediaWindow2 implements IMusicView {
if (mCircleImg != null) {
if(mMediaInfoData!=null&&mMediaInfoData.getMediaImg()!=null&&!mMediaInfoData.getMediaImg().isEmpty()) {
+ int size =
+ mContext.getResources().getDimensionPixelSize(R.dimen.module_media_pop_window_anim_img_size);
+ Logger.d(TAG, "overload: " + size);
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);
+ .placeholder(R.drawable.module_media_default_music_img).error(R.drawable.module_media_default_music_img).override(size, size);
+ GlideApp.with(mContext).asBitmap().apply(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options));
+// GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options));
}else{
mCircleImg.setImageResource(R.drawable.module_media_default_music_img);
}
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png
index 32bb1aa442..24567d76fc 100644
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png and b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png
index 32bb1aa442..24567d76fc 100644
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png and b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png
index 6b21dc37ab..96ddb81326 100644
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.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 28189f70a7..f31888dd72 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
@@ -65,7 +65,7 @@
140px
112px
30px
- 90px
+ 80px
230px
14px
35px
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 7514da155f..9f6a51ce93 100644
--- a/modules/mogo-module-media/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-media/src/main/res/values/dimens.xml
@@ -65,7 +65,7 @@
76.7px
60px
18px
- 48px
+ 44px
123px
10px
18px
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index d4095a09f9..21256ebd26 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.module.v2x.R;
+import com.mogo.module.v2x.SpacesItemDecoration;
import com.mogo.module.v2x.adapter.V2XShareEventAdapter;
import com.mogo.module.v2x.entity.panel.V2XShareEventDescription;
import com.mogo.module.v2x.entity.panel.V2XShareEventItem;
@@ -61,6 +62,7 @@ public class V2XShareEventsFragment extends MvpFragment
@@ -19,7 +19,7 @@
android:paddingLeft="20px"
android:paddingTop="10px"
android:text="小窍门:分享路况,点赞其他车主,有助于提高热心指数"
- android:textColor="#FFFFFF"
+ android:textColor="#CCFFFFFF"
android:textSize="@dimen/share_top_text_size">
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
index 5b9ea8d44f..b3103c0ae9 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
@@ -4,16 +4,16 @@
android:id="@+id/road_case_liset_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="20px"
- android:layout_marginRight="20px"
- android:layout_marginBottom="14px"
+ android:layout_marginLeft="@dimen/dp_50"
+ android:layout_marginRight="@dimen/dp_50"
+ android:layout_marginBottom="@dimen/dp_14"
android:background="@drawable/bg_v2x_event_list_item">
+ android:textSize="@dimen/dp_32" />
+ android:textSize="@dimen/share_item_text_size" />
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 4deae149b9..326b59bbf9 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -76,5 +76,6 @@
-8px
84px
120px
+ 16px
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index f66ced6bbf..66c449c427 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -64,7 +64,7 @@
281px
90px
28px
- 30px
+ 28px
67.5px
30px
40px
@@ -75,5 +75,6 @@
114px
158px
300px
+ 26px