From f2e4cd20ac19c546b9a10ab1a544879a85e6c830 Mon Sep 17 00:00:00 2001 From: Denis Date: Fri, 5 Sep 2014 17:47:58 +0300 Subject: [PATCH] Added sound for approaching and announcing waypoint. Fixed bug with wrong approaching distance --- OsmAnd/assets/sounds/airhorn.ogg | Bin 0 -> 23062 bytes .../osmand/plus/helpers/WaypointHelper.java | 2 +- .../net/osmand/plus/routing/VoiceRouter.java | 23 +++++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 OsmAnd/assets/sounds/airhorn.ogg diff --git a/OsmAnd/assets/sounds/airhorn.ogg b/OsmAnd/assets/sounds/airhorn.ogg new file mode 100644 index 0000000000000000000000000000000000000000..cb047f83fa433b1e6b54a68d32a1ee6f73b54fb1 GIT binary patch literal 23062 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

8X&B^L-HNyCLv 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 Wxj6tn72N!+Ul70n000000002wPNMYy literal 0 HcmV?d00001 diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java index 6604185deb..78ff6eba98 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java @@ -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) { diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java index e7ddc8bad2..0f8584c215 100644 --- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java +++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java @@ -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); + } + } }