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

remove useless changes part 4

Browse source
This commit is contained in:
Nazar 2019-07-03 18:05:41 +03:00
parent 7ca94dd101
commit e9e6101183
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,7 +67,7 @@ public class VoiceRouter {
// Default speed to have comfortable announcements (Speed in m/s) // Default speed to have comfortable announcements (Speed in m/s)
private float DEFAULT_SPEED = 12; private float DEFAULT_SPEED = 12;
private float TURN_DEFAULT_SPEED = 5; private float TURN_DEFAULT_SPEED = 5;
private int PREPARE_LONG_DISTANCE = 0; private int PREPARE_LONG_DISTANCE = 0;
private int PREPARE_LONG_DISTANCE_END = 0; private int PREPARE_LONG_DISTANCE_END = 0;
protected int PREPARE_DISTANCE = 0; protected int PREPARE_DISTANCE = 0;
@ -75,7 +75,7 @@ public class VoiceRouter {
private int TURN_IN_DISTANCE = 0; private int TURN_IN_DISTANCE = 0;
private int TURN_IN_DISTANCE_END = 0; private int TURN_IN_DISTANCE_END = 0;
private int TURN_DISTANCE = 0; private int TURN_DISTANCE = 0;
private static VoiceCommandPending pendingCommand = null; private static VoiceCommandPending pendingCommand = null;
private static RouteDirectionInfo nextRouteDirection; private static RouteDirectionInfo nextRouteDirection;
@ -84,14 +84,14 @@ public class VoiceRouter {
} }
private ConcurrentHashMap<WeakReference<VoiceMessageListener>, Integer> voiceMessageListeners; private ConcurrentHashMap<WeakReference<VoiceMessageListener>, Integer> voiceMessageListeners;
VoiceRouter(RoutingHelper router, final OsmandSettings settings) { VoiceRouter(RoutingHelper router, final OsmandSettings settings) {
this.router = router; this.router = router;
this.settings = settings; this.settings = settings;
mute = settings.VOICE_MUTE.get(); mute = settings.VOICE_MUTE.get();
voiceMessageListeners = new ConcurrentHashMap<>(); voiceMessageListeners = new ConcurrentHashMap<>();
} }
public void setPlayer(CommandPlayer player) { public void setPlayer(CommandPlayer player) {
VoiceRouter.player = player; VoiceRouter.player = player;
if (pendingCommand != null && player != null) { if (pendingCommand != null && player != null) {
@ -106,11 +106,11 @@ public class VoiceRouter {
public CommandPlayer getPlayer() { public CommandPlayer getPlayer() {
return player; return player;
} }
public void setMute(boolean mute) { public void setMute(boolean mute) {
this.mute = mute; this.mute = mute;
} }
public boolean isMute() { public boolean isMute() {
return mute; return mute;
} }
@ -218,11 +218,11 @@ public class VoiceRouter {
this.currentStatus = previousStatus; this.currentStatus = previousStatus;
} }
} }
private boolean statusNotPassed(int statusToCheck) { private boolean statusNotPassed(int statusToCheck) {
return currentStatus <= statusToCheck; return currentStatus <= statusToCheck;
} }
public void announceOffRoute(double dist) { public void announceOffRoute(double dist) {
long ms = System.currentTimeMillis(); long ms = System.currentTimeMillis();
if (waitAnnouncedOffRoute == 0 || ms - lastAnnouncedOffRoute > waitAnnouncedOffRoute) { if (waitAnnouncedOffRoute == 0 || ms - lastAnnouncedOffRoute > waitAnnouncedOffRoute) {
@ -233,7 +233,7 @@ public class VoiceRouter {
} }
play(p); play(p);
if (waitAnnouncedOffRoute == 0) { if (waitAnnouncedOffRoute == 0) {
waitAnnouncedOffRoute = 60000; waitAnnouncedOffRoute = 60000;
} else { } else {
waitAnnouncedOffRoute *= 2.5; waitAnnouncedOffRoute *= 2.5;
} }
@ -814,7 +814,7 @@ public class VoiceRouter {
} }
play(p); play(p);
} }
public void gpsLocationRecover() { public void gpsLocationRecover() {
CommandBuilder p = getNewCommandPlayerToPlay(); CommandBuilder p = getNewCommandPlayerToPlay();
if (p != null) { if (p != null) {
@ -950,4 +950,4 @@ public class VoiceRouter {
} }
} }
} }
} }