--- android/TrainInfo/src/dk/thoerup/traininfo/TrainInfoList.java 2009/08/09 12:12:33 243 +++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java 2009/09/29 18:24:23 354 @@ -1,55 +1,76 @@ package dk.thoerup.traininfo; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + 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.location.Address; +import android.location.Geocoder; +import android.location.Location; import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.util.Log; import android.view.View; import android.widget.ListView; +import dk.thoerup.traininfo.provider.ProviderFactory; +import dk.thoerup.traininfo.provider.StationProvider; +import dk.thoerup.traininfo.util.MessageBox; + +public class StationList extends ListActivity { + public static final int GOTLOCATION = 1001; + public static final int GOTSTATIONLIST = 1002; + public static final int NOPROVIDER = 1003; + public static final int LOCATIONFIXTIMEOUT = 1004; -public class TrainInfoList extends ListActivity { - public static final int GOTLOCATION = 1; - public static final int GOTSTATIONLIST = 2; - public static final int NOPROVIDER = 3; - public static final int FIXTIMEOUT = 4; - public static final int LOOKUPSTATIONFAILED = 5; - public static final int DLG_PROGRESS = 1; + public static final int DLG_PROGRESS = 1001; /** Called when the activity is first created. */ + String dialogMessage = ""; ProgressDialog dialog; - StationLocator locator = null; - LocatorTask locatorTask = new LocatorTask(); + LocationLookup locator = null; + LocatorTask locatorTask; + + boolean isRunning = false; + List stations = new ArrayList(); + + StationProvider stationProvider = ProviderFactory.getStationProvider(); + - boolean isRunning; - StationListAdapter adapter = null; + @SuppressWarnings("unchecked") @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.main); - //StationLocator.injectMockLocation(this); adapter = new StationListAdapter(this); setListAdapter(adapter); - locator = new StationLocator(this, stationsFetched); - - startLookup(); + locator = new LocationLookup(this, stationsFetched); + if (savedInstanceState == null) { + startLookup(); + } else { + stations = (ArrayList) savedInstanceState.getSerializable("stations"); + adapter.setStations(stations); + } } @Override public void onSaveInstanceState(Bundle outState) { - if (dialog.isShowing()) + if (dialog != null && dialog.isShowing()) dialog.dismiss(); + outState.putSerializable("stations", (ArrayList) stations); } @@ -61,7 +82,7 @@ ProgressDialog dlg = new ProgressDialog(this); dlg.setMessage("Wait for location fix"); dlg.setCancelable(false); - return dlg; + return dlg; default: return super.onCreateDialog(id); } @@ -76,6 +97,10 @@ switch (id) { case DLG_PROGRESS: this.dialog = (ProgressDialog) dialog; + if (!dialogMessage.equals("")) { + this.dialog.setMessage(dialogMessage); + dialogMessage = ""; + } break; } } @@ -85,90 +110,172 @@ showDialog(DLG_PROGRESS); locator.locateStations(); - stationsFetched.sendEmptyMessageDelayed(FIXTIMEOUT, 20000); + stationsFetched.sendEmptyMessageDelayed(LOCATIONFIXTIMEOUT, 20000); } Handler stationsFetched = new Handler() { @Override public void handleMessage(Message msg) { - + switch (msg.what) { case GOTLOCATION: - dialog.setMessage("Finding nearby stations"); - locatorTask.execute(); - break; - case GOTSTATIONLIST: - dialog.dismiss(); - adapter.setStations( locator.getStations() ); + dismissDialog(DLG_PROGRESS); + + startLocatorTask(); + break; + case NOPROVIDER: - dialog.dismiss(); - showMessageBox("No location provider enabled. Plase enable gps."); + dismissDialog(DLG_PROGRESS); + MessageBox.showMessage(StationList.this,"No location provider enabled. Plase enable gps."); break; - case FIXTIMEOUT: - dialog.dismiss(); + case LOCATIONFIXTIMEOUT: if (isRunning) { - locator.abortLocationListener(); - showMessageBox("GPS fix timed out"); + locator.stopSearch(); + if (locator.hasLocation()) { + stationsFetched.sendEmptyMessage( GOTLOCATION ); + } else { + dismissDialog(DLG_PROGRESS); + + AlertDialog.Builder builder = new AlertDialog.Builder(StationList.this); + builder.setMessage("GPS fix timed out"); + builder.setCancelable(true); + builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + startLookup(); + + } + }); + builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + } + }); + builder.show(); + + } } break; - case LOOKUPSTATIONFAILED: - dialog.dismiss(); - showMessageBox("Error on finding nearby stations"); - break; } - isRunning = false; } }; - + void startLocatorTask() + { + dialogMessage = "Finding nearby stations"; + showDialog(DLG_PROGRESS); + + locatorTask = new LocatorTask(); + locatorTask.execute(); + } @Override protected void onListItemClick(ListView l, View v, int position, long id) { super.onListItemClick(l, v, position, id); - - StationBean station = adapter.getStation(position); - + + StationBean station = stations.get(position); + + double latitude = station.getLatitude(); + double longitude = station.getLongitude(); + + Intent intent = new Intent(this, DepartureList.class); intent.putExtra("name", station.getName()); - intent.putExtra("address", station.getAddress()); intent.putExtra("distance", station.getDistance()); - intent.putExtra("latitude", station.getLatitude()); - intent.putExtra("longitude", station.getLongitude()); + intent.putExtra("latitude", latitude); + intent.putExtra("longitude", longitude); + intent.putExtra("stationid", station.getId()); + intent.putExtra("address", station.getAddress()); startActivity(intent); } - public void showMessageBox(String message) { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage(message) - .setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.dismiss(); + String lookupAddress(double latitude, double longitude) { + + Geocoder coder = new Geocoder(this, new Locale("da")); + StringBuilder sb = new StringBuilder(); + Log.i("lookupaddr", "" + latitude + "/" + longitude); + try { + List
addressList = coder.getFromLocation(latitude, longitude, 1); + Address addr = addressList.get(0); + + + int max = addr.getMaxAddressLineIndex(); + for (int i=0; i0) + sb.append(", "); + + sb.append(addr.getAddressLine(i)); } - }) - .show(); - + + + } catch (Exception e) { + Log.e("DepartureList", "geocoder failed", e); + } + + return sb.toString(); } class LocatorTask extends AsyncTask { + boolean success; @Override protected void onPreExecute() { + super.onPreExecute(); } @Override protected Void doInBackground(Void... params) { - locator.findNearestStations(); + Location loc = locator.getLocation(); + success = stationProvider.lookupStations(loc); + + + List stations = stationProvider.getStations(); + for (StationBean station : stations) { + String addr = lookupAddress(station.getLatitude(), station.getLongitude()); + station.setAddress(addr); + } + return null; } @Override protected void onPostExecute(Void result) { super.onPostExecute(result); + dialog.dismiss(); + + if (success) { + if (stationProvider.getStations().size() == 0) + MessageBox.showMessage(StationList.this, "No stations found!"); // this should not be possible !?! + stations = stationProvider.getStations(); + adapter.setStations( stations ); + + } else { //communication or parse errors + AlertDialog.Builder builder = new AlertDialog.Builder(StationList.this); + builder.setMessage("Error on finding nearby stations"); + builder.setCancelable(true); + builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + + stationsFetched.post( new Runnable() { + @Override + public void run() { + startLocatorTask(); + } + }); + } + }); + builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + } + }); + builder.show(); + } } } } \ No newline at end of file