From b248d88221d375b7662823a9fe5534c2228730cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 23 Apr 2020 15:13:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5c7774b037..39d4c3a7f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x -MOGO_MODULE_V2X_VERSION=1.0.3.4 +MOGO_MODULE_V2X_VERSION=1.0.3.6 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.3 # 推送 From bbd0cda4aae9e65306f7d598ad86c6d1c332bd62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 23 Apr 2020 15:21:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 39d4c3a7f2..7d4fdb99a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x -MOGO_MODULE_V2X_VERSION=1.0.3.6 +MOGO_MODULE_V2X_VERSION=1.0.3.6-SNAPSHOT # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.3 # 推送 From 87a05f0ec87c8bcbd769ea8a3c6c90112b9f776a Mon Sep 17 00:00:00 2001 From: ihoudf <188816190@qq.com> Date: Thu, 23 Apr 2020 17:05:29 +0800 Subject: [PATCH 3/3] onlinecar smooth fix bug --- .../service/marker/MapMarkerManager.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 3204a1aeeb..cd223a66ea 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -821,6 +821,10 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if (mCurrentModuleName.equals(ServiceConst.CARD_TYPE_BUSINESS_OPERATION ) || mCurrentModuleName.equals(ServiceConst.CARD_TYPE_USER_DATA) ) { + if (MarkerServiceHandler.getMogoStatusManager().isSearchUIShow()){ + return; + } + mRefreshModel.queryOnLineCarWithRoute(mCarLatLng, false, false, new RefreshCallback() { @Override public void onSuccess(Object o) { @@ -829,11 +833,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if (result == null) { return; } - - for (int i = 0; i < carMarkers.size(); i++) { - IMogoMarker marker = carMarkers.get(i); - marker.destroy(); - } + removeCarMarkers(); List onlineCarList = result.getOnlineCar(); dispatchDataToBis(ServiceConst.CARD_TYPE_USER_DATA, onlineCarList == null ? new ArrayList<>() : onlineCarList); drawOnlineCarMarkers(onlineCarList, ServiceConst.MAX_AMOUNT_SINGLE_CARD); @@ -845,10 +845,14 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } }); }else { - for (int i = 0; i < carMarkers.size(); i++) { - IMogoMarker marker = carMarkers.get(i); - marker.destroy(); - } + removeCarMarkers(); + } + } + + private void removeCarMarkers(){ + for (int i = 0; i < carMarkers.size(); i++) { + IMogoMarker marker = carMarkers.get(i); + marker.destroy(); } } @@ -860,12 +864,13 @@ public class MapMarkerManager implements IMogoMarkerClickListener, List poisList = markerOnlineCar.getPois(); if (poisList != null && poisList.size() > 0) { -// Logger.d(TAG, "在线" + poisList.toString()); +// Logger.d(TAG, "坐标------"+markerLocation.getLon()+", "+markerLocation.getLat()); List points = new ArrayList<>(); for (int j = 0; j < poisList.size(); j++) { MarkerCarPois pois = poisList.get(j); if (pois != null && pois.getCoordinates() != null && pois.getCoordinates().size() >= 2) { +// Logger.d(TAG, "坐标点：" + pois.getCoordinates().toString()); double lat = Double.valueOf(pois.getCoordinates().get(1) + ""); double lng = Double.valueOf(pois.getCoordinates().get(0) + ""); points.add(new MogoLatLng(lat, lng));