--- android/TrainInfo/src/dk/thoerup/traininfo/TimetableList.java 2009/10/03 10:55:43 391 +++ android/TrainInfo/src/dk/thoerup/traininfo/TimetableList.java 2011/04/04 15:28:12 1257 @@ -1,34 +1,46 @@ package dk.thoerup.traininfo; -import java.util.ArrayList; -import java.util.List; +import static dk.thoerup.traininfo.R.string.generic_cancel; +import static dk.thoerup.traininfo.R.string.generic_retry; +import static dk.thoerup.traininfo.R.string.timetablelist_fetchdata; +import static dk.thoerup.traininfo.R.string.timetablelist_fetcherror; +import static dk.thoerup.traininfo.R.string.timetablelist_nodata; + +import java.util.regex.Pattern; -import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; +import android.app.ListActivity; import android.app.ProgressDialog; import android.content.DialogInterface; import android.content.Intent; 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.StationBean.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; -public class TimetableList extends Activity { +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); @@ -36,50 +48,88 @@ provider = ProviderFactory.getTimetableProvider(); - adapter = new TimetableListAdapter(this); - - ListView lv = (ListView) findViewById(R.id.List); - lv.setAdapter(adapter); + adapter = new TimetableListAdapter(this); + setListAdapter(adapter); + 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.Note)).setText(departure.getNote()); - ((TextView)findViewById(R.id.Updated)).setText(departure.getLastUpdateString()); + + ((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) ); + + // tilføj: + // * afgår fra + // * eksterne forhold + // * teknisk fejl på et signal + + + + ((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); } -/* case DLG_DETAILS: - DepartureBean currentDeparture = departures.get(selectedItemId); - ((TextView)dialog.findViewById(R.id.Time)).setText(currentDeparture.getTime()); - ((TextView)dialog.findViewById(R.id.Train)).setText(currentDeparture.getTrainNumber()); - ((TextView)dialog.findViewById(R.id.Destination)).setText( currentDeparture.getDestination()); - ((TextView)dialog.findViewById(R.id.Origin)).setText(currentDeparture.getOrigin()); - ((TextView)dialog.findViewById(R.id.Location)).setText(currentDeparture.getLocation()); - ((TextView)dialog.findViewById(R.id.Updated)).setText(currentDeparture.getLastUpdateString()); - ((TextView)dialog.findViewById(R.id.Status)).setText(currentDeparture.getStatus()); - ((TextView)dialog.findViewById(R.id.Note)).setText(currentDeparture.getNote()); - detailsDialog = dialog; - break; - - */ @Override protected void onPrepareDialog(int id, Dialog dialog) { @@ -96,8 +146,8 @@ protected Dialog onCreateDialog(int id) { switch (id) { case DLG_PROGRESS: - ProgressDialog dlg = new ProgressDialog(this); - dlg.setMessage("Fetch timetable data"); + ProgressDialog dlg = new ProgressDialog(this); + dlg.setMessage( getString(timetablelist_fetchdata) ); dlg.setCancelable(true); return dlg; default: @@ -108,12 +158,30 @@ void startTimetableFetcher() { showDialog(DLG_PROGRESS); fetcher = new TimetableFetcher(); - fetcher.execute(departure.getTrainNumber()); + 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) { @@ -121,37 +189,49 @@ dismissDialog(DLG_PROGRESS); - if (success) { + if (timetables != null) { + commFailCounter = 0; + TimetableList.this.getListView().invalidateViews(); adapter.setTimetable(timetables); - if (timetables.size() == 0) { - MessageBox.showMessage(TimetableList.this, "No timetable found"); + 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("Error finding departures"); + builder.setMessage(getString(timetablelist_fetcherror)); builder.setCancelable(true); - builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.dismiss(); - startTimetableFetcher(); - - } - }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + 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(); } - }); - builder.show(); + }); + + try { + builder.show(); + } catch (android.view.WindowManager.BadTokenException e) { + Log.i("TimetableList", "BadTokenException"); // this can happen if the user switched away from this activity, while doInBackground was running + } + } } @Override protected Void doInBackground(String... arg0) { - String trainID = arg0[0]; - success = provider.lookupTimetable(trainID); - timetables = provider.getTimetable(trainID); + String type = arg0[0]; + String trainID = arg0[1]; + timetables = provider.lookupTimetable(type, trainID); return null; }