diff --git a/gradle.properties b/gradle.properties index f57abdc671..6bc1086401 100644 --- a/gradle.properties +++ b/gradle.properties @@ -64,7 +64,7 @@ MOGO_MODULE_ONLINECAR_VERSION=1.0.2-SNAPSHOT # v2x MOGO_MODULE_V2X_VERSION=1.0.3-SNAPSHOT # 媒体卡片 -MOGO_MODULE_MEDIA_VERSION=1.0.1-SNAPSHOT +MOGO_MODULE_MEDIA_VERSION=1.0.2-SNAPSHOT # 推送 MOGO_MODULE_PUSH_VERSION=1.0.0-SNAPSHOT # 广告资源位 diff --git a/libraries/mogo-map-api/build.gradle b/libraries/mogo-map-api/build.gradle index 9fbe1f35f1..c7637e37ca 100644 --- a/libraries/mogo-map-api/build.gradle +++ b/libraries/mogo-map-api/build.gradle @@ -28,8 +28,10 @@ dependencies { implementation rootProject.ext.dependencies.androidxappcompat if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogoutils + implementation rootProject.ext.dependencies.mogocommons } else { implementation project(':foudations:mogo-utils') + implementation project(':foudations:mogo-commons') } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java index c65a4e90a6..bb3aa752d9 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java @@ -1,6 +1,7 @@ package com.mogo.map; import android.content.Context; +import android.util.Log; import com.mogo.map.impl.amap.InterceptorHandler; import com.mogo.map.impl.amap.overlay.RouteOverlayHelper; @@ -8,6 +9,7 @@ import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.map.marker.MogoMarkersHandler; +import com.mogo.utils.logger.Logger; import java.util.ArrayList; import java.util.List; @@ -21,6 +23,8 @@ import java.util.Map; */ public class MogoMarkerManager implements IMogoMarkerManager { + private static final String TAG = "MogoMarkerManager"; + private static volatile MogoMarkerManager sInstance; private Context mApplicationContext; @@ -66,11 +70,13 @@ public class MogoMarkerManager implements IMogoMarkerManager { @Override public void removeMarkers( String tag ) { + Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); MogoMarkersHandler.getInstance().remove( tag ); } @Override public void removeMarkers() { + Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); MogoMarkersHandler.getInstance().removeAll(); } @@ -86,6 +92,7 @@ public class MogoMarkerManager implements IMogoMarkerManager { @Override public void removeMarkersExcept( String tag ) { + Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); MogoMarkersHandler.getInstance().deleteAllExcept( tag ); } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java index d271162e24..7f8776b806 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java @@ -40,10 +40,10 @@ public class AppFilterImpl implements AppFilter { if ( isFilterPackages( packageInfo ) ) { return true; } - if ( noLaunchIntent( packageInfo ) ) { + if ( !AppEnumHelper.isCustomizedApp( packageInfo.packageName ) ) { return true; } - if ( !AppEnumHelper.isCustomizedApp( packageInfo.packageName ) ) { + if ( noLaunchIntent( packageInfo ) ) { return true; } return false; diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java index a68b98eb01..fa3def1772 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java @@ -74,7 +74,7 @@ public enum AppEnum { FreshThings( "新鲜事", "com.zhidao.fresh.things", R.drawable.module_apps_ic_fresh_things ), // 个人中心 - PersonCenter( "个人中心", "com.zhidao.auto.personal ", R.drawable.module_apps_ic_fresh_things ), + PersonCenter( "个人中心", "com.zhidao.auto.personal", R.drawable.module_apps_ic_personal_center ), ; private String mName; diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_personal_center.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_personal_center.png old mode 100755 new mode 100644 index 41ec3ad07d..14f9134a80 Binary files a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_personal_center.png and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_personal_center.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_personal_center.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_personal_center.png old mode 100755 new mode 100644 index 3cbdfd1de4..cf052258e8 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_personal_center.png and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_personal_center.png differ