Safemobile/safedispatch-mobile
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SD-230 #31

Merged
CiufudeanDani merged 9 commits from SD-230 into develop 2022-04-27 12:00:40 +00:00
Conversation 0 Commits 9 Files Changed 13 +3 -9
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2771fe0114 - Show all commits

10
safeDispatch/src/main/java/com/safemobile/safedispatch/LiveActivity.java
View File

@ -444,12 +444,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
public void displayVehicle(double latZoom, double lngZoom) { public void displayVehicle(double latZoom, double lngZoom) {
if (googleMap != null) { if (googleMap != null) {
String openWindow = "";
for (Marker marker : markers) {
if (marker.isInfoWindowShown()) {
openWindow = marker.getTitle();
}
}
googleMap.clear(); googleMap.clear();
for (int i = 0; i < displayedVehicles.size(); i++) { for (int i = 0; i < displayedVehicles.size(); i++) {
@ -464,7 +458,8 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
markerOptions.icon(markerIcon); markerOptions.icon(markerIcon);
Marker marker = this.googleMap.addMarker(markerOptions); Marker marker = this.googleMap.addMarker(markerOptions);
if (openWindow.equals(marker.getTitle()) || i == lastItemClicked) {
if (i == lastItemClicked) {
marker.showInfoWindow(); marker.showInfoWindow();
googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(newLocation, 14)); googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(newLocation, 14));
} }
@ -474,7 +469,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
} }
} }
} }
lastItemClicked = 0;
} }
private BitmapDescriptor getProperBitmap(int largeIcon, String text) { private BitmapDescriptor getProperBitmap(int largeIcon, String text) {

2
safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
View File

@ -700,7 +700,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
tcpTimer = null; tcpTimer = null;
} }
if (getRadioActivity().audioThread != null) { if (getRadioActivity() != null && getRadioActivity().audioThread != null) {
Thread moribund = getRadioActivity().audioThread; Thread moribund = getRadioActivity().audioThread;
getRadioActivity().audioThread = null; getRadioActivity().audioThread = null;
moribund.interrupt(); moribund.interrupt();