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

clean up static

Browse source
This commit is contained in:
sonora 2016-07-26 10:14:25 +02:00
parent 8cf91c59b5
commit f878486872
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
View file

@ -73,12 +73,12 @@ public class RoutingHelper {
private OsmandSettings settings;
private RouteProvider provider;
private static VoiceRouter voiceRouter;
private VoiceRouter voiceRouter;
private static boolean isDeviatedFromRoute = false;
private long deviateFromRouteDetected = 0;
//private long wrongMovementDetected = 0;
private static boolean voiceRouterStopped = false;
private boolean voiceRouterStopped = false;
private RouteCalculationProgressCallback progressRoute;

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

@ -36,11 +36,11 @@ public class VoiceRouter {
private static final int STATUS_TOLD = 5;
private final RoutingHelper router;
private static boolean mute = false;
private static CommandPlayer player;
private final OsmandSettings settings;
private int currentStatus = STATUS_UNKNOWN;
private static boolean mute = false;
private static int currentStatus = STATUS_UNKNOWN;
private static boolean playedAndArriveAtTarget = false;
private static float playGoAheadDist = 0;
private static long lastAnnouncedSpeedLimit = 0;
@ -49,9 +49,10 @@ public class VoiceRouter {
private static long waitAnnouncedOffRoute = 0;
private static boolean suppressDest = false;
private static boolean announceBackOnRoute = false;
// private static long lastTimeRouteRecalcAnnounced = 0;
// Remember when last announcement was made
private static long lastAnnouncement = 0;
// Default speed to have comfortable announcements (Speed in m/s)
protected float DEFAULT_SPEED = 12;
protected float TURN_DEFAULT_SPEED = 5;
@ -68,9 +69,6 @@ public class VoiceRouter {
private static RouteDirectionInfo nextRouteDirection;
private Term empty;
// Remember when last announcement was made
private static long lastAnnouncement = 0;
public interface VoiceMessageListener {
void onVoiceMessage();
}

5
OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java
View file

@ -47,6 +47,7 @@ public abstract class AbstractPrologCommandPlayer implements CommandPlayer, Stat
protected Prolog prologSystem;
protected static final String P_VERSION = "version";
protected static final String P_RESOLVE = "resolve";
public static final String A_LEFT = "left";
public static final String A_LEFT_SH = "left_sh";
public static final String A_LEFT_SL = "left_sl";
@ -55,12 +56,12 @@ public abstract class AbstractPrologCommandPlayer implements CommandPlayer, Stat
public static final String A_RIGHT_SH = "right_sh";
public static final String A_RIGHT_SL = "right_sl";
public static final String A_RIGHT_KEEP = "right_keep";
protected static final String DELAY_CONST = "delay_";
protected static final String DELAY_CONST = "delay_";
private static final String WEAR_ALERT = "WEAR_ALERT";
/** Must be sorted array! */
private final int[] sortedVoiceVersions;
private static AudioFocusHelper mAudioFocusHelper;
private AudioFocusHelper mAudioFocusHelper;
protected String language = "";
protected int streamType;
private int currentVersion;

2
OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java
View file

@ -28,7 +28,7 @@ public class MediaCommandPlayerImpl extends AbstractPrologCommandPlayer implemen
private static final Log log = PlatformUtil.getLog(MediaCommandPlayerImpl.class);
// playing media
private static MediaPlayer mediaPlayer;
private MediaPlayer mediaPlayer;
// indicates that player is ready to play first file
private List<String> filesToPlay = Collections.synchronizedList(new ArrayList<String>());
private VoiceRouter vrt;

2
OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
View file

@ -62,7 +62,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
private static final int[] TTS_VOICE_VERSION = new int[] { 102, 103 }; // !! MUST BE SORTED
// TTS any more 101 because of to much changes
private static final Log log = PlatformUtil.getLog(TTSCommandPlayerImpl.class);
private static TextToSpeech mTts;
private TextToSpeech mTts;
private Context mTtsContext;
private HashMap<String, String> params = new HashMap<String, String>();
private VoiceRouter vrt;