Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix sensor listener

Browse source
This commit is contained in:
Victor Shcherb 2013-03-30 20:42:04 +01:00
parent d5e9047415
commit e561035e4f
5 changed files with 51 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java
View file

@ -7,6 +7,7 @@ import java.util.TimeZone;
import net.osmand.Location;
import net.osmand.PlatformUtil;
import net.osmand.StateChangedListener;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings.CommonPreference;
import net.osmand.plus.OsmandSettings.DayNightMode;
@ -51,73 +52,64 @@ public class DayNightHelper implements SensorEventListener {
}
private DayNightHelper listener;
private float lux = SensorManager.LIGHT_SUNLIGHT;
private long lastAutoCall = 0;
private Boolean lastAutoValue = null;
private long lastTime = 0;
private boolean lastNightMode = false;
private StateChangedListener<Boolean> sensorStateListener;
/**
* @return null if could not be determined (in case of error)
* @return true if day is supposed to be
*/
public Boolean getDayNightRenderer() {
public boolean isNightMode() {
DayNightMode dayNightMode = pref.get();
if (dayNightMode.isDay()) {
return Boolean.TRUE;
return false;
} else if (dayNightMode.isNight()) {
return Boolean.FALSE;
return true;
} else // We are in auto mode!
if (dayNightMode.isAuto()) {
long currentTime = System.currentTimeMillis();
// allow recalculation each 60 seconds
if (currentTime - lastAutoCall > 60000) {
lastAutoCall = System.currentTimeMillis();
if (currentTime - lastTime > 60000) {
lastTime = System.currentTimeMillis();
try {
SunriseSunset daynightSwitch = getSunriseSunset();
SunriseSunset daynightSwitch = getSunriseSunset();
if (daynightSwitch != null) {
boolean daytime = daynightSwitch.isDaytime();
log.debug("Sunrise/sunset setting to day: " + daytime); //$NON-NLS-1$
lastAutoValue = Boolean.valueOf(daytime);
lastNightMode = !daytime;
}
return lastAutoValue;
} catch (IllegalArgumentException e) {
log.warn("Network location provider not available"); //$NON-NLS-1$
} catch (SecurityException e) {
log.warn("Missing permissions to get actual location!"); //$NON-NLS-1$
}
return null;
} else {
return lastAutoValue;
}
return lastNightMode;
} else if (dayNightMode.isSensor()) {
log.debug("lux value:" + lux + " setting to day: " + (lux > SensorManager.LIGHT_CLOUDY)); //$NON-NLS-1$ //$NON-NLS-2$
return lux > SensorManager.LIGHT_CLOUDY ? Boolean.TRUE : Boolean.FALSE;
return lastNightMode;
}
return null;
return false;
}
public SunriseSunset getSunriseSunset(){
Location lastKnownLocation = getLocation();
public SunriseSunset getSunriseSunset() {
Location lastKnownLocation = osmandApplication.getLocationProvider().getLastKnownLocation();
if(lastKnownLocation == null) {
lastKnownLocation = osmandApplication.getLocationProvider().getFirstTimeRunDefaultLocation();
}
if (lastKnownLocation == null) {
return null;
}
double longitude = lastKnownLocation.getLongitude();
Date actualTime = new Date();
SunriseSunset daynightSwitch = new SunriseSunset(lastKnownLocation.getLatitude(),
longitude < 0 ? 360 + longitude : longitude, actualTime,
TimeZone.getDefault());
longitude < 0 ? 360 + longitude : longitude,
actualTime, TimeZone.getDefault());
return daynightSwitch;
}
private Location getLocation() {
Location lastKnownLocation = osmandApplication.getLocationProvider().getLastKnownLocation();
if(lastKnownLocation == null) {
lastKnownLocation = osmandApplication.getLocationProvider().getFirstTimeRunDefaultLocation();
}
return lastKnownLocation;
}
public void stopSensorIfNeeded() {
if (listener != null) {
SensorManager mSensorManager = (SensorManager) osmandApplication
@ -128,7 +120,8 @@ public class DayNightHelper implements SensorEventListener {
}
}
public void startSensorIfNeeded() {
public void startSensorIfNeeded(StateChangedListener<Boolean> sensorStateListener) {
this.sensorStateListener = sensorStateListener;
DayNightMode dayNightMode = pref.get();
if (listener == null && dayNightMode.isSensor()) {
SensorManager mSensorManager = (SensorManager) osmandApplication.getSystemService(Context.SENSOR_SERVICE);
@ -150,7 +143,16 @@ public class DayNightHelper implements SensorEventListener {
@Override
public void onSensorChanged(SensorEvent event) {
if (event.values.length > 0) {
lux = event.values[0];
float lux = event.values[0];
// log.debug("lux value:" + lux + " setting to day: " + (lux > SensorManager.LIGHT_CLOUDY)); //$NON-NLS-1$ //$NON-NLS-2$
boolean nightMode = lux > SensorManager.LIGHT_CLOUDY? false : true;
if(nightMode != lastNightMode) {
if(System.currentTimeMillis() - lastTime > 10000) {
lastTime = System.currentTimeMillis();
lastNightMode = nightMode;
sensorStateListener.stateChanged(nightMode);
}
}
}
}
}

10
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -315,7 +315,6 @@ public class MapActivity extends AccessibleActivity {
}
OsmandPlugin.onMapActivityResume(this);
app.getDaynightHelper().startSensorIfNeeded();
mapView.refreshMap(true);
}
@ -537,7 +536,14 @@ public class MapActivity extends AccessibleActivity {
mapLayers.getMapInfoLayer().recreateControls();
}
mapLayers.updateLayers(mapView);
app.getDaynightHelper().startSensorIfNeeded();
app.getDaynightHelper().startSensorIfNeeded(new StateChangedListener<Boolean>() {
@Override
public void stateChanged(Boolean change) {
getMapView().refreshMap(true);
}
});
getMapView().refreshMap(true);
}

6
OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
View file

@ -176,7 +176,7 @@ public class MapRenderRepositories {
if (requestedBox == null) {
return true;
}
if (drawSettings.isForce()) {
if (drawSettings.isUpdateVectorRendering()) {
return true;
}
if (requestedBox.getZoom() != box.getZoom()) {
@ -449,9 +449,7 @@ public class MapRenderRepositories {
try {
// find selected rendering type
OsmandApplication app = ((OsmandApplication) context.getApplicationContext());
Boolean renderDay = app.getDaynightHelper().getDayNightRenderer();
boolean nightMode = renderDay != null && !renderDay.booleanValue();
boolean nightMode = app.getDaynightHelper().isNightMode();
// boolean moreDetail = prefs.SHOW_MORE_MAP_DETAIL.get();
RenderingRulesStorage storage = app.getRendererRegistry().getCurrentSelectedRenderer();
RenderingRuleSearchRequest renderingReq = new RenderingRuleSearchRequest(storage);

11
OsmAnd/src/net/osmand/plus/views/OsmandMapLayer.java
View file

@ -41,21 +41,20 @@ public abstract class OsmandMapLayer {
public static class DrawSettings {
private final boolean nightMode;
private final boolean force;
private final boolean updateVectorRendering;
public DrawSettings(boolean nightMode) {
this(nightMode,false);
}
public DrawSettings(boolean nightMode, boolean force) {
public DrawSettings(boolean nightMode, boolean updateVectorRendering) {
this.nightMode = nightMode;
this.force = force;
this.updateVectorRendering = updateVectorRendering;
}
public boolean isForce() {
return force;
public boolean isUpdateVectorRendering() {
return updateVectorRendering;
}
public boolean isNightMode() {
return nightMode;
}

26
OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
View file

@ -487,7 +487,7 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall
return settings;
}
private void refreshMapInternal(boolean force) {
private void refreshMapInternal(boolean updateVectorRendering) {
handler.removeMessages(1);
// long time = System.currentTimeMillis();
@ -509,13 +509,7 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall
float h = getCenterPointY();
Canvas canvas = holder.lockCanvas();
if (canvas != null) {
boolean nightMode = false;
if (application != null) {
Boolean dayNightRenderer = application.getDaynightHelper().getDayNightRenderer();
if (dayNightRenderer != null) {
nightMode = !dayNightRenderer.booleanValue();
}
}
boolean nightMode = application.getDaynightHelper().isNightMode();
try {
boundsRect.set(0, 0, getWidth(), getHeight());
calculateTileRectangle(boundsRect, w, h, tileX, tileY, tilesRect);
@ -528,21 +522,7 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall
} else {
canvas.drawARGB(255, 225, 225, 225);
}
// TODO map
// float ftileSize = getTileSize();
// int left = (int) FloatMath.floor(tilesRect.left);
// int top = (int) FloatMath.floor(tilesRect.top);
// int width = (int) FloatMath.ceil(tilesRect.right - left);
// int height = (int) FloatMath.ceil(tilesRect.bottom - top);
// for (int i = 0; i < width; i++) {
// for (int j = 0; j < height; j++) {
// float x1 = (i + left - tileX) * ftileSize + w;
// float y1 = (j + top - tileY) * ftileSize + h;
// drawEmptyTile(canvas, x1, y1, ftileSize, nightMode);
// }
// }
drawOverMap(canvas, latlonRect, tilesRect, new DrawSettings(nightMode,force));
drawOverMap(canvas, latlonRect, tilesRect, new DrawSettings(nightMode, updateVectorRendering));
// log.info("Draw with layers " + (System.currentTimeMillis() - time));
} finally {
holder.unlockCanvasAndPost(canvas);