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

Merge branch 'master' of https://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
crimean 2019-07-09 17:22:48 +03:00
commit 6875334be7
22 changed files with 205 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/res/values-ru/strings.xml
View file

@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="rendering_attr_winter_road_name">Автозимник</string>
<string name="rendering_attr_ice_road_name">Ледовый автозимник</string>
<string name="routeInfo_winter_ice_road_name">Зимники</string>
<string name="rendering_attr_tracktype_grade1_name">Твёрдое</string>
<string name="rendering_attr_tracktype_grade2_name">Почти твёрдое</string>
<string name="rendering_attr_tracktype_grade3_name">Смешанное</string>
<string name="rendering_attr_tracktype_grade4_name">Почти мягкое</string>
<string name="rendering_attr_tracktype_grade5_name">Мягкое</string>
<string name="routeInfo_tracktype_name">Состояние дороги</string>
<string name="intermediate_waypoint">Промежуточная точка</string>
<string name="intermediate_destinations">Промежуточные точки</string>
<string name="arrive_at_time">Прибытие в %1$s</string>

9
OsmAnd/res/values/strings.xml
View file

@ -11,6 +11,15 @@
Thx - Hardy
-->
<string name="rendering_attr_winter_road_name">Winter road</string>
<string name="rendering_attr_ice_road_name">Ice road</string>
<string name="routeInfo_winter_ice_road_name">Winter and ice roads</string>
<string name="rendering_attr_tracktype_grade1_name">Solid (paved)</string>
<string name="rendering_attr_tracktype_grade2_name">Solid (unpaved)</string>
<string name="rendering_attr_tracktype_grade3_name">Mostly solid</string>
<string name="rendering_attr_tracktype_grade4_name">Mostly soft</string>
<string name="rendering_attr_tracktype_grade5_name">Soft</string>
<string name="routeInfo_tracktype_name">Surface firmness</string>
<string name="shared_string_file_is_saved">%s is saved</string>
<string name="shared_string_open_track">Open track</string>
<string name="shared_string_track_is_saved">Track %s is saved</string>

3
OsmAnd/src/net/osmand/aidl/IOsmAndAidlCallback.aidl
View file

@ -3,6 +3,7 @@ package net.osmand.aidl;
import net.osmand.aidl.search.SearchResult;
import net.osmand.aidl.gpx.AGpxBitmap;
import net.osmand.aidl.navigation.ADirectionInfo;
import net.osmand.aidl.navigation.OnVoiceNavigationParams;
interface IOsmAndAidlCallback {
@ -49,5 +50,5 @@ interface IOsmAndAidlCallback {
/**
* Callback for {@link IOsmAndAidlInterface} registerForVoiceRouterMessages() method.
*/
void onVoiceRouterNotify();
void onVoiceRouterNotify(in OnVoiceNavigationParams params);
}

5
OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
View file

@ -47,6 +47,7 @@ import net.osmand.aidl.mapmarker.AMapMarker;
import net.osmand.aidl.mapwidget.AMapWidget;
import net.osmand.aidl.navdrawer.NavDrawerFooterParams;
import net.osmand.aidl.navigation.ADirectionInfo;
import net.osmand.aidl.navigation.OnVoiceNavigationParams;
import net.osmand.aidl.plugins.PluginParams;
import net.osmand.aidl.search.SearchResult;
import net.osmand.aidl.tiles.ASqliteDbFile;
@ -1923,12 +1924,12 @@ public class OsmandAidlApi {
public void registerForVoiceRouterMessages(long id) {
VoiceRouter.VoiceMessageListener listener = new VoiceRouter.VoiceMessageListener() {
@Override
public void onVoiceMessage() {
public void onVoiceMessage(List<String> cmds, List<String> played) {
if (aidlCallbackListener != null) {
for (OsmandAidlService.AidlCallbackParams cb : aidlCallbackListener.getAidlCallbacks().values()) {
if (!aidlCallbackListener.getAidlCallbacks().isEmpty() && (cb.getKey() & KEY_ON_VOICE_MESSAGE) > 0) {
try {
cb.getCallback().onVoiceRouterNotify();
cb.getCallback().onVoiceRouterNotify(new OnVoiceNavigationParams(cmds, played));
} catch (Exception e) {
LOG.error(e.getMessage(), e);
}

3
OsmAnd/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.aidl Normal file
View file

@ -0,0 +1,3 @@
package net.osmand.aidl.navigation;
parcelable OnVoiceNavigationParams;

55
OsmAnd/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.java Normal file
View file

@ -0,0 +1,55 @@
package net.osmand.aidl.navigation;
import android.os.Parcel;
import android.os.Parcelable;
import java.util.ArrayList;
import java.util.List;
public class OnVoiceNavigationParams implements Parcelable {
private List<String> cmds;
private List<String> played;
public OnVoiceNavigationParams() {
cmds = new ArrayList<>();
played = new ArrayList<>();
}
public OnVoiceNavigationParams(List<String> cmds, List<String> played) {
this.cmds = cmds;
this.played = played;
}
public OnVoiceNavigationParams(Parcel in) {
readFromParcel(in);
}
public static final Creator<OnVoiceNavigationParams> CREATOR = new Creator<OnVoiceNavigationParams>() {
@Override
public OnVoiceNavigationParams createFromParcel(Parcel in) {
return new OnVoiceNavigationParams(in);
}
@Override
public OnVoiceNavigationParams[] newArray(int size) {
return new OnVoiceNavigationParams[size];
}
};
@Override
public void writeToParcel(Parcel out, int flags) {
out.writeList(cmds);
out.writeList(played);
}
private void readFromParcel(Parcel in) {
in.readList(cmds, getClass().getClassLoader());
in.readList(played, getClass().getClassLoader());
}
@Override
public int describeContents() {
return 0;
}
}

19
OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
View file

@ -40,6 +40,8 @@ public class OsmAndFormatter {
private static final SimpleDateFormat SIMPLE_TIME_OF_DAY_FORMAT = new SimpleDateFormat("HH:mm", Locale.getDefault());
private static final String[] localDaysStr = getLettersStringArray(DateFormatSymbols.getInstance().getShortWeekdays(), 3);
public static final float MILS_IN_DEGREE = 17.777778f;
public static final int FORMAT_DEGREES_SHORT = 6;
public static final int FORMAT_DEGREES = LocationConvert.FORMAT_DEGREES;
public static final int FORMAT_MINUTES = LocationConvert.FORMAT_MINUTES;
@ -195,12 +197,23 @@ public class OsmAndFormatter {
while(bearing > 360.0) {
bearing -= 360;
}
int azimuth = (int) bearing;
if (app.getSettings().ANGULAR_UNITS.get() == AngularConstants.MILLIRADS) {
return (int) (azimuth * 17.4533) + " " + AngularConstants.MILLIRADS.getUnitSymbol();
if (bearing < 0) {
return Math.round((360 + bearing) * MILS_IN_DEGREE) + " " + AngularConstants.MILLIRADS.getUnitSymbol();
} else {
return azimuth + AngularConstants.DEGREES.getUnitSymbol();
return Math.round(bearing * MILS_IN_DEGREE) + " " + AngularConstants.MILLIRADS.getUnitSymbol();
}
} else if (app.getSettings().ANGULAR_UNITS.get() == AngularConstants.DEGREES360) {
if (bearing < -0.5) {
return (360 + Math.round(bearing)) + AngularConstants.DEGREES360.getUnitSymbol();
} else if (bearing >= -0.5 && bearing < 0) {
return 0 + AngularConstants.DEGREES360.getUnitSymbol();
} else {
return Math.round(bearing) + AngularConstants.DEGREES360.getUnitSymbol();
}
} else {
return Math.round(bearing) + AngularConstants.DEGREES.getUnitSymbol();
}
}

1
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -2967,6 +2967,7 @@ public class OsmandSettings {
public enum AngularConstants {
DEGREES(R.string.shared_string_degrees, "°"),
DEGREES360(R.string.shared_string_degrees, "°"),
MILLIRADS(R.string.shared_string_milliradians, "mil");
private final int key;

6
OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
View file

@ -213,8 +213,14 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
AngularConstants[] ac = AngularConstants.values();
entries = new String[ac.length];
for (int i = 0; i < entries.length; i++) {
if (ac[i] == AngularConstants.DEGREES) {
entries[i] = AngularConstants.DEGREES.toHumanString(getMyApplication()) + " 180";
} else if (ac [i] == AngularConstants.DEGREES360) {
entries[i] = AngularConstants.DEGREES.toHumanString(getMyApplication()) + " 360";
} else {
entries[i] = ac[i].toHumanString(getMyApplication());
}
}
registerListPreference(settings.ANGULAR_UNITS, screen, entries, ac);
// See language list and statistics at: https://hosted.weblate.org/projects/osmand/main/

4
OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
View file

@ -17,6 +17,8 @@ import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.CommonPreference;
import net.osmand.plus.routing.VoiceRouter.VoiceMessageListener;
import java.util.List;
public class LockHelper implements SensorEventListener {
private static final int SENSOR_SENSITIVITY = 4;
@ -57,7 +59,7 @@ public class LockHelper implements SensorEventListener {
};
voiceMessageListener = new VoiceMessageListener() {
@Override
public void onVoiceMessage() {
public void onVoiceMessage(List<String> listCommands, List<String> played) {
unlockEvent();
}
};

17
OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
View file

@ -7,6 +7,7 @@ import android.graphics.PointF;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Handler;
import android.support.annotation.ColorRes;
import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -26,6 +27,7 @@ import android.widget.FrameLayout;
import android.widget.HorizontalScrollView;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
import net.osmand.AndroidUtils;
@ -917,6 +919,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
final RoutingHelper helper = app.getRoutingHelper();
View startButton = mainView.findViewById(R.id.start_button);
TextViewExProgress startButtonText = (TextViewExProgress) mainView.findViewById(R.id.start_button_descr);
ProgressBar progressBar = (ProgressBar) mainView.findViewById(R.id.progress_bar_button);
boolean publicTransportMode = helper.getAppMode() == ApplicationMode.PUBLIC_TRANSPORT;
boolean routeCalculated = isRouteCalculated();
int iconId = publicTransportMode ? R.drawable.ic_map : R.drawable.ic_action_start_navigation;
@ -942,8 +945,8 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
color2 = R.color.description_font_and_bottom_sheet_icons;
}
}
startButtonText.color1 = ContextCompat.getColor(mapActivity, color1);
startButtonText.color2 = ContextCompat.getColor(mapActivity, color2);
setupRouteCalculationButtonProgressBar(progressBar, startButtonText, color1, color2);
startButtonText.setCompoundDrawablesWithIntrinsicBounds(app.getUIUtilities().getIcon(iconId, color2), null, null, null);
if (publicTransportMode) {
startButtonText.setText(R.string.shared_string_show_on_map);
@ -976,6 +979,16 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
});
}
private void setupRouteCalculationButtonProgressBar(@NonNull ProgressBar pb, @NonNull TextViewExProgress textProgress, @ColorRes int progressTextColor, @ColorRes int bgTextColor) {
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
int progressColor = ContextCompat.getColor(mapActivity, nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light);
pb.setProgressDrawable(AndroidUtils.createProgressDrawable(ContextCompat.getColor(mapActivity, R.color.color_transparent), ContextCompat.getColor(mapActivity, progressTextColor)));
textProgress.paint.setColor(progressColor);
textProgress.setTextColor(ContextCompat.getColor(mapActivity, bgTextColor));
}
}
private void createRoutingParametersButtons(MapActivity mapActivity, final RouteMenuAppModes mode, LinearLayout optionsContainer) {
if (mapActivity == null || optionsContainer == null) {
return;

19
OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java
View file

@ -379,7 +379,7 @@ public class MapRouteInfoMenuFragment extends ContextMenuFragment {
progressBarButton.setProgress(progress);
}
TextViewExProgress textViewExProgress = (TextViewExProgress) view.findViewById(R.id.start_button_descr);
textViewExProgress.percent = progress / 100f;
textViewExProgress.percent = publicTransportMode ? 0 : progress / 100f;
textViewExProgress.invalidate();
}
@ -395,12 +395,12 @@ public class MapRouteInfoMenuFragment extends ContextMenuFragment {
if (progressBar != null) {
progressBar.setVisibility(View.GONE);
}
View progressBarButton = view.findViewById(R.id.progress_bar_button);
ProgressBar progressBarButton = (ProgressBar) view.findViewById(R.id.progress_bar_button);
if (progressBarButton != null) {
progressBarButton.setVisibility(View.GONE);
progressBarButton.setProgress(100);
}
TextViewExProgress textViewExProgress = (TextViewExProgress) view.findViewById(R.id.start_button_descr);
textViewExProgress.percent = 1;
textViewExProgress.percent = isPublicTransportMode() ? 0 : 1;
}
public void show(MapActivity mapActivity) {
@ -469,7 +469,6 @@ public class MapRouteInfoMenuFragment extends ContextMenuFragment {
((TextView) mainView.findViewById(R.id.toTitle)).setTextColor(descriptionColor);
ctx.setupRouteCalculationProgressBar((ProgressBar) mainView.findViewById(R.id.progress_bar));
setupRouteCalculationButtonProgressBar((ProgressBar) view.findViewById(R.id.progress_bar_button));
}
public static boolean showInstance(final MapActivity mapActivity, int initialMenuState) {
@ -506,14 +505,4 @@ public class MapRouteInfoMenuFragment extends ContextMenuFragment {
return false;
}
}
public void setupRouteCalculationButtonProgressBar(@NonNull ProgressBar pb) {
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
int bgColor = ContextCompat.getColor(mapActivity, isNightMode() ? R.color.activity_background_dark : R.color.activity_background_light);
int progressColor = ContextCompat.getColor(mapActivity, isNightMode() ? R.color.active_color_primary_dark : R.color.active_color_primary_light);
pb.setProgressDrawable(AndroidUtils.createProgressDrawable(bgColor, progressColor));
pb.getIndeterminateDrawable().setColorFilter(progressColor, android.graphics.PorterDuff.Mode.SRC_IN);
}
}
}

19
OsmAnd/src/net/osmand/plus/routepreparationmenu/WaypointsFragment.java
View file

@ -4,6 +4,7 @@ import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.support.annotation.ColorRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentActivity;
@ -425,9 +426,13 @@ public class WaypointsFragment extends BaseOsmAndFragment implements ObservableS
AndroidUtils.setBackground(mapActivity, view.findViewById(R.id.controls_divider), nightMode, R.color.divider_color_light, R.color.divider_color_dark);
((TextView) view.findViewById(R.id.cancel_button_descr)).setTextColor(colorActive);
((TextView) view.findViewById(R.id.start_button_descr)).setText(getText(R.string.shared_string_apply));
setupRouteCalculationButtonProgressBar((ProgressBar) view.findViewById(R.id.progress_bar_button));
TextViewExProgress startButtonText = (TextViewExProgress) view.findViewById(R.id.start_button_descr);
ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.progress_bar_button);
startButtonText.setText(getText(R.string.shared_string_apply));
int progressTextColor = nightMode ? R.color.active_buttons_and_links_text_disabled_dark : R.color.active_buttons_and_links_text_light;
setupRouteCalculationButtonProgressBar(progressBar, startButtonText, progressTextColor);
}
public void reloadListAdapter(ArrayAdapter<Object> listAdapter) {
@ -551,19 +556,17 @@ public class WaypointsFragment extends BaseOsmAndFragment implements ObservableS
}
TextViewExProgress textViewExProgress = (TextViewExProgress) view.findViewById(R.id.start_button_descr);
textViewExProgress.percent = progress / 100f;
int color = nightMode ? R.color.active_buttons_and_links_text_disabled_dark : R.color.active_buttons_and_links_text_light;
textViewExProgress.color1 = ContextCompat.getColor(mapActivity, color);
textViewExProgress.color2 = ContextCompat.getColor(mapActivity, R.color.active_buttons_and_links_text_disabled_dark);
textViewExProgress.invalidate();
}
public void setupRouteCalculationButtonProgressBar(@NonNull ProgressBar pb) {
private void setupRouteCalculationButtonProgressBar(@NonNull ProgressBar pb, @NonNull TextViewExProgress textProgress, @ColorRes int progressTextColor) {
OsmandApplication app = getMyApplication();
if (app != null) {
int bgColor = ContextCompat.getColor(app, nightMode ? R.color.activity_background_dark : R.color.activity_background_light);
int progressColor = ContextCompat.getColor(app, nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light);
pb.setProgressDrawable(AndroidUtils.createProgressDrawable(bgColor, progressColor));
pb.setProgressDrawable(AndroidUtils.createProgressDrawable(bgColor, ContextCompat.getColor(app, progressTextColor)));
textProgress.paint.setColor(progressColor);
textProgress.setTextColor(ContextCompat.getColor(app, R.color.active_buttons_and_links_text_disabled_dark));
}
}

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

@ -9,7 +9,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import net.osmand.Location;
import net.osmand.binary.RouteDataObject;
@ -80,7 +79,7 @@ public class VoiceRouter {
private static RouteDirectionInfo nextRouteDirection;
public interface VoiceMessageListener {
void onVoiceMessage();
void onVoiceMessage(List<String> listCommands, List<String> played);
}
private List<WeakReference<VoiceMessageListener>> voiceMessageListeners = new ArrayList<>();
@ -241,8 +240,8 @@ public class VoiceRouter {
}
public void announceBackOnRoute() {
CommandBuilder p = getNewCommandPlayerToPlay();
if (announceBackOnRoute) {
CommandBuilder p = getNewCommandPlayerToPlay();
if (p != null) {
p.backOnRoute();
}
@ -909,9 +908,12 @@ public class VoiceRouter {
private void play(CommandBuilder p) {
if (p != null) {
p.play();
List<String> played = p.play();
notifyOnVoiceMessage(p.getListCommands(), played);
} else {
notifyOnVoiceMessage(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
}
notifyOnVoiceMessage();
}
private void makeSound() {
@ -941,12 +943,12 @@ public class VoiceRouter {
voiceMessageListeners = updateVoiceMessageListeners(new ArrayList<>(voiceMessageListeners), voiceMessageListener, false);
}
private void notifyOnVoiceMessage() {
List<WeakReference<VoiceMessageListener>> voiceMessageListeners = new ArrayList<>(this.voiceMessageListeners);
private void notifyOnVoiceMessage(List<String> listCommands, List<String> played) {
List<WeakReference<VoiceMessageListener>> voiceMessageListeners = this.voiceMessageListeners;
for (WeakReference<VoiceMessageListener> weakReference : voiceMessageListeners) {
VoiceMessageListener lnt = weakReference.get();
if (lnt != null) {
lnt.onVoiceMessage();
lnt.onVoiceMessage(listCommands, played);
}
}
}

20
OsmAnd/src/net/osmand/plus/voice/CommandBuilder.java
View file

@ -5,15 +5,12 @@ import java.util.Arrays;
import java.util.List;
import net.osmand.PlatformUtil;
import net.osmand.plus.R;
import net.osmand.plus.routing.data.StreetName;
import org.apache.commons.logging.Log;
import alice.tuprolog.Struct;
import alice.tuprolog.Term;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationManagerCompat;
public class CommandBuilder {
@ -57,6 +54,7 @@ public class CommandBuilder {
protected final CommandPlayer commandPlayer;
protected boolean alreadyExecuted = false;
private List<Struct> listStruct = new ArrayList<Struct>();
private List<String> listCommands = new ArrayList<String>();
public CommandBuilder(CommandPlayer commandPlayer){
this.commandPlayer = commandPlayer;
@ -71,9 +69,21 @@ public class CommandBuilder {
private CommandBuilder addCommand(String name, Object... args){
Struct struct = prepareStruct(name, args);
listStruct.add(struct);
listCommands.add(name);
for(Object o : args) {
if(o == null) {
listCommands.add(o.toString());
} else {
listCommands.add("");
}
}
return this;
}
public List<String> getListCommands() {
return listCommands;
}
private Struct prepareStruct(String name, Object... args) {
checkState();
Term[] list = new Term[args.length];
@ -254,8 +264,8 @@ public class CommandBuilder {
return alt(prepareStruct(C_ROUTE_RECALC, dist, time), prepareStruct(C_ROUTE_RECALC, dist));
}
public void play(){
this.commandPlayer.playCommands(this);
public List<String> play(){
return this.commandPlayer.playCommands(this);
}

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

@ -10,7 +10,7 @@ public interface CommandPlayer {
public CommandBuilder newCommandBuilder();
public void playCommands(CommandBuilder builder);
public List<String> playCommands(CommandBuilder builder);
public void clear();

11
OsmAnd/src/net/osmand/plus/voice/JSCommandBuilder.java
View file

@ -12,15 +12,8 @@ import org.mozilla.javascript.NativeJSON;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class JSCommandBuilder extends CommandBuilder {
@ -216,8 +209,8 @@ public class JSCommandBuilder extends CommandBuilder {
}
@Override
public void play(){
this.commandPlayer.playCommands(this);
public List<String> play(){
return this.commandPlayer.playCommands(this);
}
@Override

9
OsmAnd/src/net/osmand/plus/voice/JSMediaCommandPlayerImpl.java
View file

@ -15,6 +15,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
public class JSMediaCommandPlayerImpl extends MediaCommandPlayerImpl {
@ -44,11 +45,12 @@ public class JSMediaCommandPlayerImpl extends MediaCommandPlayerImpl {
}
@Override
public synchronized void playCommands(CommandBuilder builder) {
public synchronized List<String> playCommands(CommandBuilder builder) {
if(vrt.isMute()) {
return;
return Collections.emptyList();
}
filesToPlay.addAll(splitAnnouncements(builder.execute()));
List<String> lst = splitAnnouncements(builder.execute());
filesToPlay.addAll(lst);
// If we have not already started to play audio, start.
if (mediaPlayer == null) {
@ -63,6 +65,7 @@ public class JSMediaCommandPlayerImpl extends MediaCommandPlayerImpl {
}
}
playQueue();
return lst;
}
private List<String> splitAnnouncements(List<String> execute) {

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

@ -67,7 +67,7 @@ public class MediaCommandPlayerImpl extends AbstractPrologCommandPlayer implemen
// Called from the calculating route thread.
@Override
public synchronized void playCommands(CommandBuilder builder) {
public synchronized List<String> playCommands(CommandBuilder builder) {
if(vrt.isMute()) {
StringBuilder bld = new StringBuilder();
for (String s : builder.execute()) {
@ -76,9 +76,11 @@ public class MediaCommandPlayerImpl extends AbstractPrologCommandPlayer implemen
if (ctx != null) {
// sendAlertToAndroidWear(ctx, bld.toString());
}
return;
return Collections.emptyList();
}
filesToPlay.addAll(builder.execute());
List<String> lst = builder.execute();
filesToPlay.addAll(lst);
// If we have not already started to play audio, start.
if (mediaPlayer == null) {
@ -93,6 +95,7 @@ public class MediaCommandPlayerImpl extends AbstractPrologCommandPlayer implemen
}
}
playQueue();
return lst;
}
synchronized void playQueue() {

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

@ -104,7 +104,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
// Called from the calculating route thread.
@Override
public synchronized void playCommands(CommandBuilder builder) {
public synchronized List<String> playCommands(CommandBuilder builder) {
final List<String> execute = builder.execute(); //list of strings, the speech text, play it
StringBuilder bld = new StringBuilder();
for (String s : execute) {
@ -132,6 +132,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
} else if (ctx != null && vrt.isMute()) {
// sendAlertToAndroidWear(ctx, bld.toString());
}
return execute;
}
@Override

55
OsmAnd/src/net/osmand/plus/widgets/ImageViewExProgress.java
View file

@ -1,55 +0,0 @@
package net.osmand.plus.widgets;
import android.annotation.TargetApi;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.widget.ImageView;
public class ImageViewExProgress extends ImageView {
public float percent;
public int color1;
public int color2;
public ImageViewExProgress(Context context) {
super(context);
}
public ImageViewExProgress(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
}
public ImageViewExProgress(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
@TargetApi(21)
public ImageViewExProgress(Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
@Override
public void draw(Canvas canvas) {
canvas.save();
setColorFilter(color1);
int width = getWidth();
int widthP = (int) (width * percent);
int height = getHeight();
canvas.clipRect(new Rect(0, 0, widthP, height));
super.draw(canvas);
canvas.restore();
canvas.save();
setColorFilter(color2);
int width2 = getWidth();
int widthP2 = (int) (width2 * percent);
int height2 = getHeight();
canvas.clipRect(new Rect(widthP2, 0, width2, height2));
super.draw(canvas);
canvas.restore();
}
}

57
OsmAnd/src/net/osmand/plus/widgets/TextViewExProgress.java
View file

@ -2,67 +2,52 @@ package net.osmand.plus.widgets;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.PorterDuff;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.graphics.PorterDuffXfermode;
import android.util.AttributeSet;
public class TextViewExProgress extends TextViewEx {
public Paint paint;
public float percent;
public int color1;
public int color2;
public TextViewExProgress(Context context) {
super(context);
initPaint();
}
public TextViewExProgress(Context context, AttributeSet attrs) {
super(context, attrs);
initPaint();
}
public TextViewExProgress(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
initPaint();
}
public TextViewExProgress(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
initPaint();
}
@Override
public void draw(Canvas canvas) {
canvas.save();
setTextColor(color1);
Drawable[] icons = getCompoundDrawables();
for (int i = 0; i < icons.length; i++) {
Drawable drawable = icons[i];
if (drawable != null) {
drawable.setColorFilter(color1, PorterDuff.Mode.SRC_ATOP);
icons[i] = drawable;
public void onDraw(Canvas canvas) {
super.onDraw(canvas);
drawProgress(canvas);
}
}
setCompoundDrawables(icons[0], icons[1], icons[2], icons[3]);
int width = getWidth();
int widthP = (int) (width * percent);
int height = getHeight();
canvas.clipRect(new Rect(0, 0, widthP, height));
super.draw(canvas);
canvas.restore();
canvas.save();
setTextColor(color2);
for (int i = 0; i < icons.length; i++) {
Drawable drawable = icons[i];
if (drawable != null) {
drawable.setColorFilter(color2, PorterDuff.Mode.SRC_ATOP);
icons[i] = drawable;
private void drawProgress(Canvas canvas) {
int w = getWidth();
int h = getHeight();
float rectW = w * (percent);
canvas.drawRect(0, 0, rectW, h, paint);
}
}
setCompoundDrawables(icons[0], icons[1], icons[2], icons[3]);
int width2 = getWidth();
int widthP2 = (int) (width2 * percent);
int height2 = getHeight();
canvas.clipRect(new Rect(widthP2, 0, width2, height2));
super.draw(canvas);
canvas.restore();
private void initPaint() {
paint = new Paint();
paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.XOR));
setLayerType(LAYER_TYPE_SOFTWARE, null);
}
}