From 8b54d9f1ad67776c33616aba06cf8ff076a98d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 9 Jan 2020 15:43:02 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86marker=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0object=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/MarkerServiceHandler.java | 50 +++++++++++++------ 1 file changed, 36 insertions(+), 14 deletions(-) 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 70f0e26c1e..a297800a6e 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 @@ -93,36 +93,52 @@ public class MarkerServiceHandler { if (carChat != null) { for (MarkerCarChat markerCarChat : carChat) { MarkerLocation markerLocation = markerCarChat.getLocation(); - drawMapMarker(markerCarChat.getType(), markerLocation, optionsList); + drawMapMarker( + markerCarChat.getType(), + markerCarChat, + markerLocation, + optionsList); } } if (onlineCar != null) { for (MarkerOnlineCar markerOnlineCar : onlineCar) { MarkerLocation markerLocation = markerOnlineCar.getLocation(); - drawMapMarker(markerOnlineCar.getType(), markerLocation, optionsList); + drawMapMarker( + markerOnlineCar.getType(), + markerOnlineCar, + markerLocation, + optionsList); } } if (exploreWay != null) { for (MarkerExploreWay markerExploreWay : exploreWay) { MarkerLocation markerLocation = markerExploreWay.getLocation(); - drawMapMarker(markerExploreWay.getType(), markerLocation, optionsList); + drawMapMarker( + markerExploreWay.getType(), + markerExploreWay, + markerLocation, + optionsList); } } if (shareMusic != null) { for (MarkerShareMusic markerShareMusic : shareMusic) { MarkerLocation markerLocation = markerShareMusic.getLocation(); - drawMapMarker(markerShareMusic.getType(), markerLocation, optionsList); + drawMapMarker( + markerShareMusic.getType(), + markerShareMusic, + markerLocation, + optionsList); } } - List iMogoMarkers = getMarkerManager().addMarkers(TAG, optionsList, true); - for (IMogoMarker iMogoMarker : iMogoMarkers) { - iMogoMarker.setInfoWindowAdapter(markerInfoWindowAdapter); - iMogoMarker.setOnMarkerClickListener(mogoMarkerClickListener); - } +// List iMogoMarkers = getMarkerManager().addMarkers(TAG, optionsList, true); +// for (IMogoMarker iMogoMarker : iMogoMarkers) { +// iMogoMarker.setInfoWindowAdapter(markerInfoWindowAdapter); +// iMogoMarker.setOnMarkerClickListener(mogoMarkerClickListener); +// } } } @@ -176,9 +192,11 @@ public class MarkerServiceHandler { * @param markerLocation 要绘制Marker的位置信息 * @param optionsList 要加入的Marker集合 */ - public static void drawMapMarker(String markerTag, MarkerLocation markerLocation, + public static void drawMapMarker(String markerTag, + Object bindObject, + MarkerLocation markerLocation, ArrayList optionsList) { - Logger.e(markerTag, "绘制Marker====markerTag：" + markerTag); + Logger.e(TAG, "绘制Marker====markerTag：" + markerTag); MapMarkerView mapMarkerView = new MapMarkerView(mContext); @@ -188,7 +206,13 @@ public class MarkerServiceHandler { .latitude(markerLocation.getLat()) .longitude(markerLocation.getLon()); - optionsList.add(options); + IMogoMarker marker = getMarkerManager().addMarker(markerTag, options); + marker.setInfoWindowAdapter(markerInfoWindowAdapter); + marker.setOnMarkerClickListener(mogoMarkerClickListener); + marker.setObject(bindObject); + getMapUIController().changeZoom(10); + +// optionsList.add(options); } @@ -207,8 +231,6 @@ public class MarkerServiceHandler { marker.setInfoWindowAdapter(markerInfoWindowAdapter); marker.setOnMarkerClickListener(mogoMarkerClickListener); - getMapUIController().changeZoom(false); - getMapUIController().changeZoom(10); } From 51b77c52e2593fe2c73e2b5c7abaae0348f9cd0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 9 Jan 2020 16:34:41 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=AE=8C=E6=88=90marker=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/mogo/launcher/MogoApplication.java | 2 +- .../src/main/java/com/mogo/module/main/MainActivity.java | 4 +++- .../com/mogo/module/main/cards/MogoModulesHandler.java | 5 ++--- .../com/mogo/module/main/cards/MogoModulesManager.java | 6 +++--- .../com/mogo/module/service/MarkerServiceHandler.java | 9 ++------- 5 files changed, 11 insertions(+), 15 deletions(-) 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() From 829d17862216087843da8ca0e379be4baabf4755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 9 Jan 2020 16:37:58 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=AE=8C=E6=88=90marker=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/module/service/MarkerServiceHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 89cd729903..41988b5135 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 @@ -214,7 +214,6 @@ public class MarkerServiceHandler { Logger.e(TAG, "=====绘制Marker===="); - MapMarkerView mapMarkerView = new MapMarkerView(mContext); MogoMarkerOptions options = new MogoMarkerOptions() @@ -225,6 +224,7 @@ public class MarkerServiceHandler { IMogoMarker marker = getMarkerManager().addMarker(TAG, options); marker.setInfoWindowAdapter(markerInfoWindowAdapter); marker.setOnMarkerClickListener(mogoMarkerClickListener); + marker.setObject("我是Marker上面绑定的数据"); getMapUIController().changeZoom(10); From 7bead52ebcb40f82d32d8b67e34daf07658dca6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 9 Jan 2020 16:46:15 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=AE=8C=E6=88=90marker=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/service/MarkerServiceHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 41988b5135..bc4c063be6 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 @@ -135,6 +135,7 @@ public class MarkerServiceHandler { } } + getMapUIController().changeZoom(10); } }); @@ -205,7 +206,7 @@ public class MarkerServiceHandler { marker.setInfoWindowAdapter(markerInfoWindowAdapter); marker.setOnMarkerClickListener(mogoMarkerClickListener); marker.setObject(bindObject); - getMapUIController().changeZoom(10); + } @@ -221,7 +222,7 @@ public class MarkerServiceHandler { .owner("CARD_TYPE_USER_DATA") .latitude(39.574525d + new Random().nextDouble()) .longitude(116.21733d + new Random().nextDouble()); - IMogoMarker marker = getMarkerManager().addMarker(TAG, options); + IMogoMarker marker = getMarkerManager().addMarker("CARD_TYPE_USER_DATA", options); marker.setInfoWindowAdapter(markerInfoWindowAdapter); marker.setOnMarkerClickListener(mogoMarkerClickListener); marker.setObject("我是Marker上面绑定的数据"); From 2ed6b944c4a658ed8f1051e9495550d2fec9b88a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 9 Jan 2020 18:17:11 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9B=A0?= =?UTF-8?q?=E4=B8=BA=E5=85=B6=E4=BB=96=E6=A8=A1=E5=9D=97=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=AE=BE=E7=BD=AEmoduleName=E5=AF=BC=E8=87=B4Marker=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/main/cards/MogoModulesManager.java | 2 +- .../module/service/MarkerServiceHandler.java | 21 +++++-------------- 2 files changed, 6 insertions(+), 17 deletions(-) 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 25104639c8..f5408062a9 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 @@ -475,7 +475,7 @@ public class MogoModulesManager implements MogoModulesHandler, @Override public void onMarkerReceive(IMogoMarker marker) { for (IMogoModuleProvider value : mModuleProviders.values()) { - if (value.getModuleName().equals(marker.getOwner())) { + if (value.getModuleName()!=null && 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 bc4c063be6..36bc7852a3 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 @@ -26,7 +26,6 @@ import com.mogo.service.map.IMogoMapService; import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; -import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -88,16 +87,13 @@ public class MarkerServiceHandler { List exploreWay = markerCardResult.getExploreWay(); List shareMusic = markerCardResult.getShareMusic(); - ArrayList optionsList = new ArrayList<>(); - if (carChat != null) { for (MarkerCarChat markerCarChat : carChat) { MarkerLocation markerLocation = markerCarChat.getLocation(); drawMapMarker( markerCarChat.getType(), markerCarChat, - markerLocation, - optionsList); + markerLocation); } } @@ -107,8 +103,7 @@ public class MarkerServiceHandler { drawMapMarker( markerOnlineCar.getType(), markerOnlineCar, - markerLocation, - optionsList); + markerLocation); } } @@ -118,8 +113,7 @@ public class MarkerServiceHandler { drawMapMarker( markerExploreWay.getType(), markerExploreWay, - markerLocation, - optionsList); + markerLocation); } } @@ -129,8 +123,7 @@ public class MarkerServiceHandler { drawMapMarker( markerShareMusic.getType(), markerShareMusic, - markerLocation, - optionsList); + markerLocation); } } @@ -186,12 +179,10 @@ public class MarkerServiceHandler { * @param markerTag Marker类型 * http://gitlab.zhidaoauto.com/ecos/yycp-service/CarLauncher-Docs/blob/master/%E5%8D%A1%E7%89%87%E7%B1%BB%E5%9E%8B%E5%AE%9A%E4%B9%89.md * @param markerLocation 要绘制Marker的位置信息 - * @param optionsList 要加入的Marker集合 */ public static void drawMapMarker(String markerTag, Object bindObject, - MarkerLocation markerLocation, - ArrayList optionsList) { + MarkerLocation markerLocation) { Logger.e(TAG, "绘制Marker====markerTag：" + markerTag); MapMarkerView mapMarkerView = new MapMarkerView(mContext); @@ -214,7 +205,6 @@ public class MarkerServiceHandler { public static void drawMapMarker() { Logger.e(TAG, "=====绘制Marker===="); - MapMarkerView mapMarkerView = new MapMarkerView(mContext); MogoMarkerOptions options = new MogoMarkerOptions() @@ -228,6 +218,5 @@ public class MarkerServiceHandler { marker.setObject("我是Marker上面绑定的数据"); getMapUIController().changeZoom(10); - } } From addf3ea68b0b1b37545449985ea111e1c1576610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 9 Jan 2020 18:44:37 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=BF=9B=E8=A1=8Cmarker=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/MarkerServiceHandler.java | 116 +++++++++--------- 1 file changed, 60 insertions(+), 56 deletions(-) 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 36bc7852a3..1513b239bd 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 @@ -75,61 +75,7 @@ public class MarkerServiceHandler { @Override public void onMsgReceived(MarkerResponse response) { Logger.e(TAG, "===" + response); - - getMarkerManager().removeMarkers(); - - // 解析不同的Marker类型，然后对应的进行绘制 - if (response != null && response.getResult() != null) { - MarkerCardResult markerCardResult = response.getResult(); - - List carChat = markerCardResult.getCarChat(); - List onlineCar = markerCardResult.getOnlineCar(); - List exploreWay = markerCardResult.getExploreWay(); - List shareMusic = markerCardResult.getShareMusic(); - - if (carChat != null) { - for (MarkerCarChat markerCarChat : carChat) { - MarkerLocation markerLocation = markerCarChat.getLocation(); - drawMapMarker( - markerCarChat.getType(), - markerCarChat, - markerLocation); - } - } - - if (onlineCar != null) { - for (MarkerOnlineCar markerOnlineCar : onlineCar) { - MarkerLocation markerLocation = markerOnlineCar.getLocation(); - drawMapMarker( - markerOnlineCar.getType(), - markerOnlineCar, - markerLocation); - } - } - - if (exploreWay != null) { - for (MarkerExploreWay markerExploreWay : exploreWay) { - MarkerLocation markerLocation = markerExploreWay.getLocation(); - drawMapMarker( - markerExploreWay.getType(), - markerExploreWay, - markerLocation); - } - } - - if (shareMusic != null) { - for (MarkerShareMusic markerShareMusic : shareMusic) { - MarkerLocation markerLocation = markerShareMusic.getLocation(); - drawMapMarker( - markerShareMusic.getType(), - markerShareMusic, - markerLocation); - } - } - - } - getMapUIController().changeZoom(10); - + drawMapMarker(response); } }); } @@ -173,6 +119,65 @@ public class MarkerServiceHandler { } + /** + * 绘制Marker + */ + public static void drawMapMarker(MarkerResponse response) { + getMarkerManager().removeMarkers(); + + // 解析不同的Marker类型，然后对应的进行绘制 + if (response != null && response.getResult() != null) { + MarkerCardResult markerCardResult = response.getResult(); + + List carChat = markerCardResult.getCarChat(); + List onlineCar = markerCardResult.getOnlineCar(); + List exploreWay = markerCardResult.getExploreWay(); + List shareMusic = markerCardResult.getShareMusic(); + + if (carChat != null) { + for (MarkerCarChat markerCarChat : carChat) { + MarkerLocation markerLocation = markerCarChat.getLocation(); + drawMapMarker( + markerCarChat.getType(), + markerCarChat, + markerLocation); + } + } + + if (onlineCar != null) { + for (MarkerOnlineCar markerOnlineCar : onlineCar) { + MarkerLocation markerLocation = markerOnlineCar.getLocation(); + drawMapMarker( + markerOnlineCar.getType(), + markerOnlineCar, + markerLocation); + } + } + + if (exploreWay != null) { + for (MarkerExploreWay markerExploreWay : exploreWay) { + MarkerLocation markerLocation = markerExploreWay.getLocation(); + drawMapMarker( + markerExploreWay.getType(), + markerExploreWay, + markerLocation); + } + } + + if (shareMusic != null) { + for (MarkerShareMusic markerShareMusic : shareMusic) { + MarkerLocation markerLocation = markerShareMusic.getLocation(); + drawMapMarker( + markerShareMusic.getType(), + markerShareMusic, + markerLocation); + } + } + + } + getMapUIController().changeZoom(10); + } + /** * 绘制Marker * @@ -197,7 +202,6 @@ public class MarkerServiceHandler { marker.setInfoWindowAdapter(markerInfoWindowAdapter); marker.setOnMarkerClickListener(mogoMarkerClickListener); marker.setObject(bindObject); - } From ee96acf10e39606b2f54e6d67737b959cd4575b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 9 Jan 2020 19:18:06 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=B1=BB=E5=9E=8BMarker=E7=9A=84=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/MarkerServiceHandler.java | 21 +++++++++++++++++- .../com/mogo/module/service/ServiceConst.java | 22 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) 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 1513b239bd..5a7dd2cebe 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 @@ -16,6 +16,7 @@ import com.mogo.module.service.entity.MarkerLocation; import com.mogo.module.service.entity.MarkerOnlineCar; import com.mogo.module.service.entity.MarkerResponse; import com.mogo.module.service.entity.MarkerShareMusic; +import com.mogo.module.service.marker.MapMarkerInfoView; import com.mogo.module.service.marker.MapMarkerView; import com.mogo.module.service.marker.MarkerInfoWindowAdapter; import com.mogo.service.MogoServicePaths; @@ -191,13 +192,31 @@ public class MarkerServiceHandler { Logger.e(TAG, "绘制Marker====markerTag：" + markerTag); MapMarkerView mapMarkerView = new MapMarkerView(mContext); + MapMarkerInfoView mapMarkerInfoView = new MapMarkerInfoView(mContext); MogoMarkerOptions options = new MogoMarkerOptions() - .icon(mapMarkerView) .owner(markerTag) .latitude(markerLocation.getLat()) .longitude(markerLocation.getLon()); + switch (markerTag) { + case ServiceConst.CARD_TYPE_CARS_CHATTING: + options.icon(mapMarkerView); + break; + case ServiceConst.CARD_TYPE_ROAD_CODITION: + options.icon(mapMarkerView); + break; + case ServiceConst.CARD_TYPE_SHARE_MUSIC: + options.icon(mapMarkerView); + break; + case ServiceConst.CARD_TYPE_USER_DATA: + options.icon(mapMarkerInfoView); + break; + default: + options.icon(mapMarkerView); + break; + } + IMogoMarker marker = getMarkerManager().addMarker(markerTag, options); marker.setInfoWindowAdapter(markerInfoWindowAdapter); marker.setOnMarkerClickListener(mogoMarkerClickListener); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java index 0d7d74b0b7..40d2849481 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java @@ -26,4 +26,26 @@ public class ServiceConst { * 倒计时间隔 */ public static final int DECREASE_INTERVAL = 1_000; + + + /** + * 卡片 车聊聊 + */ + public static final String CARD_TYPE_CARS_CHATTING = "CARD_TYPE_CARS_CHATTING"; + + /** + * 卡片 探路数据 + */ + public static final String CARD_TYPE_ROAD_CODITION = "CARD_TYPE_ROAD_CODITION"; + + /** + * 卡片 分享音乐 + */ + public static final String CARD_TYPE_SHARE_MUSIC = "CARD_TYPE_SHARE_MUSIC"; + + /** + * 卡片 用户数据 + */ + public static final String CARD_TYPE_USER_DATA = "CARD_TYPE_USER_DATA"; + }