Make geo classes less linked and implement build without them #130
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package mahomaps.map; | ||
|
|
||
| interface ILocationAPI { | ||
|
|
||
| void setThread(GeoUpdateThread geoUpdateThread); | ||
|
|
||
| void setupListener(); | ||
|
|
||
| double[] getLastKnownCoordinates(); | ||
|
|
||
| void resetProvider() throws Exception; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| package mahomaps.map; | ||
|
|
||
| import javax.microedition.location.Coordinates; | ||
| import javax.microedition.location.Location; | ||
| import javax.microedition.location.LocationListener; | ||
| import javax.microedition.location.LocationProvider; | ||
|
|
||
| import mahomaps.MahoMapsApp; | ||
|
|
||
| // для безопасных вызовов | ||
| class LocationAPI implements ILocationAPI { | ||
|
|
||
| /** | ||
| * Geo thread, where this api will work. | ||
| */ | ||
| private GeoUpdateThread geoUpdateThread; | ||
| public LocationProvider locationProvider; | ||
|
|
||
| public LocationAPI() throws Exception { | ||
| locationProvider = LocationProvider.getInstance(null); | ||
| } | ||
|
|
||
| public void setThread(GeoUpdateThread geoUpdateThread) { | ||
| this.geoUpdateThread = geoUpdateThread; | ||
| } | ||
|
|
||
| public double[] getLastKnownCoordinates() { | ||
| Location location = LocationProvider.getLastKnownLocation(); | ||
| if (location == null || !location.isValid()) | ||
| return null; | ||
| Coordinates coordinates = location.getQualifiedCoordinates(); | ||
| if (coordinates == null) | ||
| return null; | ||
| return new double[] { coordinates.getLatitude(), coordinates.getLongitude() }; | ||
| } | ||
|
|
||
| public void setupListener() { | ||
| locationProvider.setLocationListener(new LocationAPIListener(), 5, 5, 5); | ||
| } | ||
|
|
||
| public void resetProvider() throws Exception { | ||
| System.out.println("resetProvider"); | ||
| Thread.sleep(5000); | ||
| LocationProvider old = locationProvider; | ||
| try { | ||
| locationProvider = LocationProvider.getInstance(null); | ||
| old.setLocationListener(null, 0, 0, 0); | ||
| setupListener(); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
|
|
||
| class LocationAPIListener implements LocationListener { | ||
|
|
||
| public void locationUpdated(LocationProvider provider, Location location) { | ||
| // определение кол-ва спутников | ||
| String nmea = location.getExtraInfo("application/X-jsr179-location-nmea"); | ||
| if (nmea != null) { | ||
| String[] sequence = GeoUpdateThread.split(nmea, '$'); | ||
| int s1 = -1; | ||
| int s2 = -1; | ||
| for (int i = sequence.length - 1; i >= 0; i--) { | ||
| String[] sentence = GeoUpdateThread.split(sequence[i], ','); | ||
| if (sentence[0].endsWith("GGA")) { | ||
| try { | ||
| s1 = Integer.parseInt(sentence[7]); | ||
| } catch (Exception e) { | ||
| s1 = -1; | ||
| } | ||
| s2 = Math.max(s2, s1); | ||
| } else if (sentence[0].endsWith("GSV")) { | ||
| try { | ||
| s2 = Math.max(s2, Integer.parseInt(sentence[3])); | ||
| } catch (Exception e) { | ||
| } | ||
| } | ||
| } | ||
| geoUpdateThread.sattelites = s1; | ||
| geoUpdateThread.totalSattelitesInView = s2; | ||
| } else { | ||
| geoUpdateThread.totalSattelitesInView = geoUpdateThread.sattelites = -1; | ||
| } | ||
| String s = ""; | ||
| int t = location.getLocationMethod(); | ||
| if ((t & Location.MTE_SATELLITE) == Location.MTE_SATELLITE) { | ||
| s = "GPS"; | ||
| } | ||
| if ((t & Location.MTE_TIMEDIFFERENCE) == Location.MTE_TIMEDIFFERENCE) { | ||
| s += "TD"; | ||
| } | ||
| if ((t & Location.MTE_TIMEOFARRIVAL) == Location.MTE_TIMEOFARRIVAL) { | ||
| s += "TOA"; | ||
| } | ||
| if ((t & Location.MTE_CELLID) == Location.MTE_CELLID) { | ||
| s += "CID"; | ||
| } | ||
| if ((t & Location.MTE_SHORTRANGE) == Location.MTE_SHORTRANGE) { | ||
| s += "SR"; | ||
| } | ||
| if ((t & Location.MTE_ANGLEOFARRIVAL) == Location.MTE_ANGLEOFARRIVAL) { | ||
| s += "AOA"; | ||
| } | ||
| if ((t & Location.MTA_ASSISTED) == Location.MTA_ASSISTED) { | ||
| s = "A" + s; | ||
| } else if ((t & Location.MTA_UNASSISTED) == Location.MTA_UNASSISTED) { | ||
| s = "U" + s; | ||
| } | ||
| if ((t & Location.MTY_TERMINALBASED) == Location.MTY_TERMINALBASED) { | ||
| s = "TB " + s; | ||
| } | ||
| if ((t & Location.MTY_NETWORKBASED) == Location.MTY_NETWORKBASED) { | ||
| s = "NB " + s; | ||
| } | ||
| geoUpdateThread.method = s.length() == 0 ? null : s; | ||
| if (location.isValid()) { | ||
| Coordinates coordinates = location.getQualifiedCoordinates(); | ||
| if (coordinates.getLatitude() != 0 && coordinates.getLongitude() != 0) { | ||
| if (!geoUpdateThread.vibrated) { | ||
| try { | ||
| MahoMapsApp.display.vibrate(100); | ||
| } catch (Exception e) { | ||
| } | ||
| geoUpdateThread.vibrated = true; | ||
| } | ||
| geoUpdateThread.positionPoint.lat = coordinates.getLatitude(); | ||
| geoUpdateThread.positionPoint.lon = coordinates.getLongitude(); | ||
| geoUpdateThread.positionPoint.color = Geopoint.COLOR_RED; | ||
| geoUpdateThread.state = GeoUpdateThread.STATE_OK; | ||
| geoUpdateThread.lastUpdateTime = System.currentTimeMillis(); | ||
| MahoMapsApp.GetCanvas().requestRepaint(); | ||
| } else { | ||
| geoUpdateThread.state = GeoUpdateThread.STATE_UNAVAILABLE; | ||
| } | ||
| } | ||
| geoUpdateThread.updateCount++; | ||
| } | ||
|
|
||
| public void providerStateChanged(LocationProvider provider, int newState) { | ||
| if (newState != LocationProvider.AVAILABLE) { | ||
| geoUpdateThread.state = GeoUpdateThread.STATE_OK_PENDING; | ||
| } | ||
| // на случай если изменился провайдер | ||
| if (newState == LocationProvider.OUT_OF_SERVICE) { | ||
| geoUpdateThread.restart(); | ||
| } | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
С этим не согласен
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Доправь тогда как надо. По идее, надо только имя запретить трогать.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Перечитал все, понял почему так надо