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

Merge branch 'sherpafy'

Browse source
This commit is contained in:
Denis 2014-09-05 17:48:15 +03:00
commit 643b95be3f
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OsmAnd/assets/sounds/airhorn.ogg Normal file
View file

Binary file not shown.

2
OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
View file

@ -331,7 +331,7 @@ public class WaypointHelper {
}
if (!approachPoints.isEmpty()) {
if (type == WAYPOINTS) {
getVoiceRouter().approachWaypoint(lastKnownLocation, announcePoints);
getVoiceRouter().approachWaypoint(lastKnownLocation, approachPoints);
} else if (type == POI) {
getVoiceRouter().approachPoi(lastKnownLocation, announcePoints);
} else if (type == ALARMS) {

23
OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
View file

@ -1,13 +1,17 @@
package net.osmand.plus.routing;
import java.io.IOException;
import java.util.List;
import android.media.AudioManager;
import android.media.SoundPool;
import net.osmand.Location;
import net.osmand.binary.RouteDataObject;
import net.osmand.data.LocationPoint;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
import net.osmand.plus.routing.AlarmInfo.AlarmInfoType;
import net.osmand.plus.routing.RouteCalculationResult.NextDirectionInfo;
@ -225,6 +229,7 @@ public class VoiceRouter {
if (p == null){
return;
}
makeSound();
String text = getText(null, points,null);
p.arrivedAtWayPoint(text).play();
}
@ -234,6 +239,7 @@ public class VoiceRouter {
if (p == null){
return;
}
makeSound();
String text = getText(null, points,null);
p.arrivedAtFavorite(text).play();
}
@ -253,6 +259,7 @@ public class VoiceRouter {
return;
}
double[] dist = new double[1];
makeSound();
String text = getText(location, points, dist);
p.goAhead(dist[0], null).andArriveAtFavorite(text).play();
}
@ -263,6 +270,7 @@ public class VoiceRouter {
return;
}
double[] dist = new double[1];
makeSound();
String text = getText(location, points, dist);
p.goAhead(dist[0], null).andArriveAtWayPoint(text).play();
}
@ -773,7 +781,20 @@ public class VoiceRouter {
}
}
private void makeSound(){
SoundPool sp = new SoundPool(5, AudioManager.STREAM_MUSIC, 0);
int soundClick = -1;
boolean success = true;
try {
soundClick = sp.load(settings.getContext().getAssets().openFd("sounds/airhorn.ogg"), 1);
} catch (IOException e){
e.printStackTrace();
success = false;
}
if (success){
sp.play(soundClick, 1 ,1, 0, 0, 1);
}
}
}