This commit is contained in:
unknown
2020-09-10 11:43:22 +08:00
15 changed files with 252 additions and 93 deletions

View File

@@ -1,6 +1,5 @@
package com.mogo.launcher;
import android.app.Application;
import android.content.Context;
import android.content.Intent;
import android.text.TextUtils;
@@ -138,14 +137,16 @@ public class MogoApplication extends AbsMogoApplication {
@Override
protected void init() {
super.init();
prepareBaseService( 2_000L );
final IMogoServiceApis apis = ARouter.getInstance().navigation( IMogoServiceApis.class );
prepareBaseService( apis, 2_000L );
// installSkinManager( this, apis );
}
/**
* 基础服务passport、location、socket
*/
private void prepareBaseService( long delay ) {
final IMogoServiceApis apis = ARouter.getInstance().navigation( IMogoServiceApis.class );
private void prepareBaseService( IMogoServiceApis apis, long delay ) {
UiThreadHandler.postDelayed( () -> {
// 第三方平台的sn是服务端生成的所以必须在返回后才能开启
if ( TextUtils.isEmpty( Utils.getSn() ) ) {
@@ -157,7 +158,6 @@ public class MogoApplication extends AbsMogoApplication {
prepareSocketAndLocationServices( apis );
}
}, delay );
installSkinManager( this, apis );
}
private void preparePassportEnvironment( IMogoServiceApis apis, Runnable after ) {
@@ -189,10 +189,6 @@ public class MogoApplication extends AbsMogoApplication {
} );
}
private void installSkinManager( Application application, IMogoServiceApis apis ) {
apis.getSkinSupportInstallerApi().install( application );
}
@Override
protected void attachBaseContext( Context base ) {
super.attachBaseContext( base );

View File

@@ -29,6 +29,7 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
@Override
protected void onCreate( @Nullable Bundle savedInstanceState ) {
super.onCreate( savedInstanceState );
beforeSetContentView(savedInstanceState);
if ( DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD ) {
requestWindowFeature( Window.FEATURE_NO_TITLE );
getWindow().setFlags( WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN );
@@ -39,6 +40,10 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
getLifecycle().addObserver( mPresenter );
}
protected void beforeSetContentView(Bundle savedInstanceState){
}
/**
* 布局资源
*

View File

@@ -5,9 +5,6 @@ import android.util.AttributeSet;
import androidx.annotation.Nullable;
import com.amap.api.maps.MapView;
import com.amap.api.navi.AMapNaviView;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.IMogoMapView;
import com.mogo.map.MogoBaseMapView;
@@ -19,6 +16,8 @@ import com.mogo.map.MogoBaseMapView;
*/
public class AMapBaseMapView extends MogoBaseMapView {
private static final String TAG = "AMapBaseMapView";
public AMapBaseMapView( Context context ) {
super( context );
}
@@ -33,9 +32,6 @@ public class AMapBaseMapView extends MogoBaseMapView {
@Override
protected IMogoMapView createMapView( Context context ) {
if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD ) {
return new AMapViewWrapper( new MapView( context ) );
}
return new AMapNaviViewWrapper( new AMapNaviView( context ) );
return AMapViewHandler.getMapView();
}
}

View File

@@ -0,0 +1,37 @@
package com.mogo.map.impl.amap;
import android.content.Context;
import com.amap.api.maps.TextureMapView;
import com.amap.api.navi.AMapNaviView;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.IMogoMapView;
public
/**
* @author congtaowang
* @since 2020/9/10
* <p>
* 描述
*/
class AMapViewHandler {
private static IMogoMapView sMapView;
public static void createMapView( Context context ) {
if ( DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) {
sMapView = new AMapViewWrapper( new TextureMapView( context ) );
} else {
sMapView = new AMapNaviViewWrapper( new AMapNaviView( context ) );
}
}
public static IMogoMapView getMapView() {
return sMapView;
}
public static void destroy() {
sMapView = null;
}
}

View File

@@ -17,6 +17,7 @@ import com.amap.api.maps.AMap;
import com.amap.api.maps.AMapUtils;
import com.amap.api.maps.CameraUpdateFactory;
import com.amap.api.maps.MapView;
import com.amap.api.maps.TextureMapView;
import com.amap.api.maps.model.BitmapDescriptorFactory;
import com.amap.api.maps.model.CameraPosition;
import com.amap.api.maps.model.CameraPositionCreator;
@@ -72,7 +73,7 @@ public class AMapViewWrapper implements IMogoMapView,
private static final String TAG = "AMapViewWrapper";
private final MapView mMapView;
private final TextureMapView mMapView;
private IMogoMap mIMap;
private AMapMarkerClickHandler mMarkerClickHandler;
@@ -87,7 +88,7 @@ public class AMapViewWrapper implements IMogoMapView,
.build();
private CarCursorOption mCarCursorOption = DEFAULT_OPTION;
public AMapViewWrapper( MapView mapView ) {
public AMapViewWrapper( TextureMapView mapView ) {
this.mMapView = mapView;
this.mIMap = new AMapWrapper( mMapView.getMap(), mMapView.getContext(), this );
try {

View File

@@ -0,0 +1,15 @@
package com.mogo.map;
import android.content.Context;
public
/**
* @author congtaowang
* @since 2020/9/10
*
* 描述
*/
interface IMogoMapViewInstanceHandler extends IDestroyable {
void createMapViewInstance( Context context );
}

View File

@@ -0,0 +1,49 @@
package com.mogo.map;
import android.content.Context;
import com.mogo.map.impl.amap.AMapViewHandler;
public
/**
* @author congtaowang
* @since 2020/9/10
*
* 描述
*/
class MogoMapViewInstanceHandler implements IMogoMapViewInstanceHandler {
private static volatile MogoMapViewInstanceHandler sInstance;
private MogoMapViewInstanceHandler(){}
public static MogoMapViewInstanceHandler getInstance(){
if( sInstance == null ){
synchronized( MogoMapViewInstanceHandler.class ) {
if( sInstance == null ){
sInstance = new MogoMapViewInstanceHandler();
}
}
}
return sInstance;
}
public synchronized void release(){
sInstance = null;
}
private Object readResolve() {
// 阻止反序列化,必须实现 Serializable 接口
return sInstance;
}
@Override
public void createMapViewInstance( Context context ) {
AMapViewHandler.createMapView( context );
}
@Override
public void destroy() {
AMapViewHandler.destroy();
}
}

View File

@@ -52,6 +52,7 @@ dependencies {
api rootProject.ext.dependencies.moduleservice
api rootProject.ext.dependencies.moduleapps
api rootProject.ext.dependencies.moduleextensions
compileOnly rootProject.ext.dependencies.skinsupport
} else {
api project(":foudations:mogo-utils")
api project(":foudations:mogo-commons")
@@ -62,6 +63,7 @@ dependencies {
api project(':services:mogo-service')
api project(':modules:mogo-module-apps')
api project(':modules:mogo-module-extensions')
compileOnly project(':skin:mogo-skin-support')
}
}

View File

@@ -73,6 +73,23 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
return R.layout.module_main_activity_main;
}
@Override
protected void beforeSetContentView( Bundle savedInstanceState ) {
init();
installSkinManager( savedInstanceState );
}
/**
* 安装皮肤支持
*
* @param savedInstanceState
*/
private void installSkinManager( Bundle savedInstanceState ) {
mServiceApis.getMapServiceApi().getMapViewInstanceHandler().createMapViewInstance( this );
mServiceApis.getSkinSupportInstallerApi().install( getApplication() );
mServiceApis.getSkinSupportInstallerApi().onCompensateActivityCreated( this, savedInstanceState );
}
@Override
protected void initViews() {
@@ -113,7 +130,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
@Override
protected void onCreate( @Nullable Bundle savedInstanceState ) {
super.onCreate( savedInstanceState );
init();
mPresenter.postLoadModuleMsg();
}
@@ -326,6 +342,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
mMogoMapService = null;
mMogoMapUIController = null;
mMogoFragmentManager = null;
mServiceApis.getMapServiceApi().getMapViewInstanceHandler().destroy();
AdasConfigApiController.getInstance().release();
mServiceApis.getAdasControllerApi().release();
Logger.d( TAG, "destroy." );

View File

@@ -3,6 +3,7 @@ package com.mogo.service.map;
import android.content.Context;
import com.alibaba.android.arouter.facade.template.IProvider;
import com.mogo.map.IMogoMapViewInstanceHandler;
import com.mogo.map.listener.IMogoHosListenerRegister;
import com.mogo.map.location.IMogoLocationClient;
import com.mogo.map.marker.IMogoMarkerManager;
@@ -111,4 +112,11 @@ public interface IMogoMapService extends IProvider {
* @return
*/
IMogoRoadSearch getRoadSearchApi();
/**
* 地图实例
*
* @return
*/
IMogoMapViewInstanceHandler getMapViewInstanceHandler();
}

View File

@@ -3,15 +3,17 @@ package com.mogo.service.impl.map;
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.map.MogoRoadSearch;
import com.mogo.map.IMogoMapViewInstanceHandler;
import com.mogo.map.MogoGeoSearch;
import com.mogo.map.MogoInputtipsSearch;
import com.mogo.map.MogoLocationClient;
import com.mogo.map.MogoMapUIController;
import com.mogo.map.MogoMapViewInstanceHandler;
import com.mogo.map.MogoMarkerManager;
import com.mogo.map.MogoNavi;
import com.mogo.map.MogoOverlayManager;
import com.mogo.map.MogoPoiSearch;
import com.mogo.map.MogoRoadSearch;
import com.mogo.map.listener.IMogoHosListenerRegister;
import com.mogo.map.listener.MogoHosListenerRegister;
import com.mogo.map.location.IMogoLocationClient;
@@ -92,7 +94,13 @@ public class MogoMapService implements IMogoMapService {
return new MogoRoadSearch();
}
@Override
public IMogoMapViewInstanceHandler getMapViewInstanceHandler() {
return MogoMapViewInstanceHandler.getInstance();
}
@Override
public void init( Context context ) {
}
}

View File

@@ -3,6 +3,7 @@ package com.mogo.skin.support.impl;
import android.app.Activity;
import android.app.Application;
import android.content.Context;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatCallback;
@@ -15,6 +16,7 @@ import com.mogo.skin.support.SkinMode;
import com.mogo.skin.support.SkinSupportInstallerConstants;
import skin.support.SkinCompatManager;
import skin.support.app.SkinActivityLifecycle;
import skin.support.app.SkinAppCompatViewInflater;
import skin.support.app.SkinCardViewInflater;
import skin.support.constraint.app.SkinConstraintViewInflater;
@@ -60,10 +62,15 @@ class SkinSupportInstaller implements IMogoSkinSupportInstaller {
}
@Override
public AppCompatDelegate getSkinAppCompatDelegate( AppCompatActivity activity,AppCompatDelegate superDelegate, AppCompatCallback callback ) {
public AppCompatDelegate getSkinAppCompatDelegate( AppCompatActivity activity, AppCompatDelegate superDelegate, AppCompatCallback callback ) {
return SkinAppCompatDelegateImpl.get( activity, callback );
}
@Override
public void onCompensateActivityCreated( Activity activity, Bundle savedInstanceState ) {
SkinActivityLifecycle.init( activity.getApplication() ).onCompensateActivityCreated( activity, savedInstanceState );
}
@Override
public void init( Context context ) {

View File

@@ -1,7 +1,9 @@
package com.mogo.skin.support.noop;
import android.app.Activity;
import android.app.Application;
import android.content.Context;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatCallback;
@@ -40,6 +42,11 @@ class SkinSupportInstaller implements IMogoSkinSupportInstaller {
return superDelegate;
}
@Override
public void onCompensateActivityCreated( Activity activity, Bundle savedInstanceState ) {
Logger.d( TAG, "noop - onCompensateActivityCreated" );
}
@Override
public void init( Context context ) {

View File

@@ -1,6 +1,8 @@
package com.mogo.skin.support;
import android.app.Activity;
import android.app.Application;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatCallback;
@@ -21,5 +23,7 @@ interface IMogoSkinSupportInstaller extends IProvider {
void loadSkin( SkinMode skinMode );
AppCompatDelegate getSkinAppCompatDelegate( AppCompatActivity activity,AppCompatDelegate superDelegate, AppCompatCallback callback );
AppCompatDelegate getSkinAppCompatDelegate( AppCompatActivity activity, AppCompatDelegate superDelegate, AppCompatCallback callback );
void onCompensateActivityCreated( Activity activity, Bundle savedInstanceState );
}

View File

@@ -26,128 +26,135 @@ import static skin.support.widget.SkinCompatHelper.checkResourceId;
public class SkinActivityLifecycle implements Application.ActivityLifecycleCallbacks {
private static final String TAG = "SkinActivityLifecycle";
private static volatile SkinActivityLifecycle sInstance = null;
private WeakHashMap<Context, SkinCompatDelegate> mSkinDelegateMap;
private WeakHashMap<Context, LazySkinObserver> mSkinObserverMap;
private WeakHashMap< Context, SkinCompatDelegate > mSkinDelegateMap;
private WeakHashMap< Context, LazySkinObserver > mSkinObserverMap;
/**
* 用于记录当前Activity在换肤后立即刷新当前Activity以及非Activity创建的View。
*/
private WeakReference<Activity> mCurActivityRef;
private WeakReference< Activity > mCurActivityRef;
public static SkinActivityLifecycle init(Application application) {
if (sInstance == null) {
synchronized (SkinActivityLifecycle.class) {
if (sInstance == null) {
sInstance = new SkinActivityLifecycle(application);
public static SkinActivityLifecycle init( Application application ) {
if ( sInstance == null ) {
synchronized ( SkinActivityLifecycle.class ) {
if ( sInstance == null ) {
sInstance = new SkinActivityLifecycle( application );
}
}
}
return sInstance;
}
private SkinActivityLifecycle(Application application) {
application.registerActivityLifecycleCallbacks(this);
installLayoutFactory(application);
SkinCompatManager.getInstance().addObserver(getObserver(application));
private SkinActivityLifecycle( Application application ) {
application.registerActivityLifecycleCallbacks( this );
installLayoutFactory( application );
SkinCompatManager.getInstance().addObserver( getObserver( application ) );
}
@Override
public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
if (isContextSkinEnable(activity)) {
installLayoutFactory(activity);
updateWindowBackground(activity);
if (activity instanceof SkinCompatSupportable) {
((SkinCompatSupportable) activity).applySkin();
public void onActivityCreated( Activity activity, Bundle savedInstanceState ) {
onCompensateActivityCreated( activity, savedInstanceState );
}
/**
* 补偿启动页的 create 回调
*/
public void onCompensateActivityCreated( Activity activity, Bundle savedInstanceState ) {
if ( isContextSkinEnable( activity ) ) {
installLayoutFactory( activity );
updateWindowBackground( activity );
if ( activity instanceof SkinCompatSupportable ) {
( ( SkinCompatSupportable ) activity ).applySkin();
}
}
}
@Override
public void onActivityStarted(Activity activity) {
public void onActivityStarted( Activity activity ) {
}
@Override
public void onActivityResumed(Activity activity) {
mCurActivityRef = new WeakReference<>(activity);
if (isContextSkinEnable(activity)) {
LazySkinObserver observer = getObserver(activity);
SkinCompatManager.getInstance().addObserver(observer);
public void onActivityResumed( Activity activity ) {
mCurActivityRef = new WeakReference<>( activity );
if ( isContextSkinEnable( activity ) ) {
LazySkinObserver observer = getObserver( activity );
SkinCompatManager.getInstance().addObserver( observer );
observer.updateSkinIfNeeded();
}
}
@Override
public void onActivityPaused(Activity activity) {
public void onActivityPaused( Activity activity ) {
}
@Override
public void onActivityStopped(Activity activity) {
public void onActivityStopped( Activity activity ) {
}
@Override
public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
public void onActivitySaveInstanceState( Activity activity, Bundle outState ) {
}
@Override
public void onActivityDestroyed(Activity activity) {
if (isContextSkinEnable(activity)) {
SkinCompatManager.getInstance().deleteObserver(getObserver(activity));
mSkinObserverMap.remove(activity);
mSkinDelegateMap.remove(activity);
public void onActivityDestroyed( Activity activity ) {
if ( isContextSkinEnable( activity ) ) {
SkinCompatManager.getInstance().deleteObserver( getObserver( activity ) );
mSkinObserverMap.remove( activity );
mSkinDelegateMap.remove( activity );
}
}
private void installLayoutFactory(Context context) {
private void installLayoutFactory( Context context ) {
try {
LayoutInflater layoutInflater = LayoutInflater.from(context);
LayoutInflaterCompat.setFactory2(layoutInflater, getSkinDelegate(context));
} catch (Throwable e) {
Slog.i("SkinActivity", "A factory has already been set on this LayoutInflater");
LayoutInflater layoutInflater = LayoutInflater.from( context );
LayoutInflaterCompat.setFactory2( layoutInflater, getSkinDelegate( context ) );
} catch ( Throwable e ) {
Slog.i( "SkinActivity", "A factory has already been set on this LayoutInflater" );
}
}
private SkinCompatDelegate getSkinDelegate(Context context) {
if (mSkinDelegateMap == null) {
private SkinCompatDelegate getSkinDelegate( Context context ) {
if ( mSkinDelegateMap == null ) {
mSkinDelegateMap = new WeakHashMap<>();
}
SkinCompatDelegate mSkinDelegate = mSkinDelegateMap.get(context);
if (mSkinDelegate == null) {
mSkinDelegate = SkinCompatDelegate.create(context);
mSkinDelegateMap.put(context, mSkinDelegate);
SkinCompatDelegate mSkinDelegate = mSkinDelegateMap.get( context );
if ( mSkinDelegate == null ) {
mSkinDelegate = SkinCompatDelegate.create( context );
mSkinDelegateMap.put( context, mSkinDelegate );
}
return mSkinDelegate;
}
private LazySkinObserver getObserver(final Context context) {
if (mSkinObserverMap == null) {
private LazySkinObserver getObserver( final Context context ) {
if ( mSkinObserverMap == null ) {
mSkinObserverMap = new WeakHashMap<>();
}
LazySkinObserver observer = mSkinObserverMap.get(context);
if (observer == null) {
observer = new LazySkinObserver(context);
mSkinObserverMap.put(context, observer);
LazySkinObserver observer = mSkinObserverMap.get( context );
if ( observer == null ) {
observer = new LazySkinObserver( context );
mSkinObserverMap.put( context, observer );
}
return observer;
}
private void updateWindowBackground(Activity activity) {
if (SkinCompatManager.getInstance().isSkinWindowBackgroundEnable()) {
int windowBackgroundResId = SkinCompatThemeUtils.getWindowBackgroundResId(activity);
if (checkResourceId(windowBackgroundResId) != INVALID_ID) {
Drawable drawable = SkinCompatResources.getDrawable(activity, windowBackgroundResId);
if (drawable != null) {
activity.getWindow().setBackgroundDrawable(drawable);
private void updateWindowBackground( Activity activity ) {
if ( SkinCompatManager.getInstance().isSkinWindowBackgroundEnable() ) {
int windowBackgroundResId = SkinCompatThemeUtils.getWindowBackgroundResId( activity );
if ( checkResourceId( windowBackgroundResId ) != INVALID_ID ) {
Drawable drawable = SkinCompatResources.getDrawable( activity, windowBackgroundResId );
if ( drawable != null ) {
activity.getWindow().setBackgroundDrawable( drawable );
}
}
}
}
private boolean isContextSkinEnable(Context context) {
private boolean isContextSkinEnable( Context context ) {
return SkinCompatManager.getInstance().isSkinAllActivityEnable()
|| context.getClass().getAnnotation(Skinable.class) != null
|| context.getClass().getAnnotation( Skinable.class ) != null
|| context instanceof SkinCompatSupportable;
}
@@ -155,16 +162,16 @@ public class SkinActivityLifecycle implements Application.ActivityLifecycleCallb
private final Context mContext;
private boolean mMarkNeedUpdate = false;
LazySkinObserver(Context context) {
LazySkinObserver( Context context ) {
mContext = context;
}
@Override
public void updateSkin(SkinObservable observable, Object o) {
public void updateSkin( SkinObservable observable, Object o ) {
// 当前Activity或者非Activity立即刷新否则延迟到下次onResume方法中刷新。
if (mCurActivityRef == null
if ( mCurActivityRef == null
|| mContext == mCurActivityRef.get()
|| !(mContext instanceof Activity)) {
|| !( mContext instanceof Activity ) ) {
updateSkinForce();
} else {
mMarkNeedUpdate = true;
@@ -172,24 +179,24 @@ public class SkinActivityLifecycle implements Application.ActivityLifecycleCallb
}
void updateSkinIfNeeded() {
if (mMarkNeedUpdate) {
if ( mMarkNeedUpdate ) {
updateSkinForce();
}
}
void updateSkinForce() {
if (Slog.DEBUG) {
Slog.i(TAG, "Context: " + mContext + " updateSkinForce");
if ( Slog.DEBUG ) {
Slog.i( TAG, "Context: " + mContext + " updateSkinForce" );
}
if (mContext == null) {
if ( mContext == null ) {
return;
}
if (mContext instanceof Activity && isContextSkinEnable(mContext)) {
updateWindowBackground((Activity) mContext);
if ( mContext instanceof Activity && isContextSkinEnable( mContext ) ) {
updateWindowBackground( ( Activity ) mContext );
}
getSkinDelegate(mContext).applySkin();
if (mContext instanceof SkinCompatSupportable) {
((SkinCompatSupportable) mContext).applySkin();
getSkinDelegate( mContext ).applySkin();
if ( mContext instanceof SkinCompatSupportable ) {
( ( SkinCompatSupportable ) mContext ).applySkin();
}
mMarkNeedUpdate = false;
}