--- android/TrainInfo/src/dk/thoerup/traininfo/TimetableList.java 2010/06/11 17:39:11 839 +++ android/TrainInfo/src/dk/thoerup/traininfo/TimetableList.java 2011/05/02 11:54:17 1408 @@ -7,8 +7,7 @@ import static dk.thoerup.traininfo.R.string.timetablelist_fetcherror; import static dk.thoerup.traininfo.R.string.timetablelist_nodata; -import java.util.ArrayList; -import java.util.List; +import java.util.regex.Pattern; import android.app.AlertDialog; import android.app.Dialog; @@ -19,7 +18,13 @@ import android.os.AsyncTask; import android.os.Bundle; import android.util.Log; +import android.view.View; +import android.widget.ListView; import android.widget.TextView; +import dk.thoerup.android.traininfo.common.DepartureEntry; +import dk.thoerup.android.traininfo.common.StationEntry; +import dk.thoerup.android.traininfo.common.TimetableBean; +import dk.thoerup.android.traininfo.common.TimetableEntry; import dk.thoerup.traininfo.provider.ProviderFactory; import dk.thoerup.traininfo.provider.TimetableProvider; import dk.thoerup.traininfo.util.MessageBox; @@ -27,14 +32,15 @@ public class TimetableList extends ListActivity { private static final int DLG_PROGRESS = 8000; - DepartureBean departure; + DepartureEntry departure; TimetableListAdapter adapter; TimetableFetcher fetcher; - List timetables; + TimetableBean timetables; + int commFailCounter = 0; TimetableProvider provider; - @SuppressWarnings("unchecked") + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -48,29 +54,78 @@ Intent launchedBy = getIntent(); - departure = (DepartureBean) launchedBy.getSerializableExtra("departure"); + departure = (DepartureEntry) launchedBy.getSerializableExtra("departure"); ((TextView)findViewById(R.id.Train)).setText(departure.getTrainNumber()); - ((TextView)findViewById(R.id.Status)).setText(departure.getStatus()); - ((TextView)findViewById(R.id.Location)).setText(departure.getLocation()); - ((TextView)findViewById(R.id.Note)).setText(departure.getNote()); - ((TextView)findViewById(R.id.Updated)).setText(departure.getLastUpdateString(this)); - + + ((TextView)findViewById(R.id.Location)).setText(departure.getLocation()); + ((TextView)findViewById(R.id.Updated)).setText( getLastUpdateString( departure.getUpdated() )); + + String status = departure.getStatus() != null ? departure.getStatus() : ""; + if ( Pattern.matches("[0-9]+.+min", status) ) { + status += " " + this.getString(R.string.departurebean_delayed); + } + String note = departure.getNote() != null ? departure.getNote() : ""; + note = note.replace("Aflyst", this.getString(R.string.timetablelist_cancelled) ); + note = note.replace("Kører kun til", this.getString(R.string.timetablelist_goesonlyto) ); + note = note.replace("Afgår fra", this.getString(R.string.timetablelist_startsat) ); + note = note.replace("Erstattet af", this.getString(R.string.timetablelist_replacedby) ); + note = note.replace("Eksterne forhold", this.getString(R.string.timetablelist_externalconditions) ); + note = note.replace("Teknisk fejl på et signal", this.getString(R.string.timetablelist_technicalerroronsignal) ); + note = note.replace("Materielforhold", this.getString(R.string.timetablelist_equipmentrelated) ); + note = note.replace("Passagerforhold", this.getString(R.string.timetablelist_passengerrelated) ); + note = note.replace("Forventet rettidig afgang", this.getString(R.string.timetablelist_expectedtimelydeparture) ); + + + + ((TextView)findViewById(R.id.Status)).setText(status); + ((TextView)findViewById(R.id.Note)).setText(note); + + + ProviderFactory.purgeOldEntries(); //cleanup before fetching more data if (savedInstanceState == null) { startTimetableFetcher(); } else { - timetables = (List) savedInstanceState.getSerializable("timetables"); + timetables = (TimetableBean) savedInstanceState.getSerializable("timetables"); adapter.setTimetable(timetables); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + + if (fetcher != null) { + fetcher.cancel(true); + } + } - - @Override + @Override + protected void onListItemClick(ListView l, View v, int position, long id) { + super.onListItemClick(l, v, position, id); + + TimetableEntry tt = timetables.entries.get(position); + + StationEntry station = new StationEntry(); + station.setName( tt.getStation() ); + station.setId( tt.getStationId() ); + station.setIsRegional(true); + + + Intent intent = new Intent(this, DepartureList.class); + intent.putExtra("stationbean", station); + startActivity(intent); + + } + + + + @Override public void onSaveInstanceState(Bundle outState) { dismissDialog(DLG_PROGRESS); - outState.putSerializable("timetables", (ArrayList) timetables); + outState.putSerializable("timetables", (TimetableBean) timetables); } @@ -104,35 +159,67 @@ fetcher.execute(departure.getType(), departure.getTrainNumber()); } + + public String getLastUpdateString(int lastUpdate) { + String minutes = this.getString(R.string.departurebean_minutes); + String unknown = this.getString(R.string.departurebean_unknown); + switch (lastUpdate) { + case 1: + return "<3 " + minutes; + case 2: + return "3-10 " + minutes; + case 3: + return ">3 " + minutes; + case 4: + return unknown; + default: + return ""; + } + } + + class TimetableFetcher extends AsyncTask { - boolean success; @Override protected void onPostExecute(Void result) { super.onPostExecute(result); dismissDialog(DLG_PROGRESS); - - if (success) { + //TODO: differentiate between a communication error and a downed bane.dk site + if (timetables != null && timetables.errorCode == null) { + commFailCounter = 0; + TimetableList.this.getListView().invalidateViews(); adapter.setTimetable(timetables); - if (timetables.size() == 0) { - MessageBox.showMessage(TimetableList.this, getString(timetablelist_nodata)); + if (timetables.entries.size() == 0) { + MessageBox.showMessage(TimetableList.this, getString(timetablelist_nodata), true); } } else { // communication or parse error + commFailCounter++; AlertDialog.Builder builder = new AlertDialog.Builder(TimetableList.this); - builder.setMessage(getString(timetablelist_fetcherror)); + + + if (timetables != null && timetables.errorCode != null ) { //got an error xml back + commFailCounter = 10; + builder.setMessage( getString(R.string.no_backend) ); + } else { + builder.setMessage(getString(timetablelist_fetcherror)); + } + builder.setCancelable(true); - builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.dismiss(); - startTimetableFetcher(); - - } - }); + if (commFailCounter < 3) { + builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + startTimetableFetcher(); + + } + }); + } builder.setNegativeButton(getString(generic_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); + TimetableList.this.finish(); } }); @@ -150,8 +237,7 @@ protected Void doInBackground(String... arg0) { String type = arg0[0]; String trainID = arg0[1]; - success = provider.lookupTimetable(type, trainID); - timetables = provider.getTimetable(type, trainID); + timetables = provider.lookupTimetable(type, trainID); return null; }