From 422b1079da70b2d2b016321885b4a350d3029fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= Date: Fri, 23 Nov 2018 23:36:04 +0100 Subject: [PATCH] Change icon when user change localization level --- .../wmi/findmytutor/activity/MapActivity.java | 25 ++++++++----------- .../uam/wmi/findmytutor/utils/MapMarker.java | 8 ++++++ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java index 14e2e70..e597b0e 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java @@ -337,6 +337,7 @@ public class MapActivity extends BaseActivity } ArrayList tmp = new ArrayList<>(); + for (Coordinate coordinate : coordsList) { tmp.add(coordinate.getUserId()); } @@ -367,17 +368,16 @@ public class MapActivity extends BaseActivity String newSharingLevel = element.getDisplayMode(); Coordinate coordinate = coordsMap.get(id); - Log.e(tag, "hashMapSize: " + coordsMap.size()); - Log.e(tag, "markerMapSize: " + coordsMap.size()); + /* Log.e(tag, "hashMapSize: " + coordsMap.size()); + Log.e(tag, "markerMapSize: " + coordsMap.size());*/ if (coordinate != null) { Log.e(tag, "Coordin: " + coordinate.getLatitude() + " | " + coordinate.getLongitude()); + boolean isTheSameLocalization = coordinate.getLatitude().equals(element.getLatitude()) || coordinate.getLongitude().equals(element.getLongitude()); + Log.e(tag, "diff || diff: " + !isTheSameLocalization); - boolean isTheSameLocalisation = coordinate.getLatitude().equals(element.getLatitude()) || coordinate.getLongitude().equals(element.getLongitude()); - Log.e(tag, "diff || diff: " + !isTheSameLocalisation); - - if (!isTheSameLocalisation) { + if (!isTheSameLocalization) { Log.e(tag, "replace and animate"); Marker marker = markerHash.get(id).getMarker(); @@ -391,17 +391,12 @@ public class MapActivity extends BaseActivity markerAnimator.setInterpolator(new LinearInterpolator()); markerAnimator.start(); - // chba niepotrzbene mapboxMap.getMarkerViewManager().update(); coordsMap.put(id, element); marker.setPosition(toDestination); - } - - - } else { Log.e(tag, "Marker Added: " + id); @@ -439,10 +434,11 @@ public class MapActivity extends BaseActivity coordsMap.get(id).setLabel(newLabel); - boolean newLocalizationMode = coordsMap.get(id).getDisplayMode().equals(newSharingLevel); + Boolean newLocalizationMode = markerHash.get(id).getMarkerType().equals(newSharingLevel); + markerHash.get(id).setMarkerType(newSharingLevel); - if(newLocalizationMode){ - Log.e("LOC","Nowy tryb" + coordsMap.get(id).getDisplayMode().toString() + " " + newSharingLevel ); + if(!newLocalizationMode){ + Log.e("LOC","1" + coordsMap.get(id).getDisplayMode().trim() + " " + newSharingLevel); coordsMap.get(id).setDisplayMode(newSharingLevel); MapMarker marker = markerHash.get(id); @@ -460,7 +456,6 @@ public class MapActivity extends BaseActivity marker.setDefaultIcon(defaultIcon); marker.restoreDefaultIcon(); - // chba niepotrzbene mapboxMap.getMarkerViewManager().update(); } diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/MapMarker.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/MapMarker.java index 06b6d84..6e09c23 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/utils/MapMarker.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/MapMarker.java @@ -47,4 +47,12 @@ public class MapMarker { public void setMarker(Marker marker) { this.marker = marker; } + + public String getMarkerType() { + return markerType; + } + + public void setMarkerType(String markerType) { + this.markerType = markerType; + } }