diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 9bf35c4d79..f251be04c3 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -28,7 +28,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setNetMode( DebugConfig.NET_MODE_QA ); MogoModulePaths.addModule(new MogoModule(OnLineCarConstants.TAG, "CARD_TYPE_ROAD_ONLINECAR")); MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, "CARD_TYPE_ROAD_CODITION" ) ); - MogoModulePaths.addModule(new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME)); +// MogoModulePaths.addModule(new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME)); } @Override diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 11f524e3e4..11e74b6bd0 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -199,7 +199,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override public boolean onMarkerClicked( IMogoMarker marker ) { switch2( marker.getOwner() ); - mMogoModuleHandler.onMarkerReceive(marker.getOwner(),marker); + if (mMogoModuleHandler != null) { + mMogoModuleHandler.onMarkerReceive(marker); + } return false; } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java index 73d83521f3..7b58e433e1 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java @@ -77,8 +77,7 @@ public interface MogoModulesHandler extends IMogoMapListener, /** * 卡片接收到Marker传入数据 - * @param cardType - * @param marker + * @param marker marker */ - void onMarkerReceive(String cardType, IMogoMarker marker); + void onMarkerReceive(IMogoMarker marker); } 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 7e67b2b37a..de1534e54a 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 @@ -440,9 +440,9 @@ public class MogoModulesManager implements MogoModulesHandler, } @Override - public void onMarkerReceive(String cardType, IMogoMarker marker) { - for ( IMogoModuleProvider value : mModuleProviders.values() ) { - if (value.getModuleName().equals(cardType)) { + public void onMarkerReceive(IMogoMarker marker) { + for (IMogoModuleProvider value : mModuleProviders.values()) { + if (value.getModuleName().equals(marker.getOwner())) { if (value.getMarkerClickListener() != null) { value.getMarkerClickListener().onMarkerClicked(marker); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index a297800a6e..89cd729903 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -134,11 +134,6 @@ public class MarkerServiceHandler { } } -// List iMogoMarkers = getMarkerManager().addMarkers(TAG, optionsList, true); -// for (IMogoMarker iMogoMarker : iMogoMarkers) { -// iMogoMarker.setInfoWindowAdapter(markerInfoWindowAdapter); -// iMogoMarker.setOnMarkerClickListener(mogoMarkerClickListener); -// } } } @@ -211,8 +206,6 @@ public class MarkerServiceHandler { marker.setOnMarkerClickListener(mogoMarkerClickListener); marker.setObject(bindObject); getMapUIController().changeZoom(10); - -// optionsList.add(options); } @@ -220,6 +213,8 @@ public class MarkerServiceHandler { public static void drawMapMarker() { Logger.e(TAG, "=====绘制Marker===="); + + MapMarkerView mapMarkerView = new MapMarkerView(mContext); MogoMarkerOptions options = new MogoMarkerOptions()