From 978fbf55cb3e6febd0210a51ca5be0b98fa520f6 Mon Sep 17 00:00:00 2001 From: ihoudf <188816190@qq.com> Date: Wed, 22 Apr 2020 20:26:28 +0800 Subject: [PATCH 1/2] onlinecar smooth fix bug --- .../module/common/entity/MarkerOnlineCar.java | 72 +++++++++---------- .../service/marker/MapMarkerManager.java | 71 ++++++++++-------- 2 files changed, 73 insertions(+), 70 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerOnlineCar.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerOnlineCar.java index c6376414ff..5b5ce5a8d7 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerOnlineCar.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerOnlineCar.java @@ -17,6 +17,22 @@ public class MarkerOnlineCar implements Serializable { private List activitiesScope;//活动范围数据集合 private int compatibility;//匹配度 + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public MarkerLocation getLocation() { + return location; + } + + public void setLocation(MarkerLocation location) { + this.location = location; + } + public Boolean getFocus() { return isFocus; } @@ -25,20 +41,12 @@ public class MarkerOnlineCar implements Serializable { isFocus = focus; } - public List getPois() { - return pois; + public MarkerUserInfo getUserInfo() { + return userInfo; } - public void setPois(List pois) { - this.pois = pois; - } - - public List getActivitiesScope() { - return activitiesScope; - } - - public void setActivitiesScope(List activitiesScope) { - this.activitiesScope = activitiesScope; + public void setUserInfo(MarkerUserInfo userInfo) { + this.userInfo = userInfo; } public MarkerCarInfo getCarInfo() { @@ -49,12 +57,12 @@ public class MarkerOnlineCar implements Serializable { this.carInfo = carInfo; } - public int getCompatibility() { - return compatibility; + public List getPois() { + return pois; } - public void setCompatibility(int compatibility) { - this.compatibility = compatibility; + public void setPois(List pois) { + this.pois = pois; } public MarkerDynamicData getDynamicData() { @@ -73,36 +81,20 @@ public class MarkerOnlineCar implements Serializable { this.hobbyData = hobbyData; } - public boolean getIsFocus() { - return isFocus; + public List getActivitiesScope() { + return activitiesScope; } - public void setIsFocus(boolean isFocus) { - this.isFocus = isFocus; + public void setActivitiesScope(List activitiesScope) { + this.activitiesScope = activitiesScope; } - public MarkerLocation getLocation() { - return location; + public int getCompatibility() { + return compatibility; } - public void setLocation(MarkerLocation location) { - this.location = location; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public MarkerUserInfo getUserInfo() { - return userInfo; - } - - public void setUserInfo(MarkerUserInfo userInfo) { - this.userInfo = userInfo; + public void setCompatibility(int compatibility) { + this.compatibility = compatibility; } @Override 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 6bb14a4f20..225f2dba0b 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 @@ -702,11 +702,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if (mLastDataResult == null) { return; } - List onlineCarList = mLastDataResult.getOnlineCar(); +// List onlineCarList = mLastDataResult.getOnlineCar(); List exploreWayList = mLastDataResult.getExploreWay(); List noveltyInfoList = mLastDataResult.getNoveltyInfo(); - dispatchDataToBis(ServiceConst.CARD_TYPE_USER_DATA, onlineCarList == null ? - new ArrayList<>() : onlineCarList); +// dispatchDataToBis(ServiceConst.CARD_TYPE_USER_DATA, onlineCarList == null ? +// new ArrayList<>() : onlineCarList); dispatchDataToBis(ServiceConst.CARD_TYPE_ROAD_CONDITION, exploreWayList == null ? new ArrayList<>() : exploreWayList); dispatchDataToBis(ServiceConst.CARD_TYPE_NOVELTY, noveltyInfoList == null ? @@ -824,31 +824,38 @@ public class MapMarkerManager implements IMogoMarkerClickListener, }; private void getOnlineCarList() { - mRefreshModel.queryOnLineCarWithRoute(mCarLatLng, false, false, new RefreshCallback() { - @Override - public void onSuccess(Object o) { + if (mCurrentModuleName.equals(ServiceConst.CARD_TYPE_BUSINESS_OPERATION ) + || mCurrentModuleName.equals(ServiceConst.CARD_TYPE_USER_DATA) ) { - MarkerResponse data = (MarkerResponse) o; - MarkerCardResult result = data.getResult(); - if (result == null) { - return; + mRefreshModel.queryOnLineCarWithRoute(mCarLatLng, false, false, new RefreshCallback() { + @Override + public void onSuccess(Object o) { + MarkerResponse data = (MarkerResponse) o; + MarkerCardResult result = data.getResult(); + if (result == null) { + return; + } + + for (int i = 0; i < carMarkers.size(); i++) { + IMogoMarker marker = carMarkers.get(i); + marker.destroy(); + } + List onlineCarList = result.getOnlineCar(); + dispatchDataToBis(ServiceConst.CARD_TYPE_USER_DATA, onlineCarList == null ? new ArrayList<>() : onlineCarList); + drawOnlineCarMarkers(onlineCarList, ServiceConst.MAX_AMOUNT_SINGLE_CARD); } - for (int i = 0; i < carMarkers.size(); i++) { - IMogoMarker marker = carMarkers.get(i); - marker.destroy(); + @Override + public void onFail() { + } - List onlineCarList = result.getOnlineCar(); -// Logger.d(TAG, "在线数量" + onlineCarList.size()); - dispatchDataToBis(ServiceConst.CARD_TYPE_USER_DATA, onlineCarList == null ? new ArrayList<>() : onlineCarList); - drawOnlineCarMarkers(onlineCarList, ServiceConst.MAX_AMOUNT_SINGLE_CARD); + }); + }else { + for (int i = 0; i < carMarkers.size(); i++) { + IMogoMarker marker = carMarkers.get(i); + marker.destroy(); } - - @Override - public void onFail() { - - } - }); + } } // 平滑移动 @@ -857,19 +864,23 @@ public class MapMarkerManager implements IMogoMarkerClickListener, carMarkers.add(iMogoMarker); List poisList = markerOnlineCar.getPois(); -// Logger.d(TAG, "在线车辆路线坐标" + poisList.toString()); - if (poisList.size() > 0) { + if (poisList != null && poisList.size() > 0) { +// Logger.d(TAG, "在线" + poisList.toString()); List points = new ArrayList<>(); for (int j = 0; j < poisList.size(); j++) { MarkerCarPois pois = poisList.get(j); - double lat = new Double(pois.getCoordinates().get(1).toString()); - double lng = new Double(pois.getCoordinates().get(0).toString()); - points.add(new MogoLatLng(lat, lng)); + if (pois != null && pois.getCoordinates() != null && pois.getCoordinates().size() >= 2) { + double lat = Double.valueOf(pois.getCoordinates().get(1) + ""); + double lng = Double.valueOf(pois.getCoordinates().get(0) + ""); + points.add(new MogoLatLng(lat, lng)); + } + } + if (points.size() >= 1){ + points.add(new MogoLatLng(markerLocation.getLat(), markerLocation.getLon())); + iMogoMarker.startSmooth(points, mCarSmoothDuration); } - points.add(new MogoLatLng(markerLocation.getLat(), markerLocation.getLon())); - iMogoMarker.startSmooth(points, mCarSmoothDuration); } } From 240b905e1bd62c27c6a04aafd25c24b61b96cbbd Mon Sep 17 00:00:00 2001 From: lidongxiu Date: Thu, 23 Apr 2020 10:27:50 +0800 Subject: [PATCH 2/2] update media card version 1.0.4.3 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ee3f950d39..821e403f79 100644 --- a/gradle.properties +++ b/gradle.properties @@ -68,7 +68,7 @@ MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x MOGO_MODULE_V2X_VERSION=1.0.3.3-SNAPSHOT # 媒体卡片 -MOGO_MODULE_MEDIA_VERSION=1.0.4.2 +MOGO_MODULE_MEDIA_VERSION=1.0.4.3 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位