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 diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java index f9f27f4699..c67414bf1e 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java @@ -204,7 +204,7 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL LinearLayoutManager layoutManager = new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false); mLoopRecyclerView.setLayoutManager(layoutManager); - mTanluSlideAdapter = new TanluSlideAdapterNew(mContext, mAnalytics, mTanluModelData, mogoImageloader); + mTanluSlideAdapter = new TanluSlideAdapterNew(mContext, mAnalytics, mTanluModelData, mogoImageloader, mMogoRegisterCenter); mLoopRecyclerView.setAdapter(mTanluSlideAdapter); //保证滑动单页显示 diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java index 3cea0b5b49..de39f21bd8 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java @@ -5,6 +5,7 @@ import android.animation.AnimatorInflater; import android.animation.AnimatorSet; import android.content.Context; import android.text.TextUtils; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -18,6 +19,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.mogo.commons.debug.DebugConfig; +import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.glide.SkinAbleBitmapTarget; import com.mogo.module.tanlu.R; @@ -30,9 +32,13 @@ import com.mogo.module.tanlu.model.event.StartPlayInfo; import com.mogo.module.tanlu.model.event.VoiceControlUpInfo; import com.mogo.module.tanlu.util.ChartUtil; import com.mogo.module.tanlu.video.SimpleCoverVideoPlayer; +import com.mogo.module.tanlu.view.RoundLayout; +import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.imageloader.IMogoImageloader; import com.mogo.service.imageloader.MogoImageView; +import com.mogo.service.module.IMogoRegisterCenter; +import com.mogo.skin.support.SkinMode; import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder; @@ -57,7 +63,7 @@ import static com.mogo.module.tanlu.util.Utils.handleDistance; * @description * @since 2020/3/11 */ -public class TanluSlideAdapterNew extends RecyclerView.Adapter { +public class TanluSlideAdapterNew extends RecyclerView.Adapter implements IMogoADASControlStatusChangedListener { private List markerExploreWayList = new ArrayList<>(); private static final String TAG = "TanluSlideAdapterNew"; private Context mContext; @@ -74,6 +80,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter list = new HashMap<>(); - public TanluSlideAdapterNew(Context context, IMogoAnalytics analytics, TanluModelData tanluModelData, IMogoImageloader mogoImageloader) { + public TanluSlideAdapterNew(Context context, IMogoAnalytics analytics, TanluModelData tanluModelData, IMogoImageloader mogoImageloader, + IMogoRegisterCenter mogoRegisterCenter) { this.mContext = context; this.mAnalytics = analytics; this.mTanluModelData = tanluModelData; this.mogoImageloader = mogoImageloader; + mogoRegisterCenter.registerADASControlStatusChangedListener( TAG, this ); + EventBus.getDefault().register(this); } @@ -121,6 +131,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter "); + mRoundLayout.setBackgroundResource(R.drawable.shape_tanlu_top_bg); + break; + + case Type_Light: + Log.d("liyz", "Type_Light ---------> "); + mRoundLayout.setBackgroundResource(R.drawable.shape_tanlu_top_bg_light); + break; + } + } + + @Override + public void onCarStatusChanged(boolean visible) { + + } } diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg_light.xml b/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg_light.xml new file mode 100644 index 0000000000..4eba256888 --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/values/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml index a552d06283..1a0324e0cc 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml @@ -52,5 +52,6 @@ #5E6079 #3F4057 #555A75 + #F5F5F5 diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png index ef5069632f..30690aeb2e 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png index ef5069632f..30690aeb2e 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index 2f6e0b2f98..9bdf15b612 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -53,7 +53,7 @@ 42px 32px 36px - 28px + 30px 16px 42px 120px 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 88810c7950..f66ced6bbf 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 @@ -54,7 +54,7 @@ 42px 32px 36px - 28px + 30px 31.9px 26px 30px diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png old mode 100644 new mode 100755 index c18352b4fa..cbf14c5566 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png differ