From 18bd4cb2c17d0bac895255605bf2f49af731d24d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 5 Feb 2020 18:01:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E5=BA=95=E5=B1=82=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BA=86=E5=9C=A8=E7=BA=BF=E8=BD=A6=E8=BE=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-service/build.gradle | 2 +- .../mogo/module/service/MarkerServiceHandler.java | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/mogo-module-service/build.gradle b/modules/mogo-module-service/build.gradle index 24478509c2..88ce45edb7 100644 --- a/modules/mogo-module-service/build.gradle +++ b/modules/mogo-module-service/build.gradle @@ -40,7 +40,7 @@ dependencies { annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid - implementation rootProject.ext.dependencies.moduleonlinecar +// implementation rootProject.ext.dependencies.moduleonlinecar if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogomap 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 4cb1d6eb9e..02824330a0 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 @@ -10,6 +10,7 @@ import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.marker.MogoMarkerOptions; +import com.mogo.map.marker.MogoMarkersHandler; import com.mogo.map.navi.IMogoNavi; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.entity.MarkerCarChat; @@ -22,8 +23,6 @@ import com.mogo.module.common.entity.MarkerPoiTypeEnum; import com.mogo.module.common.entity.MarkerResponse; import com.mogo.module.common.entity.MarkerShareMusic; import com.mogo.module.common.entity.MarkerShowEntity; -import com.mogo.module.onlinecar.OnLineCarCardViewProvider; -import com.mogo.module.onlinecar.OnLineCarConstants; import com.mogo.module.service.marker.MapMarkerAdapter; import com.mogo.service.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; @@ -68,7 +67,6 @@ public class MarkerServiceHandler { private static IMogoSocketManager mMogoSocketManager; private static IMogoCardManager mMogoCardManager; private static IMogoAnalytics mMogoAnalytics; - private static OnLineCarCardViewProvider onLineCarCardViewProvider; private static Context mContext; @@ -84,7 +82,6 @@ public class MarkerServiceHandler { mMogoSocketManager = (IMogoSocketManager) ARouter.getInstance().build(MogoServicePaths.PATH_SOCKET_MANAGER).navigation(); mMogoCardManager = (IMogoCardManager) ARouter.getInstance().build(MogoServicePaths.PATH_CARD_MANAGER).navigation(); mMogoAnalytics = (IMogoAnalytics) ARouter.getInstance().build(MogoServicePaths.PATH_UTILS_ANALYTICS).navigation(); - onLineCarCardViewProvider = (OnLineCarCardViewProvider) ARouter.getInstance().build(OnLineCarConstants.TAG).navigation(); mMarkerManager = mMapService.getMarkerManager(context); mNavi = mMapService.getNavi(context); @@ -355,10 +352,11 @@ public class MarkerServiceHandler { // 在ACC on 之后第一次获取到了在线车辆数据，选中最近的一个Marker if (isFirstMarker) { if (nearlyMogoMarker != null) { - getMogoCardManager().switch2(ServiceConst.CARD_TYPE_USER_DATA); - MarkerShowEntity markerShowEntity = (MarkerShowEntity) nearlyMogoMarker.getObject(); - MarkerOnlineCar markerOnlineCar = (MarkerOnlineCar) markerShowEntity.getBindObj(); - onLineCarCardViewProvider.updateView(markerOnlineCar); +// getMogoCardManager().switch2(ServiceConst.CARD_TYPE_USER_DATA); +// MarkerShowEntity markerShowEntity = (MarkerShowEntity) nearlyMogoMarker.getObject(); +// MarkerOnlineCar markerOnlineCar = (MarkerOnlineCar) markerShowEntity.getBindObj(); +// onLineCarCardViewProvider.updateView(markerOnlineCar); + MogoMarkersHandler.getInstance().onMarkerClicked(nearlyMogoMarker); isFirstMarker = false; } }