Skip to content

Thurs james #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JamesDansie merged 2 commits into from
Nov 21, 2019
Merged

Thurs james #33

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f274b9
players that join after the fact will now show on the creators map
JamesDansie Nov 21, 2019
78804ca
Merge branch 'Dev' of https://github.com/JavaAwesome/JavaTag into thu…
JamesDansie Nov 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 59 additions & 10 deletions app/src/main/java/com/javaawesome/tag/MapsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,18 +182,67 @@ public void onResponse(@Nonnull final Response<OnUpdatePlayerSubscription.Data>
@Override
public void handleMessage (Message inputMessage) {
// Iterate over the players on the map
for(Player player : players) {
if(response.data().onUpdatePlayer().id().equals(player.getId())) {
// if true (we have a match) update players lat/long
List<LatLng> bananasList = new LinkedList<>();
bananasList.add(new LatLng(response.data().onUpdatePlayer().lat(),
response.data().onUpdatePlayer().lon()));
player.setLocations(bananasList); // sets location for the player
//Might have been causing the starting point to move
// player.getCircle().setCenter(player.getLastLocation());
// player.getMarker().setPosition(player.getLastLocation());
//TODO: if session matches; then if player in players update location, else make a new player and add their marker.
OnUpdatePlayerSubscription.OnUpdatePlayer updatePlayer = response.data().onUpdatePlayer();

Log.i(TAG, "updated user is " + updatePlayer.toString() + " session id is " + sessionId);
//checking if the updated player is in this session
if(updatePlayer.session().id().equals(sessionId)){
boolean contains = false;

//checking if the updated player is in the current player list
for(Player player : players){

// if we have a match update players lat/long
if(updatePlayer.id().equals(player.getId())){
List<LatLng> bananasList = new LinkedList<>();
bananasList.add(new LatLng(response.data().onUpdatePlayer().lat(),
response.data().onUpdatePlayer().lon()));
player.setLocations(bananasList); // sets location for the player
contains = true;
}
}

//if the player is in the session, but not in the player list, then make a new player and add them to the players list and add a marker
if(contains == false){
Marker marker = mMap.addMarker(new MarkerOptions()
.position(player.getLastLocation())
.title(player.getUsername()));
Circle circle = mMap.addCircle(new CircleOptions()
.center(player.getLastLocation())
.radius(tagDistance)
.fillColor(Color.TRANSPARENT)
.strokeWidth(3));

marker.setIcon(BitmapDescriptorFactory.defaultMarker(notItHue));
circle.setStrokeColor(notItColor);

Player newPlayer = new Player();
newPlayer.setId(updatePlayer.id());
newPlayer.setIt(false);
newPlayer.setMarker(marker);
newPlayer.setCircle(circle);
newPlayer.setUsername(updatePlayer.username());
List<LatLng> potatoes = new LinkedList<>();
potatoes.add(new LatLng(updatePlayer.lat(), updatePlayer.lon()));
newPlayer.setLocations(potatoes);

//adding player to the list of players in the game
players.add(newPlayer);
}
}
// for(Player player : players) {
// if(response.data().onUpdatePlayer().id().equals(player.getId())) {
// // if true (we have a match) update players lat/long
// List<LatLng> bananasList = new LinkedList<>();
// bananasList.add(new LatLng(response.data().onUpdatePlayer().lat(),
// response.data().onUpdatePlayer().lon()));
// player.setLocations(bananasList); // sets location for the player
// //Might have been causing the starting point to move
//// player.getCircle().setCenter(player.getLastLocation());
//// player.getMarker().setPosition(player.getLastLocation());
// }
// }
}
};
h.obtainMessage().sendToTarget();
Expand Down