Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed bug with navigation not continue after reaching point

Browse source
This commit is contained in:
unknown 2014-07-07 12:04:24 +03:00
parent 633c5be7d7
commit 3887ad0636
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
View file

@ -51,6 +51,9 @@ public class RoutePointsPlugin extends OsmandPlugin {
private RoutePointsLayer routePointsLayer; private RoutePointsLayer routePointsLayer;
private RoutePoint lastReachedPoint;
public RoutePointsPlugin(OsmandApplication app) { public RoutePointsPlugin(OsmandApplication app) {
ApplicationMode.regWidget("route_steps", ApplicationMode.CAR, ApplicationMode.DEFAULT); ApplicationMode.regWidget("route_steps", ApplicationMode.CAR, ApplicationMode.DEFAULT);
this.app = app; this.app = app;
@ -78,7 +81,10 @@ public class RoutePointsPlugin extends OsmandPlugin {
btnY.setOnClickListener(new View.OnClickListener() { btnY.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
currentRoute.navigateToNextPoint(true); if (lastReachedPoint != null){
lastReachedPoint.setDelivered(true);
lastReachedPoint = null;
}
FrameLayout layout = (FrameLayout) mapActivity.getLayout(); FrameLayout layout = (FrameLayout) mapActivity.getLayout();
layout.removeView(deliveredView); layout.removeView(deliveredView);
} }
@ -89,7 +95,10 @@ public class RoutePointsPlugin extends OsmandPlugin {
btnN.setOnClickListener(new View.OnClickListener() { btnN.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
currentRoute.navigateToNextPoint(false); if (lastReachedPoint != null){
lastReachedPoint.setDelivered(false);
lastReachedPoint = null;
}
FrameLayout layout = (FrameLayout) mapActivity.getLayout(); FrameLayout layout = (FrameLayout) mapActivity.getLayout();
layout.removeView(deliveredView); layout.removeView(deliveredView);
} }
@ -100,10 +109,16 @@ public class RoutePointsPlugin extends OsmandPlugin {
@Override @Override
public boolean destinationReached() { public boolean destinationReached() {
if (currentRoute != null) { if (currentRoute != null) {
if (currentRoute.currentPoints != null && !currentRoute.currentPoints.isEmpty()){
lastReachedPoint = currentRoute.currentPoints.get(0);
}
FrameLayout layout = (FrameLayout) mapActivity.getLayout(); FrameLayout layout = (FrameLayout) mapActivity.getLayout();
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT); FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
params.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL; params.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
layout.addView(deliveredView, params); layout.addView(deliveredView, params);
//if it's possible to navigate to next point - navigation continues
return !currentRoute.navigateToNextPoint();
} }
return true; return true;
@ -463,20 +478,6 @@ public class RoutePointsPlugin extends OsmandPlugin {
return null; return null;
} }
public boolean navigateToNextPoint(boolean delivered) {
if (currentPoints.isEmpty()) {
return false;
}
RoutePoint rp = currentPoints.get(0);
if (rp.isNextNavigate) {
rp.setDelivered(delivered);
return navigateToNextPoint();
}
return false;
}
public void saveGPXAsync() { public void saveGPXAsync() {
new AsyncTask<RoutePointsPlugin.SelectedRouteGpxFile, Void, Void>() { new AsyncTask<RoutePointsPlugin.SelectedRouteGpxFile, Void, Void>() {