Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu

This commit is contained in:
董宏宇
2021-09-18 19:18:53 +08:00
19 changed files with 120 additions and 255 deletions

View File

@@ -3,11 +3,13 @@ package com.mogo.service;
import android.content.Context;
import com.alibaba.android.arouter.facade.template.IProvider;
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider;
import com.mogo.service.adas.IMogoADASController;
import com.mogo.service.analytics.IMogoAnalytics;
import com.mogo.service.auth.IMogoAuthManager;
import com.mogo.service.cardmanager.IMogoCardManager;
import com.mogo.eagle.core.function.api.check.ICheckProvider;
import com.mogo.service.cloud.location.IMogoLocationInfoService;
import com.mogo.service.cloud.passport.IMogoPassportManager;
import com.mogo.service.cloud.socket.IMogoSocketManager;
import com.mogo.service.cloud.socket.IMogoWebSocketManager;
import com.mogo.service.datamanager.IMogoDataManager;
@@ -17,11 +19,8 @@ import com.mogo.service.fragmentmanager.IMogoFragmentManager;
import com.mogo.service.imageloader.IMogoImageloader;
import com.mogo.service.intent.IMogoIntentManager;
import com.mogo.service.launcher.IMogoLauncher;
import com.mogo.service.cloud.location.IMogoLocationInfoService;
import com.mogo.service.map.IMogoMapFrameController;
import com.mogo.service.map.IMogoMapService;
import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider;
import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
import com.mogo.service.module.IMogoActionManager;
import com.mogo.service.module.IMogoMarkerService;
import com.mogo.service.module.IMogoRegisterCenter;
@@ -30,21 +29,18 @@ import com.mogo.service.module.IMogoSettingManager;
import com.mogo.service.monitor.IMogoMonitorProvider;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.service.obu.IMogoCrashWarnProvider;
import com.mogo.service.cloud.passport.IMogoPassportManager;
import com.mogo.service.share.IMogoShareManager;
import com.mogo.service.share.IMogoTanluProvider;
import com.mogo.service.share.IMogoTanluUiProvider;
import com.mogo.service.share.IMogoTrafficUploadProvider;
import com.mogo.service.statusmanager.IMogoMsgCenter;
import com.mogo.service.statusmanager.IMogoStatusManager;
import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider;
import com.mogo.service.strategy.IMogoRefreshStrategyController;
import com.mogo.service.share.IMogoTanluProvider;
import com.mogo.service.share.IMogoTanluUiProvider;
import com.mogo.service.v2x.DisplayEffectsInterface;
import com.mogo.service.v2x.IV2XProvider;
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider;
import com.mogo.service.windowview.IMogoTopViewManager;
import com.mogo.service.windowview.IMogoWindowManager;
import com.mogo.skin.support.IMogoSkinSupportInstaller;
/**
* @author congtaowang
@@ -279,13 +275,6 @@ public interface IMogoServiceApis extends IProvider {
*/
IMogoTanluUiProvider getTanluUiApi();
/**
* 皮肤管理接口
*
* @return
*/
IMogoSkinSupportInstaller getSkinSupportInstallerApi();
/**
* 获取crashWarnProvider
*

View File

@@ -11,8 +11,6 @@ import androidx.annotation.Keep;
import com.facebook.drawee.view.GenericDraweeView;
import com.mogo.service.R;
import com.mogo.skin.support.IMogoSkinCompatSupportable;
import com.mogo.skin.support.helper.MogoSkinCompatImageHelperDelegate;
/**
* @author congtaowang
@@ -21,9 +19,7 @@ import com.mogo.skin.support.helper.MogoSkinCompatImageHelperDelegate;
* 封装 facebook GenericDraweeView实现占位图、失败占位图、形状、边框、模糊等效果
*/
@Keep
public class MogoImageView extends GenericDraweeView implements IMogoSkinCompatSupportable {
private MogoSkinCompatImageHelperDelegate imageHelperDelegate;
public class MogoImageView extends GenericDraweeView {
private int mPlaceHolder;
private int mFailureHolder;
@@ -43,43 +39,40 @@ public class MogoImageView extends GenericDraweeView implements IMogoSkinCompatS
public static final int SHAPE_CIRCLE = 1;
public static final int SHAPE_ROUND = 2;
public MogoImageView( Context context ) {
this( context, null, 0 );
public MogoImageView(Context context) {
this(context, null, 0);
}
public MogoImageView( Context context, AttributeSet attrs ) {
this( context, attrs, 0 );
public MogoImageView(Context context, AttributeSet attrs) {
this(context, attrs, 0);
}
public MogoImageView( Context context, AttributeSet attrs, int theme ) {
super( context, attrs, theme );
TypedArray arrays = context.obtainStyledAttributes( attrs, R.styleable.MogoImageView );
mPlaceHolder = arrays.getResourceId( R.styleable.MogoImageView_miv_placeHolder, 0 );
mFailureHolder = arrays.getResourceId( R.styleable.MogoImageView_miv_failureHolder, 0 );
mOverlayImageId = arrays.getResourceId( R.styleable.MogoImageView_miv_overlayImageId, 0 );
mShape = arrays.getInt( R.styleable.MogoImageView_miv_shape, SHAPE_NORMAL );
mRadius = arrays.getDimensionPixelSize( R.styleable.MogoImageView_miv_radius, 0 );
mTopLeftRadius = arrays.getDimensionPixelSize( R.styleable.MogoImageView_miv_topLeftRadius, 0 );
mTopRightRadius = arrays.getDimensionPixelSize( R.styleable.MogoImageView_miv_topRightRadius, 0 );
mBottomLeftRadius = arrays.getDimensionPixelSize( R.styleable.MogoImageView_miv_bottomLeftRadius, 0 );
mBottomRightRadius = arrays.getDimensionPixelSize( R.styleable.MogoImageView_miv_bottomRightRadius, 0 );
mBorderWidth = arrays.getDimensionPixelSize( R.styleable.MogoImageView_miv_shapeBorderWidth, 0 );
mBorderColor = arrays.getColor( R.styleable.MogoImageView_miv_borderColor, Color.WHITE );
mIsBlur = arrays.getBoolean( R.styleable.MogoImageView_miv_isBlur, false );
mBlurRadius = arrays.getInt( R.styleable.MogoImageView_miv_blurRadius, 25 );
public MogoImageView(Context context, AttributeSet attrs, int theme) {
super(context, attrs, theme);
TypedArray arrays = context.obtainStyledAttributes(attrs, R.styleable.MogoImageView);
mPlaceHolder = arrays.getResourceId(R.styleable.MogoImageView_miv_placeHolder, 0);
mFailureHolder = arrays.getResourceId(R.styleable.MogoImageView_miv_failureHolder, 0);
mOverlayImageId = arrays.getResourceId(R.styleable.MogoImageView_miv_overlayImageId, 0);
mShape = arrays.getInt(R.styleable.MogoImageView_miv_shape, SHAPE_NORMAL);
mRadius = arrays.getDimensionPixelSize(R.styleable.MogoImageView_miv_radius, 0);
mTopLeftRadius = arrays.getDimensionPixelSize(R.styleable.MogoImageView_miv_topLeftRadius, 0);
mTopRightRadius = arrays.getDimensionPixelSize(R.styleable.MogoImageView_miv_topRightRadius, 0);
mBottomLeftRadius = arrays.getDimensionPixelSize(R.styleable.MogoImageView_miv_bottomLeftRadius, 0);
mBottomRightRadius = arrays.getDimensionPixelSize(R.styleable.MogoImageView_miv_bottomRightRadius, 0);
mBorderWidth = arrays.getDimensionPixelSize(R.styleable.MogoImageView_miv_shapeBorderWidth, 0);
mBorderColor = arrays.getColor(R.styleable.MogoImageView_miv_borderColor, Color.WHITE);
mIsBlur = arrays.getBoolean(R.styleable.MogoImageView_miv_isBlur, false);
mBlurRadius = arrays.getInt(R.styleable.MogoImageView_miv_blurRadius, 25);
arrays.recycle();
imageHelperDelegate = new MogoSkinCompatImageHelperDelegate( this );
imageHelperDelegate.loadFromAttributes( attrs, theme );
setImageResource( mPlaceHolder );
setImageResource(mPlaceHolder);
}
public void setRadius( float radius ) {
this.mRadius = ( int ) radius;
public void setRadius(float radius) {
this.mRadius = (int) radius;
}
public void setRadius( int[] radius ) {
if ( radius != null && radius.length == 8 ) {
public void setRadius(int[] radius) {
if (radius != null && radius.length == 8) {
mTopLeftRadius = radius[0] >= radius[1] ? radius[0] : radius[1];
mTopRightRadius = radius[2] >= radius[3] ? radius[2] : radius[3];
mBottomRightRadius = radius[4] >= radius[5] ? radius[4] : radius[5];
@@ -87,35 +80,35 @@ public class MogoImageView extends GenericDraweeView implements IMogoSkinCompatS
}
}
public void setShape( int shape ) {
public void setShape(int shape) {
this.mShape = shape;
}
public void setBorderWidth( int width ) {
public void setBorderWidth(int width) {
this.mBorderWidth = width;
}
public void setBorderColor( int color ) {
public void setBorderColor(int color) {
this.mBorderColor = color;
}
public void setPlaceHolder( int placeHolder ) {
public void setPlaceHolder(int placeHolder) {
this.mPlaceHolder = placeHolder;
}
public void setFailureHolder( int failureHolder ) {
public void setFailureHolder(int failureHolder) {
this.mFailureHolder = failureHolder;
}
public void setOverlayImageId( @DrawableRes int overlayImageId ) {
public void setOverlayImageId(@DrawableRes int overlayImageId) {
this.mOverlayImageId = overlayImageId;
}
public void setBlur( boolean isBlur ) {
public void setBlur(boolean isBlur) {
this.mIsBlur = isBlur;
}
public void setBlurRadius( int blurRadius ) {
public void setBlurRadius(int blurRadius) {
this.mBlurRadius = blurRadius;
}
@@ -136,7 +129,7 @@ public class MogoImageView extends GenericDraweeView implements IMogoSkinCompatS
}
public float[] getRadii() {
if ( mTopLeftRadius != 0 || mTopRightRadius != 0 || mBottomRightRadius != 0 || mBottomLeftRadius != 0 ) {
if (mTopLeftRadius != 0 || mTopRightRadius != 0 || mBottomRightRadius != 0 || mBottomLeftRadius != 0) {
float[] radii = {mTopLeftRadius, mTopLeftRadius, mTopRightRadius, mTopRightRadius,
mBottomRightRadius, mBottomRightRadius, mBottomLeftRadius, mBottomLeftRadius};
return radii;
@@ -167,33 +160,19 @@ public class MogoImageView extends GenericDraweeView implements IMogoSkinCompatS
public String getParams() {
StringBuilder builder = new StringBuilder();
builder.append( mIsBlur ).append( mBlurRadius )
.append( mShape ).append( mRadius )
.append( mBorderWidth ).append( mBorderColor );
builder.append(mIsBlur).append(mBlurRadius)
.append(mShape).append(mRadius)
.append(mBorderWidth).append(mBorderColor);
return builder.toString();
}
@Override
public void setImageResource( int resId ) {
super.setImageResource( resId );
if ( imageHelperDelegate != null ) {
imageHelperDelegate.setImageResource( resId );
}
}
/**
* 解决共享动画无效的问题
*
* @param matrix
*/
public void animateTransform( Matrix matrix ) {
public void animateTransform(Matrix matrix) {
invalidate();
}
@Override
public void applySkin() {
if ( imageHelperDelegate != null ) {
imageHelperDelegate.applySkin();
}
}
}