Merge branch 'dev' into dev_opt_drawable

This commit is contained in:
tongchenfei
2020-06-23 11:07:14 +08:00
40 changed files with 42 additions and 31 deletions

View File

@@ -35,23 +35,24 @@ public class MogoModulesManager implements MogoModulesHandler {
private Map< MogoModule, IMogoModuleProvider > mModuleProviders = new HashMap<>();
// 空间换效率
private Map< String, IMogoModuleProvider > mModuleNameProviders = new HashMap<>();
private static volatile MogoModulesManager sInstance;
private MogoModulesManager(){}
public static MogoModulesManager getInstance(){
if( sInstance == null ){
synchronized( MogoModulesManager.class ) {
if( sInstance == null ){
private MogoModulesManager() {
}
public static MogoModulesManager getInstance() {
if ( sInstance == null ) {
synchronized ( MogoModulesManager.class ) {
if ( sInstance == null ) {
sInstance = new MogoModulesManager();
}
}
}
return sInstance;
}
public synchronized void release(){
public synchronized void release() {
sInstance = null;
}
@@ -131,7 +132,7 @@ public class MogoModulesManager implements MogoModulesHandler {
@Override
public void loadBaseModule() {
List<MogoModule> baseModules = MogoModulePaths.getBaseModules();
List< MogoModule > baseModules = MogoModulePaths.getBaseModules();
for ( MogoModule baseModule : baseModules ) {
if ( baseModule == null ) {
continue;
@@ -142,7 +143,11 @@ public class MogoModulesManager implements MogoModulesHandler {
}
private IMogoModuleProvider load( String path ) {
return ( IMogoModuleProvider ) ARouter.getInstance().build( path ).navigation( getContext() );
try {
return ( IMogoModuleProvider ) ARouter.getInstance().build( path ).navigation( getContext() );
} catch ( Exception e ) {
return null;
}
}
private void addFragment( IMogoModuleProvider provider, int containerId ) {