Page MenuHomeGitPull.it
Files F11275069

D142.1772602755.diff
No OneTemporary
Actions

Size
19 KB
Referenced Files
None
Subscribers
None

D142.1772602755.diff
View Options

diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/NearbyArrivalsDownloader.java b/app/src/main/java/it/reyboz/bustorino/fragments/NearbyArrivalsDownloader.java
new file mode 100644
--- /dev/null
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/NearbyArrivalsDownloader.java
@@ -0,0 +1,122 @@
+package it.reyboz.bustorino.fragments;
+
+import android.content.Context;
+import android.util.Log;
+import com.android.volley.NetworkError;
+import com.android.volley.ParseError;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import it.reyboz.bustorino.backend.NetworkVolleyManager;
+import it.reyboz.bustorino.backend.Palina;
+import it.reyboz.bustorino.backend.Route;
+import it.reyboz.bustorino.backend.Stop;
+import it.reyboz.bustorino.backend.mato.MapiArrivalRequest;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+class NearbyArrivalsDownloader implements Response.Listener<Palina>, Response.ErrorListener {
+ final static String DEBUG_TAG = "BusTO-NearbyArrivDowns";
+ //final Map<String,List<Route>> routesToAdd = new HashMap<>();
+ final ArrayList<Palina> nonEmptyPalinas = new ArrayList<>();
+ final HashMap<String, Boolean> completedRequests = new HashMap<>();
+ final static String REQUEST_TAG = "NearbyArrivals";
+ final NetworkVolleyManager volleyManager;
+ int activeRequestCount = 0, reqErrorCount = 0, reqSuccessCount = 0;
+
+ final ArrivalsListener listener;
+
+ NearbyArrivalsDownloader(Context context, ArrivalsListener arrivalsListener) {
+ volleyManager = NetworkVolleyManager.getInstance(context);
+
+ listener = arrivalsListener;
+ //flatProgressBar.setMax(numreq);
+ }
+
+ public int requestArrivalsForStops(List<Stop> stops){
+ int MAX_ARRIVAL_STOPS = 35;
+ Date currentDate = new Date();
+ int timeRange = 3600;
+ int departures = 10;
+ int numreq = 0;
+ activeRequestCount = 0;
+ reqErrorCount = 0;
+ reqSuccessCount = 0;
+ nonEmptyPalinas.clear();
+ completedRequests.clear();
+
+ for (Stop s : stops.subList(0, Math.min(stops.size(), MAX_ARRIVAL_STOPS))) {
+
+ final MapiArrivalRequest req = new MapiArrivalRequest(s.ID, currentDate, timeRange, departures, this, this);
+ req.setTag(REQUEST_TAG);
+ volleyManager.addToRequestQueue(req);
+ activeRequestCount++;
+ numreq++;
+ completedRequests.put(s.ID, false);
+ }
+ listener.setProgress(reqErrorCount+reqSuccessCount, activeRequestCount);
+ return numreq;
+ }
+
+ private int totalRequests(){
+ return activeRequestCount + reqSuccessCount + reqErrorCount;
+ }
+
+
+ @Override
+ public void onErrorResponse(VolleyError error) {
+ if (error instanceof ParseError) {
+ //TODO
+ Log.w(DEBUG_TAG, "Parsing error for stop request");
+ } else if (error instanceof NetworkError) {
+ String s;
+ if (error.networkResponse != null)
+ s = new String(error.networkResponse.data);
+ else s = "";
+ Log.w(DEBUG_TAG, "Network error: " + s);
+ } else {
+ Log.w(DEBUG_TAG, "Volley Error: " + error.getMessage());
+ }
+ if (error.networkResponse != null) {
+ Log.w(DEBUG_TAG, "Error status code: " + error.networkResponse.statusCode);
+ }
+ //counters
+ activeRequestCount--;
+ reqErrorCount++;
+ //flatProgressBar.setProgress(reqErrorCount + reqSuccessCount);
+ listener.setProgress(reqErrorCount + reqSuccessCount, activeRequestCount);
+ }
+
+ @Override
+ public void onResponse(Palina palinaResult) {
+ //counter for requests
+ activeRequestCount--;
+ reqSuccessCount++;
+ listener.setProgress(reqErrorCount + reqSuccessCount, activeRequestCount);
+
+ //add the palina to the successful one
+ if(palinaResult!=null) {
+ final List<Route> routes = palinaResult.queryAllRoutes();
+ if (routes != null && !routes.isEmpty()) {
+ nonEmptyPalinas.add(palinaResult);
+ listener.showCompletedArrivals(nonEmptyPalinas);
+ }
+ }
+ }
+
+ void cancelAllRequests() {
+ volleyManager.getRequestQueue().cancelAll(REQUEST_TAG);
+ //flatProgressBar.setVisibility(View.GONE);
+ listener.onAllRequestsCancelled();
+ }
+
+ public interface ArrivalsListener{
+ void setProgress(int completedRequests, int pendingRequests);
+
+ void onAllRequestsCancelled();
+
+ void showCompletedArrivals(ArrayList<Palina> completedPalinas);
+ }
+}
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
--- a/app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
@@ -41,12 +41,10 @@
import android.widget.ProgressBar;
import android.widget.TextView;
-import com.android.volley.*;
import it.reyboz.bustorino.BuildConfig;
import it.reyboz.bustorino.R;
import it.reyboz.bustorino.adapters.ArrivalsStopAdapter;
import it.reyboz.bustorino.backend.*;
-import it.reyboz.bustorino.backend.mato.MapiArrivalRequest;
import it.reyboz.bustorino.data.DatabaseUpdate;
import it.reyboz.bustorino.middleware.AppLocationManager;
import it.reyboz.bustorino.adapters.SquareStopAdapter;
@@ -111,12 +109,38 @@
private AppLocationManager locManager;
//These are useful for the case of nearby arrivals
- private ArrivalsManager arrivalsManager = null;
+ private NearbyArrivalsDownloader arrivalsManager = null;
private ArrivalsStopAdapter arrivalsStopAdapter = null;
private boolean dbUpdateRunning = false;
private ArrayList<Stop> currentNearbyStops = new ArrayList<>();
+ private NearbyArrivalsDownloader nearbyArrivalsDownloader;
+
+ private final NearbyArrivalsDownloader.ArrivalsListener arrivalsListener = new NearbyArrivalsDownloader.ArrivalsListener() {
+ @Override
+ public void setProgress(int completedRequests, int pendingRequests) {
+ if(flatProgressBar!=null) {
+ if (pendingRequests == 0) {
+ flatProgressBar.setIndeterminate(true);
+ flatProgressBar.setVisibility(View.GONE);
+ } else {
+ flatProgressBar.setIndeterminate(false);
+ flatProgressBar.setProgress(completedRequests);
+ }
+ }
+ }
+
+ @Override
+ public void onAllRequestsCancelled() {
+ if(flatProgressBar!=null) flatProgressBar.setVisibility(View.GONE);
+ }
+
+ @Override
+ public void showCompletedArrivals(ArrayList<Palina> completedPalinas) {
+ showArrivalsInRecycler(completedPalinas);
+ }
+ };
//ViewModel
private NearbyStopsViewModel viewModel;
@@ -155,6 +179,8 @@
globalSharedPref.registerOnSharedPreferenceChangeListener(preferenceChangeListener);
}
+ nearbyArrivalsDownloader = new NearbyArrivalsDownloader(getContext().getApplicationContext(), arrivalsListener);
+
}
@@ -265,17 +291,19 @@
//ignored
//try another location provider
}
+ //fix view if we were showing the stops or the arrivals
+ prepareForFragmentType();
switch(fragment_type){
case STOPS:
if(dataAdapter!=null){
- gridRecyclerView.setAdapter(dataAdapter);
+ //gridRecyclerView.setAdapter(dataAdapter);
circlingProgressBar.setVisibility(View.GONE);
loadingTextView.setVisibility(View.GONE);
}
break;
case ARRIVALS:
if(arrivalsStopAdapter!=null){
- gridRecyclerView.setAdapter(arrivalsStopAdapter);
+ //gridRecyclerView.setAdapter(arrivalsStopAdapter);
circlingProgressBar.setVisibility(View.GONE);
loadingTextView.setVisibility(View.GONE);
}
@@ -307,6 +335,7 @@
}
if(BuildConfig.DEBUG)
Log.d(DEBUG_TAG, "Max distance for stops: "+MAX_DISTANCE+ ", Min number of stops: "+MIN_NUM_STOPS);
+
}
@@ -346,10 +375,14 @@
showStopsInRecycler(stops);
break;
case ARRIVALS:
- arrivalsManager = new ArrivalsManager(stops);
- flatProgressBar.setVisibility(View.VISIBLE);
+ if(getContext()==null) break; //don't do anything if we're not attached
+ if(arrivalsManager==null)
+ arrivalsManager = new NearbyArrivalsDownloader(getContext().getApplicationContext(), arrivalsListener);
+ arrivalsManager.requestArrivalsForStops(stops);
+ /*flatProgressBar.setVisibility(View.VISIBLE);
flatProgressBar.setProgress(0);
flatProgressBar.setIndeterminate(false);
+ */
//for the moment, be satisfied with only one location
//AppLocationManager.getInstance(getContext()).removeLocationRequestFor(fragmentLocationListener);
break;
@@ -369,8 +402,27 @@
* Call when you need to switch the type of fragment
*/
private void switchFragmentType(){
- if(fragment_type==FragType.ARRIVALS){
- setFragmentType(FragType.STOPS);
+ switch (fragment_type){
+ case ARRIVALS:
+ setFragmentType(FragType.STOPS);
+ break;
+ case STOPS:
+ setFragmentType(FragType.ARRIVALS);
+ break;
+ default:
+ }
+ prepareForFragmentType();
+ fragmentLocationListener.lastUpdateTime = -1;
+ //locManager.removeLocationRequestFor(fragmentLocationListener);
+ //locManager.addLocationRequestFor(fragmentLocationListener);
+ showStopsInViews(currentNearbyStops, lastPosition);
+ }
+
+ /**
+ * Prepare the views for the set fragment type
+ */
+ private void prepareForFragmentType(){
+ if(fragment_type==FragType.STOPS){
switchButton.setText(getString(R.string.show_arrivals));
titleTextView.setText(getString(R.string.nearby_stops_message));
if(arrivalsManager!=null)
@@ -378,17 +430,12 @@
if(dataAdapter!=null)
gridRecyclerView.setAdapter(dataAdapter);
- } else if (fragment_type==FragType.STOPS){
- setFragmentType(FragType.ARRIVALS);
+ } else if (fragment_type==FragType.ARRIVALS){
titleTextView.setText(getString(R.string.nearby_arrivals_message));
switchButton.setText(getString(R.string.show_stops));
if(arrivalsStopAdapter!=null)
gridRecyclerView.setAdapter(arrivalsStopAdapter);
}
- fragmentLocationListener.lastUpdateTime = -1;
- //locManager.removeLocationRequestFor(fragmentLocationListener);
- //locManager.addLocationRequestFor(fragmentLocationListener);
- showStopsInViews(currentNearbyStops, lastPosition);
}
//useful methods
@@ -424,7 +471,7 @@
//int maxNum = Math.min(MAX_STOPS, stopList.size());
for(Palina p: palinas){
//if there are no routes available, skip stop
- if(p.queryAllRoutes().size() == 0) continue;
+ if(p.queryAllRoutes().isEmpty()) continue;
for(Route r: p.queryAllRoutes()){
//if there are no routes, should not do anything
if (r.passaggi != null && !r.passaggi.isEmpty())
@@ -469,86 +516,6 @@
messageTextView.setVisibility(View.GONE);
}
- class ArrivalsManager implements Response.Listener<Palina>, Response.ErrorListener{
- final HashMap<String,Palina> palinasDone = new HashMap<>();
- //final Map<String,List<Route>> routesToAdd = new HashMap<>();
- final static String REQUEST_TAG = "NearbyArrivals";
- final NetworkVolleyManager volleyManager;
- int activeRequestCount = 0,reqErrorCount = 0, reqSuccessCount=0;
-
- ArrivalsManager(List<Stop> stops){
- volleyManager = NetworkVolleyManager.getInstance(getContext());
-
- int MAX_ARRIVAL_STOPS = 35;
- Date currentDate = new Date();
- int timeRange = 3600;
- int departures = 10;
- int numreq = 0;
- for(Stop s: stops.subList(0,Math.min(stops.size(), MAX_ARRIVAL_STOPS))){
-
- final MapiArrivalRequest req = new MapiArrivalRequest(s.ID, currentDate, timeRange, departures, this, this);
- req.setTag(REQUEST_TAG);
- volleyManager.addToRequestQueue(req);
- activeRequestCount++;
- numreq++;
- }
- flatProgressBar.setMax(numreq);
- }
-
-
-
- @Override
- public void onErrorResponse(VolleyError error) {
- if(error instanceof ParseError){
- //TODO
- Log.w(DEBUG_TAG,"Parsing error for stop request");
- } else if (error instanceof NetworkError){
- String s;
- if(error.networkResponse!=null)
- s = new String(error.networkResponse.data);
- else s="";
- Log.w(DEBUG_TAG,"Network error: "+s);
- }else {
- Log.w(DEBUG_TAG,"Volley Error: "+error.getMessage());
- }
- if(error.networkResponse!=null){
- Log.w(DEBUG_TAG, "Error status code: "+error.networkResponse.statusCode);
- }
- //counters
- activeRequestCount--;
- reqErrorCount++;
- flatProgressBar.setProgress(reqErrorCount+reqSuccessCount);
- }
-
- @Override
- public void onResponse(Palina result) {
- //counter for requests
- activeRequestCount--;
- reqSuccessCount++;
- //final Palina palinaInMap = palinasDone.get(result.ID);
- //palina cannot be null here
- //sorry for the brutal crash when it happens
- //if(palinaInMap == null) throw new IllegalStateException("Cannot get the palina from the map");
- //add the palina to the successful one
- //TODO: Avoid redoing everything every time a new Result arrives
- palinasDone.put(result.ID, result);
- final ArrayList<Palina> outList = new ArrayList<>();
- for(Palina p: palinasDone.values()){
- final List<Route> routes = p.queryAllRoutes();
- if(routes!=null && routes.size()>0) outList.add(p);
- }
- showArrivalsInRecycler(outList);
- flatProgressBar.setProgress(reqErrorCount+reqSuccessCount);
- if(activeRequestCount==0) {
- flatProgressBar.setIndeterminate(true);
- flatProgressBar.setVisibility(View.GONE);
- }
- }
- void cancelAllRequests(){
- volleyManager.getRequestQueue().cancelAll(REQUEST_TAG);
- flatProgressBar.setVisibility(View.GONE);
- }
- }
/**
* Local locationListener, to use for the GPS
*/
@@ -569,7 +536,7 @@
} else if(viewModel==null){
return;
}
- if(location.getAccuracy()<100 && !dbUpdateRunning) {
+ if(location.getAccuracy()<200 && !dbUpdateRunning) {
if(viewModel.getDistanceMtLiveData().getValue()==null){
//never run request
distance = 40;
diff --git a/app/src/main/res/layout/fragment_nearby_stops.xml b/app/src/main/res/layout/fragment_nearby_stops.xml
--- a/app/src/main/res/layout/fragment_nearby_stops.xml
+++ b/app/src/main/res/layout/fragment_nearby_stops.xml
@@ -28,29 +28,31 @@
app:backgroundTint="@color/blue_500"
android:textColor="@android:color/white"
/>
+ <ProgressBar
+ style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
+ android:layout_width="6dp"
+ android:layout_height="wrap_content"
+ android:id="@+id/horizontalProgressBar"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentStart="true"
+ android:layout_below="@id/titleTextView"
+ android:indeterminate="true"
+ android:visibility="gone"
+ android:layout_marginStart="5dp"
+ android:layout_marginEnd="5dp"
+ />
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
- android:layout_height="match_parent" android:layout_below="@id/titleTextView"
+ android:layout_height="match_parent" android:layout_below="@id/horizontalProgressBar"
android:id="@+id/stopGridRecyclerView"
android:clickable="true"
android:focusable="true" android:visibility="gone"
android:clipChildren="false" android:clipToPadding="true" android:horizontalSpacing="10dp"
- android:layout_above="@id/horizontalProgressBar"
- android:verticalSpacing="10dp"/>
- <ProgressBar
- style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
- android:layout_width="3dp"
- android:layout_height="wrap_content"
- android:id="@+id/horizontalProgressBar"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
- android:indeterminate="true"
- android:visibility="gone"
- />
+ android:verticalSpacing="10dp"/>
+
<ProgressBar
style="?android:attr/progressBarStyle"
diff --git a/app/src/main/res/layout/stop_card.xml b/app/src/main/res/layout/stop_card.xml
--- a/app/src/main/res/layout/stop_card.xml
+++ b/app/src/main/res/layout/stop_card.xml
@@ -33,22 +33,22 @@
<TextView
android:id="@+id/stop_numberText"
android:layout_width="wrap_content"
- android:layout_height="20dp"
+ android:layout_height="wrap_content"
android:text="stopNumber"
- android:gravity="center_vertical"
- android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+ android:textSize="16sp"
android:layout_below="@id/stop_nameText"
- android:textIsSelectable="true" android:layout_marginTop="8dp"
- android:textColor="@color/orange_500" android:layout_marginLeft="12dp"
- android:layout_marginStart="12dp" android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
+ android:textIsSelectable="true" android:layout_marginTop="6dp"
+ android:textColor="@color/orange_700"
+ android:layout_marginStart="12dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"/>
<TextView
- android:text="TextView"
+ android:text="200m"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="6dp"
- android:layout_marginLeft="10dp"
+ android:layout_marginEnd="6dp"
+ android:layout_marginStart="10dp"
android:minWidth="50dp"
+ android:textSize="16sp"
android:id="@+id/stop_distanceTextView" android:layout_toEndOf="@+id/stop_numberText"
android:layout_toRightOf="@id/stop_numberText"
android:layout_alignTop="@+id/stop_numberText"

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 4, 06:39 (19 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1710785
Default Alt Text
D142.1772602755.diff (19 KB)

Event Timeline

Public contents are in Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) or GNU Free Documentation License (at your option) unless otherwise noted. · Contact / Register