yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: dependencies

Browse Source
This commit is contained in:
wangcongtao
2020-01-06 01:48:29 +08:00
parent b237a55ca9
commit b2832cb6a1
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.gradle
View File

@@ -93,7 +93,7 @@ ext {
mogoserviceapi : "com.mogo.service:mogo-service-api:${MOGO_SERVICE_API_VERSION}", mogoserviceapi : "com.mogo.service:mogo-service-api:${MOGO_SERVICE_API_VERSION}",
moduleapps : "com.mogo.module:module-apps:${MOGO_MODULE_APPS_VERSION}", moduleapps : "com.mogo.module:module-apps:${MOGO_MODULE_APPS_VERSION}",
mogoconnection : "com.mogo.connection:mogo-connection:${MOGO_CONNECTION_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', socketsdk : 'com.zhidao.socketsdk:socketsdk:2.1.0',

13
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/WeatherModel.java
View File

@@ -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() { public void queryWeatherInformation() {
@@ -81,7 +85,12 @@ public class WeatherModel {
if ( mContentResolver == null ) { if ( mContentResolver == null ) {
return; 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 ) { if ( cursor == null ) {
return; return;
} }

8
modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
View File

@@ -93,10 +93,12 @@ public class MogoModulesManager implements MogoModulesHandler,
@Override @Override
public List< IMogoModuleProvider > loadCardsModule() { public List< IMogoModuleProvider > loadCardsModule() {
final List< MogoModule > modules = MogoModulePaths.getModules();
final ArrayList< IMogoModuleProvider > providers = new ArrayList<>(); final ArrayList< IMogoModuleProvider > providers = new ArrayList<>();
for ( IMogoModuleProvider value : mModuleProviders.values() ) { for ( MogoModule module : modules ) {
if ( value.getType() == ModuleType.TYPE_CARD_FRAGMENT ) { IMogoModuleProvider provider = mModuleProviders.get( module );
providers.add( value ); if ( provider.getType() == ModuleType.TYPE_CARD_FRAGMENT ) {
providers.add( provider );
} }
} }
return providers; return providers;

1
upload.sh
View File

@@ -13,4 +13,5 @@
./gradlew :modules:mogo-module-tanlu:clean :modules:mogo-module-tanlu:uploadArchives ./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-apps:clean :modules:mogo-module-apps:uploadArchives
./gradlew :modules:mogo-module-service:clean :modules:mogo-module-service: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 ./gradlew :modules:mogo-module-main:clean :modules:mogo-module-main:uploadArchives