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

Merge pull request #7210 from osmandapp/onVoiceRouterMessage

Browse source 
voice router message params
This commit is contained in:
vshcherb 2019-07-09 17:17:15 +02:00 committed by GitHub
commit c2f8e12576
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,13 +39,13 @@ public class OnVoiceNavigationParams implements Parcelable {
@Override @Override
public void writeToParcel(Parcel out, int flags) { public void writeToParcel(Parcel out, int flags) {
out.writeList(cmds); out.writeStringList(cmds);
out.writeList(played); out.writeStringList(played);
} }
private void readFromParcel(Parcel in) { private void readFromParcel(Parcel in) {
in.readList(cmds, getClass().getClassLoader()); in.readStringList(cmds);
in.readList(played, getClass().getClassLoader()); in.readStringList(played);
} }
@Override @Override

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

@ -54,7 +54,7 @@ public class CommandBuilder {
protected final CommandPlayer commandPlayer; protected final CommandPlayer commandPlayer;
protected boolean alreadyExecuted = false; protected boolean alreadyExecuted = false;
private List<Struct> listStruct = new ArrayList<Struct>(); private List<Struct> listStruct = new ArrayList<Struct>();
private List<String> listCommands = new ArrayList<String>(); protected List<String> listCommands = new ArrayList<String>();
public CommandBuilder(CommandPlayer commandPlayer){ public CommandBuilder(CommandPlayer commandPlayer){
this.commandPlayer = commandPlayer; this.commandPlayer = commandPlayer;
@ -71,7 +71,7 @@ public class CommandBuilder {
listStruct.add(struct); listStruct.add(struct);
listCommands.add(name); listCommands.add(name);
for(Object o : args) { for(Object o : args) {
if(o == null) { if(o != null) {
listCommands.add(o.toString()); listCommands.add(o.toString());
} else { } else {
listCommands.add(""); listCommands.add("");

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

@ -13,6 +13,7 @@ import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject; import org.mozilla.javascript.ScriptableObject;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
public class JSCommandBuilder extends CommandBuilder { public class JSCommandBuilder extends CommandBuilder {
@ -54,6 +55,8 @@ public class JSCommandBuilder extends CommandBuilder {
} }
private JSCommandBuilder addCommand(String name, Object... args){ private JSCommandBuilder addCommand(String name, Object... args){
listCommands.add(name);
listCommands.add(Arrays.toString(args));
Object obj = jsScope.get(name); Object obj = jsScope.get(name);
if (obj instanceof Function) { if (obj instanceof Function) {
Function jsFunction = (Function) obj; Function jsFunction = (Function) obj;