From d04ce4cccb0f7ce0b0be5e8e9e5c8e15c65329c8 Mon Sep 17 00:00:00 2001 From: Peter Yan Date: Thu, 15 Mar 2018 12:09:49 -0400 Subject: [PATCH 1/2] update to v0.15.0 --- helloworld/build.gradle | 2 +- singlevenue/build.gradle | 2 +- .../mappedin/examples/singlevenue/IAmHere.java | 15 +++------------ .../examples/singlevenue/MainActivity.java | 9 +++++---- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/helloworld/build.gradle b/helloworld/build.gradle index e19670a..1b5bafb 100644 --- a/helloworld/build.gradle +++ b/helloworld/build.gradle @@ -28,5 +28,5 @@ dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.mappedin.sdk:mappedin:0.14.0' + compile 'com.mappedin.sdk:mappedin:0.15.0' } diff --git a/singlevenue/build.gradle b/singlevenue/build.gradle index de5fdc0..e3cc2b2 100644 --- a/singlevenue/build.gradle +++ b/singlevenue/build.gradle @@ -29,6 +29,6 @@ dependencies { testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.4.0' compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'com.mappedin.sdk:mappedin:0.14.0' + compile 'com.mappedin.sdk:mappedin:0.15.0' compile 'com.koushikdutta.ion:ion:2.+' } diff --git a/singlevenue/src/main/java/com/mappedin/examples/singlevenue/IAmHere.java b/singlevenue/src/main/java/com/mappedin/examples/singlevenue/IAmHere.java index e3a996a..af0c597 100644 --- a/singlevenue/src/main/java/com/mappedin/examples/singlevenue/IAmHere.java +++ b/singlevenue/src/main/java/com/mappedin/examples/singlevenue/IAmHere.java @@ -37,20 +37,11 @@ public void setColor(int arrowColor, int cylinderColor, float over){ arrow.setColor(arrowColor, over); cylinder.setColor(cylinderColor, over); } - public Coordinate[] getFrame(){ + public Coordinate getFrame(){ if (map != null) { - Vector3 position = arrow.getPosition(); - float x = position.getX(); - float y = position.getY(); - float z = position.getZ(); - float offset = 20; - frame = new Coordinate[4]; - frame[0] = new Coordinate(new Vector3(x + offset, y + offset, z), map); - frame[1] = new Coordinate(new Vector3(x + offset, y - offset, z), map); - frame[2] = new Coordinate(new Vector3(x - offset, y + offset, z), map); - frame[3] = new Coordinate(new Vector3(x - offset, y - offset, z), map); + return new Coordinate(arrow.getPosition(), map); } - return frame; + return null; } public void addIAmHere(MapView mapView){ mapView.addElement(arrow); diff --git a/singlevenue/src/main/java/com/mappedin/examples/singlevenue/MainActivity.java b/singlevenue/src/main/java/com/mappedin/examples/singlevenue/MainActivity.java index 24912c1..23e2093 100644 --- a/singlevenue/src/main/java/com/mappedin/examples/singlevenue/MainActivity.java +++ b/singlevenue/src/main/java/com/mappedin/examples/singlevenue/MainActivity.java @@ -250,11 +250,12 @@ public void afterTextChanged(Editable editable) { public void onSensorChanged(SensorEvent sensorEvent) { if (autoRotation && iAmHere != null) { float degree = sensorEvent.values[0]; - Coordinate[] frame = iAmHere.getFrame(); - if (frame != null) { - mapView.orbit(iAmHere.frame, + Coordinate iAmHerePosition = iAmHere.getFrame(); + float padding = 20; + if (iAmHerePosition != null) { + mapView.orbit(iAmHerePosition, -initialDegree + (float) Math.toRadians(degree), - (float)Math.PI/5, 0); + (float)Math.PI/5, 0, padding); } if(iAmHere != null) { iAmHere.setRotation(initialDegree - (float) Math.toRadians(degree), 0); From 4fc8f3b356288b3eaf531ca9e81c294b59629a0c Mon Sep 17 00:00:00 2001 From: Peter Yan Date: Tue, 20 Mar 2018 16:17:29 -0400 Subject: [PATCH 2/2] update to SDK v 0.16.0 --- helloworld/build.gradle | 2 +- singlevenue/build.gradle | 2 +- .../com/mappedin/examples/singlevenue/MainActivity.java | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/helloworld/build.gradle b/helloworld/build.gradle index 1b5bafb..9176171 100644 --- a/helloworld/build.gradle +++ b/helloworld/build.gradle @@ -28,5 +28,5 @@ dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.mappedin.sdk:mappedin:0.15.0' + compile 'com.mappedin.sdk:mappedin:0.16.0' } diff --git a/singlevenue/build.gradle b/singlevenue/build.gradle index e3cc2b2..b5ce3a5 100644 --- a/singlevenue/build.gradle +++ b/singlevenue/build.gradle @@ -29,6 +29,6 @@ dependencies { testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.4.0' compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'com.mappedin.sdk:mappedin:0.15.0' + compile 'com.mappedin.sdk:mappedin:0.16.0' compile 'com.koushikdutta.ion:ion:2.+' } diff --git a/singlevenue/src/main/java/com/mappedin/examples/singlevenue/MainActivity.java b/singlevenue/src/main/java/com/mappedin/examples/singlevenue/MainActivity.java index 23e2093..ad6f4c2 100644 --- a/singlevenue/src/main/java/com/mappedin/examples/singlevenue/MainActivity.java +++ b/singlevenue/src/main/java/com/mappedin/examples/singlevenue/MainActivity.java @@ -102,7 +102,6 @@ public class MainActivity extends ActivityGroup implements MapViewDelegate, Sens private boolean accessibleDirections = false; private boolean walking = false; private boolean autoRotation = false; - private float initialDegree = 0; static final int PICK_CONTACT_REQUEST = 1; // The request code @Override @@ -254,11 +253,11 @@ public void onSensorChanged(SensorEvent sensorEvent) { float padding = 20; if (iAmHerePosition != null) { mapView.orbit(iAmHerePosition, - -initialDegree + (float) Math.toRadians(degree), + (float) Math.toRadians(degree), (float)Math.PI/5, 0, padding); } if(iAmHere != null) { - iAmHere.setRotation(initialDegree - (float) Math.toRadians(degree), 0); + iAmHere.setRotation((float) Math.toRadians(degree), 0); } } } @@ -672,7 +671,7 @@ else if (y1 == y2){ angel = (float)Math.PI + angel; } } - iAmHere.setRotation(-angel, 0); + iAmHere.setRotation(angel, 0); } try { float distance = currInstruction.coordinate.metersFrom(coordinate);