diff --git a/modules/mogo-module-service/build.gradle b/modules/mogo-module-service/build.gradle index fa646b8779..24478509c2 100644 --- a/modules/mogo-module-service/build.gradle +++ b/modules/mogo-module-service/build.gradle @@ -40,6 +40,8 @@ dependencies { annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid + implementation rootProject.ext.dependencies.moduleonlinecar + if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogomap api rootProject.ext.dependencies.mogomapapi 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 e614f92411..7c17e6ab29 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,7 +10,6 @@ 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; @@ -23,6 +22,8 @@ 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; @@ -67,6 +68,7 @@ public class MarkerServiceHandler { private static IMogoSocketManager mMogoSocketManager; private static IMogoCardManager mMogoCardManager; private static IMogoAnalytics mMogoAnalytics; + private static OnLineCarCardViewProvider onLineCarCardViewProvider; private static Context mContext; @@ -82,6 +84,7 @@ 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); @@ -352,7 +355,9 @@ public class MarkerServiceHandler { // 在ACC on 之后第一次获取到了在线车辆数据,选中最近的一个Marker if (isFirstMarker) { if (nearlyMogoMarker != null) { - MogoMarkersHandler.getInstance().onMarkerClicked(nearlyMogoMarker); + MarkerShowEntity markerShowEntity = (MarkerShowEntity) nearlyMogoMarker.getObject(); + MarkerOnlineCar markerOnlineCar = (MarkerOnlineCar) markerShowEntity.getBindObj(); + onLineCarCardViewProvider.updateView(markerOnlineCar); isFirstMarker = false; } }