diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java index 7bf13bcf63..9c429602c9 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean; * 加载并保存 app 列表 */ public class AppsModel { - + private static final String TAG = "AppsModel"; private static volatile AppsModel sInstance; @@ -57,7 +57,6 @@ public class AppsModel { if ( mPagedApps != null ) { mPagedApps.clear(); } - mPagedApps = null; mContext = null; mAppFilter = null; sInstance = null; @@ -116,9 +115,12 @@ public class AppsModel { if ( TextUtils.isEmpty( packageName ) ) { return; } - if ( mPagedApps.isEmpty() ) { + if ( mPagedApps == null || mPagedApps.isEmpty() ) { return; } + if ( mAppFilter == null ) { + mAppFilter = new AppFilterImpl( mContext ); + } try { final PackageManager packageManager = mContext.getPackageManager(); PackageInfo packageInfo = packageManager.getPackageInfo( packageName, 0 ); @@ -183,6 +185,9 @@ public class AppsModel { if ( TextUtils.isEmpty( packageName ) ) { return; } + if ( mPagedApps == null || mPagedApps.isEmpty() ) { + return; + } try { int pageIndex = getPageIndex( packageName, false ); if ( pageIndex == -1 ) { diff --git a/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png index a4c313e353..bf455a0ea2 100644 Binary files a/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png and b/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png differ diff --git a/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png index 1635a55eac..bf455a0ea2 100644 Binary files a/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png and b/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png differ diff --git a/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png index 7daeab19ba..d4a8803684 100644 Binary files a/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png and b/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png differ diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png index a4c313e353..80ab4b841f 100644 Binary files a/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png and b/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png differ diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 26e612592d..701215fb6c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -977,9 +977,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener, return; } if ( mLastDataResult != null ) { - MarkerServiceHandler.getMarkerManager().removeMarkers( ModuleNames.CARD_TYPE_ROAD_CONDITION ); - drawMarkerByCurrentType( mLastDataResult ); - mLastCheckMarker = null; + runOnTargetThread( ()->{ + MarkerServiceHandler.getMarkerManager().removeMarkers( ModuleNames.CARD_TYPE_ROAD_CONDITION ); + drawMarkerByCurrentType( mLastDataResult ); + mLastCheckMarker = null; + } ); } break; } diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_message_background_light.9.png b/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_message_background_light.9.png index 245c2e855c..d43e9d38d8 100644 Binary files a/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_message_background_light.9.png and b/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_message_background_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable-xhdpi/module_push_message_background_light.9.png b/skin/mogo-skin-light/src/main/module-push-res/drawable-xhdpi/module_push_message_background_light.9.png index 3a7c0afb38..5bab9995b7 100644 Binary files a/skin/mogo-skin-light/src/main/module-push-res/drawable-xhdpi/module_push_message_background_light.9.png and b/skin/mogo-skin-light/src/main/module-push-res/drawable-xhdpi/module_push_message_background_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png index 269aa27266..245c2e855c 100644 Binary files a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png and b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png differ