From a2da39c4e27d6a4927596ad11927d7eb42547c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= Date: Mon, 3 Oct 2016 22:26:53 +0200 Subject: [PATCH] Debugging. --- .../urbanexplorer/adapters/PlacesAdapter.java | 2 - .../dto/GooglePlacesResponse.java | 12 -- .../worker/GooglePlacesWorker.java | 37 +++--- googleutils/build.gradle | 1 + .../googleutils/GooglePlacesService.java | 21 ++- .../callback/GooglePlacesPhotosCallback.java | 14 -- .../constants/GooglePlacesConstants.java | 1 + .../dto/GooglePlacePhotoRefResult.java | 59 --------- .../googleutils/utils/PlacesUtils.java | 122 ++++-------------- 9 files changed, 58 insertions(+), 211 deletions(-) delete mode 100644 googleutils/src/main/java/pl/tpolgrabia/googleutils/callback/GooglePlacesPhotosCallback.java delete mode 100644 googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhotoRefResult.java diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/PlacesAdapter.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/PlacesAdapter.java index c42f5ab..dfc385e 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/PlacesAdapter.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/PlacesAdapter.java @@ -1,7 +1,6 @@ package pl.tpolgrabia.urbanexplorer.adapters; import android.content.Context; -import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -10,7 +9,6 @@ import android.widget.ImageView; import android.widget.TextView; import com.nostra13.universalimageloader.core.ImageLoader; import pl.tpolgrabia.googleutils.dto.GooglePlacePhoto; -import pl.tpolgrabia.googleutils.dto.GooglePlacePhotoRefResult; import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; import pl.tpolgrabia.urbanexplorer.AppConstants; import pl.tpolgrabia.urbanexplorer.MainActivity; diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesResponse.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesResponse.java index 5fb3aee..d367a94 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesResponse.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesResponse.java @@ -1,17 +1,14 @@ package pl.tpolgrabia.urbanexplorer.dto; -import pl.tpolgrabia.googleutils.dto.GooglePlacePhotoRefResult; import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; import java.util.List; -import java.util.Map; /** * Created by tpolgrabia on 03.10.16. */ public class GooglePlacesResponse { private List places; - private Map> photos; public List getPlaces() { return places; @@ -21,19 +18,10 @@ public class GooglePlacesResponse { this.places = places; } - public Map> getPhotos() { - return photos; - } - - public void setPhotos(Map> photos) { - this.photos = photos; - } - @Override public String toString() { return "GooglePlacesResponse{" + "places=" + places + - ", photos=" + photos + '}'; } } diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java index 31e0157..bd2a26c 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java @@ -5,6 +5,7 @@ import android.location.Location; import android.os.AsyncTask; import android.view.View; import android.widget.ListView; +import org.apache.http.HttpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pl.tpolgrabia.googleutils.callback.PlacesCallback; @@ -17,6 +18,7 @@ import pl.tpolgrabia.urbanexplorer.adapters.PlacesAdapter; import pl.tpolgrabia.urbanexplorer.dto.GooglePlacesRequest; import pl.tpolgrabia.urbanexplorer.dto.GooglePlacesResponse; import pl.tpolgrabia.urbanexplorer.fragments.PlacesFragment; +import retrofit2.Response; import java.io.IOException; import java.util.ArrayList; @@ -51,27 +53,24 @@ public class GooglePlacesWorker extends AsyncTask googlePlaceResults) { - GooglePlacesResponse response = new GooglePlacesResponse(); - response.setPlaces(googlePlaceResults); - result.add(response); - sem.release(); - } - }); + Response> placesResponse = null; try { - sem.acquire(); - } catch (InterruptedException e) { - lg.error("Interrupted"); + placesResponse = placesUtils.fetchNearbyPlaces( + location.getLatitude(), + location.getLongitude(), + param.getSearchRadius(), + param.getSearchItemType(), + param.getPageToken()); + + if (placesResponse.code() == HttpStatus.SC_OK) { + GooglePlacesResponse response = new GooglePlacesResponse(); + response.setPlaces(placesResponse.body()); + result.add(response); + } + + } catch (IOException e) { + lg.error("I/O error", e); } } diff --git a/googleutils/build.gradle b/googleutils/build.gradle index dd9f1b8..0f2bfa6 100644 --- a/googleutils/build.gradle +++ b/googleutils/build.gradle @@ -34,4 +34,5 @@ dependencies { compile project(path: ':urbanexplorerutils') compile 'com.squareup.retrofit2:retrofit:2.1.0' compile 'com.squareup.retrofit2:converter-gson:2.1.0' + compile 'com.squareup.okhttp3:logging-interceptor:3.2.0' } diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/GooglePlacesService.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/GooglePlacesService.java index 824b505..89cc715 100644 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/GooglePlacesService.java +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/GooglePlacesService.java @@ -1,10 +1,8 @@ package pl.tpolgrabia.googleutils; -import pl.tpolgrabia.googleutils.dto.GooglePlacePhotoRefResult; import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; import retrofit2.Call; import retrofit2.http.GET; -import retrofit2.http.Path; import retrofit2.http.Query; import java.util.List; @@ -13,9 +11,18 @@ import java.util.List; * Created by tpolgrabia on 02.10.16. */ public interface GooglePlacesService { - @GET("photo") - Call> fetchPhotosByRef( - @Query("max_width") Long maxWidth, - @Query("photoreference") String photoRef, - @Query("key") String apiKey); + @GET("nearbysearch/json") + Call> fetchNearbyPlacesFirst( + @Query("key") String apiKey, + @Query("location") String location, + @Query("radius") Double radius, + @Query("type") String type); + + @GET("nearbysearch/json") + Call> fetchNearbyPlacesNext( + @Query("key") String apiKey, + @Query("location") String location, + @Query("radius") Double radius, + @Query("type") String type, + @Query("pagetoken") String pageToken); } diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/callback/GooglePlacesPhotosCallback.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/callback/GooglePlacesPhotosCallback.java deleted file mode 100644 index 2e9b008..0000000 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/callback/GooglePlacesPhotosCallback.java +++ /dev/null @@ -1,14 +0,0 @@ -package pl.tpolgrabia.googleutils.callback; - -import pl.tpolgrabia.googleutils.dto.GooglePlacePhotoRefResult; -import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; - -import java.util.List; - -/** - * Created by tpolgrabia on 02.10.16. - */ -public interface GooglePlacesPhotosCallback { - void onResponse(int code, String message, List body); - void onFailure(Throwable t); -} diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java index 81c9251..1ddf96a 100644 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java @@ -6,4 +6,5 @@ package pl.tpolgrabia.googleutils.constants; public class GooglePlacesConstants { public static final String GOOGLE_PLACES_BASEURL = "https://maps.googleapis.com/maps/api/place/"; public static final Long PHOTO_MAX_WIDTH = 512L; + public static final String GOOGLE_MAPS_PLACES_API_BASEURL = "https://maps.googleapis.com/maps/api/place/"; } diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhotoRefResult.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhotoRefResult.java deleted file mode 100644 index a07aef8..0000000 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhotoRefResult.java +++ /dev/null @@ -1,59 +0,0 @@ -package pl.tpolgrabia.googleutils.dto; - -import com.google.gson.annotations.SerializedName; - -import java.util.List; - -/** - * Created by tpolgrabia on 02.10.16. - */ -public class GooglePlacePhotoRefResult { - @SerializedName("htmlAttributions") - private List htmlAttributions; - private Long width; - private Long height; - @SerializedName("photoReference") - private String photoReference; - - public List getHtmlAttributions() { - return htmlAttributions; - } - - public void setHtmlAttributions(List htmlAttributions) { - this.htmlAttributions = htmlAttributions; - } - - public Long getWidth() { - return width; - } - - public void setWidth(Long width) { - this.width = width; - } - - public Long getHeight() { - return height; - } - - public void setHeight(Long height) { - this.height = height; - } - - public String getPhotoReference() { - return photoReference; - } - - public void setPhotoReference(String photoReference) { - this.photoReference = photoReference; - } - - @Override - public String toString() { - return "GooglePlacePhotoRefResult{" + - "htmlAttributions=" + htmlAttributions + - ", width=" + width + - ", height=" + height + - ", photoReference='" + photoReference + '\'' + - '}'; - } -} diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java index c786230..c7722c7 100644 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java @@ -2,28 +2,19 @@ package pl.tpolgrabia.googleutils.utils; import android.content.Context; import com.androidquery.AQuery; -import com.androidquery.callback.AjaxCallback; -import com.androidquery.callback.AjaxStatus; -import org.apache.http.HttpStatus; -import org.json.JSONObject; +import okhttp3.OkHttpClient; +import okhttp3.logging.HttpLoggingInterceptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pl.tpolgrabia.googleutils.GooglePlacesService; -import pl.tpolgrabia.googleutils.callback.GooglePlacesPhotosCallback; -import pl.tpolgrabia.googleutils.callback.PlacesCallback; import pl.tpolgrabia.googleutils.constants.GooglePlacesConstants; -import pl.tpolgrabia.googleutils.converter.GooglePlaceConverter; -import pl.tpolgrabia.googleutils.dto.GooglePlacePhoto; -import pl.tpolgrabia.googleutils.dto.GooglePlacePhotoRefResult; import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; -import retrofit2.Call; -import retrofit2.Callback; import retrofit2.Response; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; import java.io.IOException; -import java.util.*; +import java.util.List; /** * Created by tpolgrabia on 27.09.16. @@ -42,12 +33,11 @@ public class PlacesUtils { this.aq = new AQuery(ctx); } - public void fetchNearbyPlaces(Double latitude, - Double longitude, - Double searchRadius, - String searchItemType, - String pageToken, - final PlacesCallback clbk) { + public Response> fetchNearbyPlaces(Double latitude, + Double longitude, + Double searchRadius, + String searchItemType, + String pageToken) throws IOException { if (latitude == null) { throw new IllegalArgumentException("Latitude cannot be null"); @@ -61,91 +51,27 @@ public class PlacesUtils { throw new IllegalArgumentException("Search radius cannot be null"); } - String queryUrl = "https://maps.googleapis.com/maps/api/place/nearbysearch/json?" + - "key=" + apiKey - + "&location=" + latitude + "," + longitude - + "&radius=" + searchRadius - + "&type=" + searchItemType; + HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); + // set your desired log level + logging.setLevel(HttpLoggingInterceptor.Level.HEADERS); + OkHttpClient.Builder httpClient = new OkHttpClient.Builder(); - if (pageToken != null) { - queryUrl += "&pagetoken=" + pageToken; - } - - aq.ajax(queryUrl, - JSONObject.class, new AjaxCallback() { - @Override - public void callback(String url, JSONObject object, AjaxStatus status) { - lg.trace("Url: {}, object: {}, status: {}", url, object, status); - - int statusCode = status.getCode(); - String statusMessage = status.getMessage(); - String statusError = status.getError(); - - if (statusCode != 200) { - lg.error("Invalid status code: {}, message: {}, error: {}", - statusCode, - statusMessage, - statusError); - clbk.callback((long)statusCode, statusMessage, null); - return; - } - - String googleStatus = object.optString("status"); - if (!"OK".equals(googleStatus)) { - lg.error("Invalid google status: {}", googleStatus); - clbk.callback((long)statusCode, googleStatus, null); - return; - } - - try { - List googleResults = GooglePlaceConverter.convertToPlaceResults(object.getJSONArray("results")); - clbk.callback((long) statusCode, googleStatus, googleResults); - } catch (Throwable t) { - lg.error("General error", t); - clbk.callback(-1L, "General error", null); - } - - } - }); - } - - public List fetchPhotosByRefSync(String photosRef) throws IOException { - Response> results = fetchPhotosByRefInvocation(photosRef).execute(); - return results.code() == HttpStatus.SC_OK ? results.body() : null; - } - - public void fetchPhotosByRefAsync(String photosRef, final GooglePlacesPhotosCallback clbk) { - fetchPhotosByRefInvocation(photosRef).enqueue(new Callback>() { - @Override - public void onResponse(Call> call, Response> response) { - clbk.onResponse(response.code(), response.message(), response.body()); - } - - @Override - public void onFailure(Call> call, Throwable t) { - clbk.onFailure(t); - } - }); - } - - private Call> fetchPhotosByRefInvocation(String photosRef) { Retrofit retrofit = new Retrofit.Builder() - .baseUrl(GooglePlacesConstants.GOOGLE_PLACES_BASEURL) + .baseUrl(GooglePlacesConstants.GOOGLE_MAPS_PLACES_API_BASEURL) .addConverterFactory(GsonConverterFactory.create()) + .client(httpClient.build()) .build(); - GooglePlacesService service = retrofit.create(GooglePlacesService.class); - return service.fetchPhotosByRef( - GooglePlacesConstants.PHOTO_MAX_WIDTH, - photosRef, - apiKey); - } - public Map> fetchPhotosSync(Set photoRefs) throws IOException { - HashMap> result = new HashMap>(); - for (String photoRef : photoRefs) { - result.put(photoRef, fetchPhotosByRefSync(photoRef)); - } + return pageToken != null ? + retrofit.create(GooglePlacesService.class).fetchNearbyPlacesNext(apiKey, + latitude + "," + longitude, + searchRadius, + searchItemType, + pageToken).execute() + : retrofit.create(GooglePlacesService.class).fetchNearbyPlacesFirst(apiKey, + latitude + "," + longitude, + searchRadius, + searchItemType).execute(); - return result; } }