animated markers with some issues
This commit is contained in:
parent
bd775d5d0d
commit
f60bac1c3c
2
.settings/org.eclipse.buildship.core.prefs
Normal file
2
.settings/org.eclipse.buildship.core.prefs
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
connection.project.dir=
|
||||||
|
eclipse.preferences.version=1
|
6
app/.classpath
Normal file
6
app/.classpath
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<classpath>
|
||||||
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
|
||||||
|
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
|
||||||
|
<classpathentry kind="output" path="bin/default"/>
|
||||||
|
</classpath>
|
2
app/.settings/org.eclipse.buildship.core.prefs
Normal file
2
app/.settings/org.eclipse.buildship.core.prefs
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
connection.project.dir=..
|
||||||
|
eclipse.preferences.version=1
|
@ -6,11 +6,12 @@ import android.animation.ValueAnimator;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.NonNull;
|
import android.os.Handler;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import com.mapbox.mapboxsdk.Mapbox;
|
import com.mapbox.mapboxsdk.Mapbox;
|
||||||
import com.mapbox.mapboxsdk.annotations.Marker;
|
import com.mapbox.mapboxsdk.annotations.Marker;
|
||||||
|
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
|
||||||
import com.mapbox.mapboxsdk.annotations.MarkerViewOptions;
|
import com.mapbox.mapboxsdk.annotations.MarkerViewOptions;
|
||||||
import com.mapbox.mapboxsdk.geometry.LatLng;
|
import com.mapbox.mapboxsdk.geometry.LatLng;
|
||||||
import com.mapbox.mapboxsdk.maps.MapView;
|
import com.mapbox.mapboxsdk.maps.MapView;
|
||||||
@ -21,39 +22,94 @@ import com.uam.wmi.findmytutor.model.Coordinate;
|
|||||||
import com.uam.wmi.findmytutor.network.RetrofitClientInstance;
|
import com.uam.wmi.findmytutor.network.RetrofitClientInstance;
|
||||||
import com.uam.wmi.findmytutor.service.CoordinateService;
|
import com.uam.wmi.findmytutor.service.CoordinateService;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||||
|
import io.reactivex.annotations.NonNull;
|
||||||
import io.reactivex.disposables.CompositeDisposable;
|
import io.reactivex.disposables.CompositeDisposable;
|
||||||
import io.reactivex.observers.DisposableSingleObserver;
|
import io.reactivex.observers.DisposableSingleObserver;
|
||||||
import io.reactivex.schedulers.Schedulers;
|
import io.reactivex.schedulers.Schedulers;
|
||||||
|
|
||||||
|
|
||||||
public class NotificationsActivity extends BaseActivity {
|
public class NotificationsActivity extends BaseActivity implements
|
||||||
|
OnMapReadyCallback {
|
||||||
|
|
||||||
|
private int mInterval = 10000;
|
||||||
|
private Handler mHandler;
|
||||||
|
|
||||||
private MapView mapView;
|
private MapView mapView;
|
||||||
|
private MapboxMap mapboxMap;
|
||||||
|
private Map<String,Coordinate> coordsMap = new HashMap<>();
|
||||||
|
|
||||||
private CoordinateService coordinateService;
|
private CoordinateService coordinateService;
|
||||||
private CompositeDisposable disposable = new CompositeDisposable();
|
private CompositeDisposable disposable = new CompositeDisposable();
|
||||||
private List<Coordinate> coordinatesList = new ArrayList<>();
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
// This contains the MapView in XML and needs to be called after the access token is configured.
|
||||||
|
setContentView(R.layout.activity_notifications);
|
||||||
|
|
||||||
|
|
||||||
|
// mapInit(savedInstanceState);
|
||||||
|
|
||||||
|
// Mapbox access token is configured here. This needs to be called either in your application
|
||||||
|
// object or in the same activity which contains the mapview.
|
||||||
|
Mapbox.getInstance(this, getString(R.string.access_token));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
mapView = findViewById(R.id.mapView2);
|
||||||
|
mapView.onCreate(savedInstanceState);
|
||||||
|
mapView.getMapAsync(this);
|
||||||
|
|
||||||
mapInit(savedInstanceState);
|
|
||||||
|
|
||||||
// coordinateService = ApiClient.getClient(getApplicationContext())
|
|
||||||
// .create(CoordinateService.class);
|
|
||||||
final SharedPreferences sharedPref = getSharedPreferences("fmtPrefs", Context.MODE_PRIVATE);
|
final SharedPreferences sharedPref = getSharedPreferences("fmtPrefs", Context.MODE_PRIVATE);
|
||||||
final String authToken = sharedPref.getString("authToken",null);
|
final String authToken = sharedPref.getString("authToken",null);
|
||||||
|
|
||||||
coordinateService = RetrofitClientInstance.createService(CoordinateService.class,"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1laWQiOiI2YjhmNzFiMS00NDM2LTQxZGQtYjg3MC1mNzZlNjdkNDM4NDMiLCJzdWIiOiJzdHJpbmciLCJqdGkiOiJiZGRjZTAwMC0xN2U4LTQwNDUtYWZiNS1kY2RkOWNhNDFiNmQiLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJUdXRvciIsImV4cCI6MTU0MTcxNzk2MywiaXNzIjoiaHR0cDovL2ZpbmRteXR1dG9yLmNvbSIsImF1ZCI6Imh0dHA6Ly9maW5kbXl0dXRvci5jb20ifQ.JJVNeMAwwla6DJk6X8qZUgPFKJp-Epx55W9V_fIwpgg");
|
coordinateService = RetrofitClientInstance.createService(CoordinateService.class,"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1laWQiOiI2YjhmNzFiMS00NDM2LTQxZGQtYjg3MC1mNzZlNjdkNDM4NDMiLCJzdWIiOiJzdHJpbmciLCJqdGkiOiJiZGRjZTAwMC0xN2U4LTQwNDUtYWZiNS1kY2RkOWNhNDFiNmQiLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJUdXRvciIsImV4cCI6MTU0MTcxNzk2MywiaXNzIjoiaHR0cDovL2ZpbmRteXR1dG9yLmNvbSIsImF1ZCI6Imh0dHA6Ly9maW5kbXl0dXRvci5jb20ifQ.JJVNeMAwwla6DJk6X8qZUgPFKJp-Epx55W9V_fIwpgg");
|
||||||
|
|
||||||
fetchTopCoords();
|
mHandler = new Handler();
|
||||||
|
|
||||||
|
// fetchTopCoords();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMapReady(MapboxMap map) {
|
||||||
|
mapboxMap = map;
|
||||||
|
final Marker marker = mapboxMap.addMarker(new MarkerViewOptions()
|
||||||
|
.position(new LatLng(52.466782,16.927549)));
|
||||||
|
mStatusChecker.run();
|
||||||
|
|
||||||
|
mapboxMap.addOnMapClickListener(new MapboxMap.OnMapClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onMapClick(@NonNull LatLng point) {
|
||||||
|
|
||||||
|
// When the user clicks on the map, we want to animate the marker to that
|
||||||
|
// location.
|
||||||
|
ValueAnimator markerAnimator = ObjectAnimator.ofObject(marker, "position",
|
||||||
|
new LatLngEvaluator(), marker.getPosition(), point);
|
||||||
|
markerAnimator.setDuration(2000);
|
||||||
|
markerAnimator.start();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Runnable mStatusChecker = new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
try{
|
||||||
|
fetchTopCoords();
|
||||||
|
} finally {
|
||||||
|
mHandler.postDelayed(mStatusChecker, mInterval);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
/*
|
||||||
private void mapInit(Bundle savedInstanceState) {
|
private void mapInit(Bundle savedInstanceState) {
|
||||||
// Mapbox access token is configured here. This needs to be called either in your application
|
// Mapbox access token is configured here. This needs to be called either in your application
|
||||||
// object or in the same activity which contains the mapview.
|
// object or in the same activity which contains the mapview.
|
||||||
@ -68,9 +124,9 @@ public class NotificationsActivity extends BaseActivity {
|
|||||||
public void onMapReady(MapboxMap mapboxMap) {
|
public void onMapReady(MapboxMap mapboxMap) {
|
||||||
|
|
||||||
final Marker marker = mapboxMap.addMarker(new MarkerViewOptions()
|
final Marker marker = mapboxMap.addMarker(new MarkerViewOptions()
|
||||||
.position(new LatLng(64.900932, -18.167040)));
|
.position(new LatLng(52.466782,16.927549)));
|
||||||
|
|
||||||
mapboxMap.setOnMapClickListener(new MapboxMap.OnMapClickListener() {
|
mapboxMap.addOnMapClickListener(new MapboxMap.OnMapClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onMapClick(@NonNull LatLng point) {
|
public void onMapClick(@NonNull LatLng point) {
|
||||||
|
|
||||||
@ -86,10 +142,11 @@ public class NotificationsActivity extends BaseActivity {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}*/
|
||||||
|
|
||||||
private void fetchTopCoords() {
|
private void fetchTopCoords() {
|
||||||
disposable.add(
|
disposable.add(
|
||||||
|
// coordinateService.getTopCoordinates()
|
||||||
coordinateService.getTopCoordinates()
|
coordinateService.getTopCoordinates()
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
@ -97,10 +154,33 @@ public class NotificationsActivity extends BaseActivity {
|
|||||||
@Override
|
@Override
|
||||||
public void onSuccess(List<Coordinate> coordsList) {
|
public void onSuccess(List<Coordinate> coordsList) {
|
||||||
|
|
||||||
Log.d("mapTag", "co?");
|
|
||||||
for (Coordinate element:
|
for (Coordinate element : coordsList) {
|
||||||
coordsList) {
|
String id = element.getUserId();
|
||||||
Log.d("mapTag", element.getUserId());
|
Coordinate cord = coordsMap.get(id);
|
||||||
|
if (cord != null) {
|
||||||
|
if (!cord.getLongitude().equals(element.getLongitude())
|
||||||
|
) {
|
||||||
|
Log.d("mapper", " cos sie zienilo ");
|
||||||
|
Marker marker = mapboxMap.addMarker(new MarkerViewOptions()
|
||||||
|
.position(new LatLng(cord.getLatitude(),cord.getLongitude())));
|
||||||
|
|
||||||
|
ValueAnimator markerAnimator = ObjectAnimator.ofObject(marker, "position",
|
||||||
|
new LatLngEvaluator(), marker.getPosition(), new LatLng(element.getLatitude(),element.getLongitude()));
|
||||||
|
markerAnimator.setDuration(2000);
|
||||||
|
markerAnimator.start();
|
||||||
|
|
||||||
|
coordsMap.put(id,element);
|
||||||
|
} else if (!cord.getTimeStamp().equals(element.getTimeStamp())){
|
||||||
|
Log.d("mapper", "update");
|
||||||
|
Log.d("mapper", " "+cord.getTimeStamp());
|
||||||
|
Log.d("mapper", " "+element.getTimeStamp());
|
||||||
|
coordsMap.put(id,element);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
coordsMap.put(id,element);
|
||||||
|
mapboxMap.addMarker(new MarkerOptions().position(new LatLng(element.getLatitude(), element.getLongitude())));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -113,6 +193,7 @@ public class NotificationsActivity extends BaseActivity {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onStart() {
|
protected void onStart() {
|
||||||
super.onStart();
|
super.onStart();
|
||||||
@ -147,6 +228,7 @@ public class NotificationsActivity extends BaseActivity {
|
|||||||
protected void onDestroy() {
|
protected void onDestroy() {
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
mapView.onDestroy();
|
mapView.onDestroy();
|
||||||
|
mHandler.removeCallbacks(mStatusChecker);
|
||||||
disposable.dispose();
|
disposable.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ public class StartupActivity extends AppCompatActivity {
|
|||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
|
||||||
if (PrefUtils.isLoggedIn(getApplicationContext())){
|
if (PrefUtils.isLoggedIn(getApplicationContext())){
|
||||||
Intent startupIntent = new Intent(this, MapActivity.class);
|
Intent startupIntent = new Intent(this, NotificationsActivity.class);
|
||||||
startupIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
startupIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||||
startActivity(startupIntent);
|
startActivity(startupIntent);
|
||||||
finish();
|
finish();
|
||||||
@ -30,7 +30,7 @@ public class StartupActivity extends AppCompatActivity {
|
|||||||
@Override
|
@Override
|
||||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
if (requestCode == AUTHENTICATION_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
|
if (requestCode == AUTHENTICATION_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
|
||||||
Intent startupIntent = new Intent(this, MapActivity.class);
|
Intent startupIntent = new Intent(this, NotificationsActivity.class);
|
||||||
startupIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
startupIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||||
startActivity(startupIntent);
|
startActivity(startupIntent);
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,7 @@ buildscript {
|
|||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:3.2.0'
|
classpath 'com.android.tools.build:gradle:3.2.1'
|
||||||
|
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
Loading…
Reference in New Issue
Block a user