From 398d90ff57f3f90d40d87b122784987c5d54f85c Mon Sep 17 00:00:00 2001 From: Marvin Arnold Date: Mon, 24 Aug 2015 16:38:45 -0500 Subject: [PATCH] Synced with newest version of API --- .../api/app/MainActivity.java | 14 ++- clientandroid/stingray-api-client.iml | 95 ------------------- .../clientandroid/models/StingrayReading.java | 17 +++- 3 files changed, 19 insertions(+), 107 deletions(-) delete mode 100644 clientandroid/stingray-api-client.iml diff --git a/app/src/main/java/org/stingraymappingproject/api/app/MainActivity.java b/app/src/main/java/org/stingraymappingproject/api/app/MainActivity.java index 8607f0c..b3a9cfc 100644 --- a/app/src/main/java/org/stingraymappingproject/api/app/MainActivity.java +++ b/app/src/main/java/org/stingraymappingproject/api/app/MainActivity.java @@ -119,8 +119,8 @@ public void onErrorResponse(VolleyError error) { Log.d(TAG, "onErrorResponse"); } }; - RecurringRequest recurringFactoidsRequest = new RecurringRequest(FREQUENCY_VALUE, FREQUENCY_UNIT, nearbyRequester); - mStingrayStingrayAPIClientService.addRecurringRequest(recurringFactoidsRequest); + RecurringRequest recurringRequest = new RecurringRequest(FREQUENCY_VALUE, FREQUENCY_UNIT, nearbyRequester); + mStingrayStingrayAPIClientService.addRecurringRequest(recurringRequest); } public void scheduleFactoidsRequester() { @@ -139,8 +139,8 @@ public void onErrorResponse(VolleyError error) { Log.d(TAG, "onErrorResponse"); } }; - RecurringRequest recurringFactoidsRequest = new RecurringRequest(FREQUENCY_VALUE, FREQUENCY_UNIT, factoidsRequester); - mStingrayStingrayAPIClientService.addRecurringRequest(recurringFactoidsRequest); + RecurringRequest recurringRequest = new RecurringRequest(FREQUENCY_VALUE, FREQUENCY_UNIT, factoidsRequester); + mStingrayStingrayAPIClientService.addRecurringRequest(recurringRequest); } public void schedulePostStingrayReadingRequester() { @@ -157,14 +157,12 @@ protected String getRequestParams() { // TODO Auto-generated catch block e.printStackTrace(); } - return datum.toString(); } @Override public void onResponse(StingrayReading response) { Log.d(TAG, "onResponse"); - Log.d(TAG, "location: " + response.getLocation()); } @Override @@ -173,7 +171,7 @@ public void onErrorResponse(VolleyError error) { } }; - RecurringRequest postStingrayReadingRequest = new RecurringRequest(FREQUENCY_VALUE, FREQUENCY_UNIT, postStingrayReadingRequester); - mStingrayStingrayAPIClientService.addRecurringRequest(postStingrayReadingRequest); + RecurringRequest recurringRequest = new RecurringRequest(FREQUENCY_VALUE, FREQUENCY_UNIT, postStingrayReadingRequester); + mStingrayStingrayAPIClientService.addRecurringRequest(recurringRequest); } } diff --git a/clientandroid/stingray-api-client.iml b/clientandroid/stingray-api-client.iml deleted file mode 100644 index 0ea7b2c..0000000 --- a/clientandroid/stingray-api-client.iml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/stingray-api-client/src/main/java/org/stingraymappingproject/api/clientandroid/models/StingrayReading.java b/stingray-api-client/src/main/java/org/stingraymappingproject/api/clientandroid/models/StingrayReading.java index 2046b43..1043429 100644 --- a/stingray-api-client/src/main/java/org/stingraymappingproject/api/clientandroid/models/StingrayReading.java +++ b/stingray-api-client/src/main/java/org/stingraymappingproject/api/clientandroid/models/StingrayReading.java @@ -12,7 +12,7 @@ public String getId() { return id; } - public String getObserved_at() { + public String getObservedAt() { return observed_at; } @@ -20,15 +20,15 @@ public String getLocation() { return location; } - public String getThreat_level() { + public String getThreatLevel() { return threat_level; } - public String getUpdated_at() { + public String getUpdatedAt() { return updated_at; } - public String getCreated_at() { + public String getCreatedAt() { return created_at; } @@ -42,6 +42,15 @@ public String getVersion() { String updated_at; String created_at; String version; + + public String getLatitude() { + return latitude; + } + + public String getLongitude() { + return longitude; + } + String latitude; String longitude; }