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

created functionality to select whether package was delivered or not

Browse source
This commit is contained in:
unknown 2014-06-27 14:15:42 +03:00
parent 35a23f8196
commit 730309fda0
3 changed files with 113 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd/res/layout/package_delivered.xml Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/package_delivered"/>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button android:id="@+id/delivered_yes"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/default_buttons_yes"/>
<Button android:id="@+id/delivered_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/default_buttons_no"/>
</LinearLayout>
</LinearLayout>

1
OsmAnd/res/values/routepoints.xml
View file

@ -12,4 +12,5 @@
<string name="map_widget_route_points">Route points</string>
<string name="route_points_activity">Route Points</string>
<string name="navigate_dialog">Navigate dialog</string>
<string name="package_delivered">Was the package delivered?</string>
</resources>

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

@ -1,12 +1,11 @@
package net.osmand.plus.routepointsnavigation;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.*;
import android.content.Context;
import android.view.LayoutInflater;
import android.widget.Button;
import net.osmand.data.LatLon;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.GPXUtilities;
@ -38,10 +37,14 @@ public class RoutePointsPlugin extends OsmandPlugin {
public static final String ID = "osmand.route.stepsPlugin";
private static final String VISITED_KEY = "VISITED_KEY";
private static final String DELIVERED_KEY = "DELIVERED_KEY";
private OsmandApplication app;
private TextInfoWidget routeStepsControl;
private SelectedRouteGpxFile currentRoute;
MapActivity map;
private View deliveredView;
private RoutePointsLayer routePointsLayer;
@ -63,16 +66,37 @@ public class RoutePointsPlugin extends OsmandPlugin {
}
}
private void prepareDeliveredView() {
LayoutInflater vi = (LayoutInflater) app.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
deliveredView = vi.inflate(R.layout.package_delivered, null);
Button btnY = (Button) deliveredView.findViewById(R.id.delivered_yes);
btnY.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
currentRoute.navigateToNextPoint(true);
}
});
Button btnN = (Button) deliveredView.findViewById(R.id.delivered_no);
btnN.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
currentRoute.navigateToNextPoint(false);
}
});
}
@Override
public boolean destinationReached() {
if (currentRoute != null) {
boolean naviateToNextPoint = currentRoute.navigateToNextPoint();
//TODO: add delivered view to map
if (naviateToNextPoint) {
return false;
}
}
return true;
}
@ -109,7 +133,8 @@ public class RoutePointsPlugin extends OsmandPlugin {
@Override
public void registerLayers(MapActivity activity) {
super.registerLayers(activity);
prepareDeliveredView();
map = activity;
if (routePointsLayer != null) {
activity.getMapView().removeLayer(routePointsLayer);
}
@ -121,7 +146,7 @@ public class RoutePointsPlugin extends OsmandPlugin {
@Override
public void updateLayers(OsmandMapTileView mapView, MapActivity activity) {
if (routePointsLayer == null){
if (routePointsLayer == null) {
registerLayers(activity);
}
@ -216,6 +241,10 @@ public class RoutePointsPlugin extends OsmandPlugin {
return new LatLon(wpt.lat, wpt.lon);
}
public void setDelivered(boolean delivered) {
wpt.getExtensionsToWrite().put(DELIVERED_KEY, String.valueOf(delivered));
}
public void setVisitedTime(long currentTimeMillis) {
visitedTime = currentTimeMillis;
wpt.getExtensionsToWrite().put(VISITED_KEY, visitedTime + "");
@ -276,23 +305,27 @@ public class RoutePointsPlugin extends OsmandPlugin {
}
public boolean navigateToNextPoint() {
if (!currentPoints.isEmpty()) {
RoutePoint rp = currentPoints.get(0);
if (rp.isNextNavigate) {
rp.setVisitedTime(System.currentTimeMillis());
rp.isNextNavigate = false;
sortPoints();
}
RoutePoint first = currentPoints.get(0);
if (!first.isVisited()) {
app.getTargetPointsHelper().navigateToPoint(first.getPoint(), true, -1, first.getName());
first.isNextNavigate = true;
return true;
} else {
app.getTargetPointsHelper().clearPointToNavigate(true);
}
if (currentPoints.isEmpty()) {
return false;
}
RoutePoint rp = currentPoints.get(0);
if (rp.isNextNavigate) {
rp.setVisitedTime(System.currentTimeMillis());
rp.isNextNavigate = false;
sortPoints();
}
RoutePoint first = currentPoints.get(0);
if (!first.isVisited()) {
app.getTargetPointsHelper().navigateToPoint(first.getPoint(), true, -1, first.getName());
first.isNextNavigate = true;
return true;
} else {
app.getTargetPointsHelper().clearPointToNavigate(true);
}
return false;
}
private void sortPoints() {
@ -408,24 +441,38 @@ public class RoutePointsPlugin extends OsmandPlugin {
}
return null;
}
}
public void saveGPXAsync() {
new AsyncTask<RoutePointsPlugin.SelectedRouteGpxFile, Void, Void>() {
protected void onPreExecute() {
public boolean navigateToNextPoint(boolean delivered) {
if (currentPoints.isEmpty()) {
return false;
}
@Override
protected Void doInBackground(RoutePointsPlugin.SelectedRouteGpxFile... params) {
if(getCurrentRoute() != null) {
getCurrentRoute().saveFile();
RoutePoint rp = currentPoints.get(0);
if (rp.isNextNavigate) {
rp.setDelivered(delivered);
return navigateToNextPoint();
}
return false;
}
public void saveGPXAsync() {
new AsyncTask<RoutePointsPlugin.SelectedRouteGpxFile, Void, Void>() {
protected void onPreExecute() {
}
return null;
}
protected void onPostExecute(Void result) {
}
}.execute(getCurrentRoute());
@Override
protected Void doInBackground(RoutePointsPlugin.SelectedRouteGpxFile... params) {
if (getCurrentRoute() != null) {
getCurrentRoute().saveFile();
}
return null;
}
protected void onPostExecute(Void result) {
}
}.execute(getCurrentRoute());
}
}
}