diff --git a/config.gradle b/config.gradle index 6cbc23c95b..1f7b20f715 100644 --- a/config.gradle +++ b/config.gradle @@ -93,7 +93,7 @@ ext { mogoserviceapi : "com.mogo.service:mogo-service-api:${MOGO_SERVICE_API_VERSION}", moduleapps : "com.mogo.module:module-apps:${MOGO_MODULE_APPS_VERSION}", mogoconnection : "com.mogo.connection:mogo-connection:${MOGO_CONNECTION_VERSION}", - moduleextensions : "com.mogo.connection:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}", + moduleextensions : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}", // 长链 socketsdk : 'com.zhidao.socketsdk:socketsdk:2.1.0', diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/WeatherModel.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/WeatherModel.java index c67331f031..587bc387f0 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/WeatherModel.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/WeatherModel.java @@ -61,7 +61,11 @@ public class WeatherModel { } } }; - mContentResolver.registerContentObserver( mWeatherUri, false, mContentObserver ); + try { + mContentResolver.registerContentObserver( mWeatherUri, false, mContentObserver ); + } catch ( Exception e ) { + Logger.e( TAG, "error when query weather info.", e ); + } } public void queryWeatherInformation() { @@ -81,7 +85,12 @@ public class WeatherModel { if ( mContentResolver == null ) { return; } - Cursor cursor = mContentResolver.query( mWeatherUri, null, null, null, null, null ); + Cursor cursor = null; + try { + cursor = mContentResolver.query( mWeatherUri, null, null, null, null, null ); + } catch ( Exception e ) { + return; + } if ( cursor == null ) { return; } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 885be9fd7d..f044239821 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -93,10 +93,12 @@ public class MogoModulesManager implements MogoModulesHandler, @Override public List< IMogoModuleProvider > loadCardsModule() { + final List< MogoModule > modules = MogoModulePaths.getModules(); final ArrayList< IMogoModuleProvider > providers = new ArrayList<>(); - for ( IMogoModuleProvider value : mModuleProviders.values() ) { - if ( value.getType() == ModuleType.TYPE_CARD_FRAGMENT ) { - providers.add( value ); + for ( MogoModule module : modules ) { + IMogoModuleProvider provider = mModuleProviders.get( module ); + if ( provider.getType() == ModuleType.TYPE_CARD_FRAGMENT ) { + providers.add( provider ); } } return providers; diff --git a/upload.sh b/upload.sh index 6da112826f..7fc06055a3 100755 --- a/upload.sh +++ b/upload.sh @@ -13,4 +13,5 @@ ./gradlew :modules:mogo-module-tanlu:clean :modules:mogo-module-tanlu:uploadArchives ./gradlew :modules:mogo-module-apps:clean :modules:mogo-module-apps:uploadArchives ./gradlew :modules:mogo-module-service:clean :modules:mogo-module-service:uploadArchives +./gradlew :modules:mogo-module-extensions:clean :modules:mogo-module-service:uploadArchives ./gradlew :modules:mogo-module-main:clean :modules:mogo-module-main:uploadArchives