pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[location][android] fix: Manual start of location updates.

Browse source
This commit is contained in:
Alexander Marchuk 2016-04-29 14:00:33 +03:00 • committed by Alex Zolotarev
parent 0241eebabf
commit 0ecdb3f90b
4 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/src/com/mapswithme/maps/LocationState.java
View file

@ -22,8 +22,8 @@ public enum LocationState
/**
* Checks if location state on the map is active (so its not turned off or pending).
*/
public static boolean isTurnedOn()
public boolean isTurnedOn()
{
return INSTANCE.getLocationStateMode() > NOT_FOLLOW_NO_POSITION;
return getLocationStateMode() > NOT_FOLLOW_NO_POSITION;
}
}

41
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -150,6 +150,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
private FloatingSearchToolbarController mSearchController;
private LastCompassData mLastCompassData;
private static boolean sColdStart = true;
private static boolean sLocationStopped;
public interface LeftAnimationTrackListener
{
void onTrackStarted(boolean collapsed);
@ -828,6 +831,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
mLocationPredictor.myPositionModeChanged(newMode);
mMainMenu.getMyPositionButton().update(newMode);
if (newMode != LocationState.NOT_FOLLOW_NO_POSITION)
sLocationStopped = false;
switch (newMode)
{
case LocationState.PENDING_POSITION:
@ -835,12 +841,23 @@ public class MwmActivity extends BaseMwmFragmentActivity
break;
case LocationState.NOT_FOLLOW_NO_POSITION:
if (sColdStart)
{
LocationState.INSTANCE.switchToNextMode();
break;
}
pauseLocation();
if (sLocationStopped)
break;
sLocationStopped = true;
if (mMapFragment != null && mMapFragment.isFirstStart())
{
mMapFragment.clearFirstStart();
return;
break;
}
String message = String.format("%s\n\n%s", getString(R.string.current_location_unknown_message),
@ -862,6 +879,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
LocationHelper.INSTANCE.restart();
break;
}
sColdStart = false;
}
@Override
@ -929,15 +948,17 @@ public class MwmActivity extends BaseMwmFragmentActivity
mFirstStart = FirstStartFragment.showOn(this);
if (mFirstStart)
{
addTask(new MwmActivity.MapTask()
{
@Override
public boolean run(MwmActivity target)
if (LocationState.INSTANCE.isTurnedOn())
addTask(new MwmActivity.MapTask()
{
LocationState.INSTANCE.switchToNextMode();
return false;
}
});
@Override
public boolean run(MwmActivity target)
{
if (LocationState.INSTANCE.isTurnedOn())
LocationState.INSTANCE.switchToNextMode();
return false;
}
});
}
if (!mFirstStart && !SinglePageNewsFragment.showOn(this))
{
@ -1015,7 +1036,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
int newMode = LocationState.INSTANCE.getLocationStateMode();
mMainMenu.getMyPositionButton().update(newMode);
if (newMode != LocationState.NOT_FOLLOW_NO_POSITION)
if (LocationState.INSTANCE.isTurnedOn())
resumeLocation();
}

2
android/src/com/mapswithme/maps/location/LocationHelper.java
View file

@ -171,7 +171,7 @@ public enum LocationHelper implements SensorEventListener
@Nullable
public MapObject getMyPosition()
{
if (!LocationState.isTurnedOn())
if (!LocationState.INSTANCE.isTurnedOn())
{
mMyPosition = null;
return null;

4
drape_frontend/my_position_controller.cpp
View file

@ -111,7 +111,7 @@ MyPositionController::MyPositionController(location::EMyPositionMode initMode,
{
if (isFirstLaunch)
m_mode = location::NotFollowNoPosition;
else if (m_mode == location::NotFollowNoPosition || timeInBackground >= kMaxTimeInBackgroundSec)
else if (timeInBackground >= kMaxTimeInBackgroundSec)
m_mode = location::Follow;
}
@ -374,8 +374,6 @@ void MyPositionController::SetModeListener(location::TMyPositionModeChanged cons
location::EMyPositionMode mode = m_mode;
if (m_isFirstLaunch)
mode = location::NotFollowNoPosition;
else if (!m_isPositionAssigned)
mode = location::PendingPosition;
if (m_modeChangeCallback != nullptr)
m_modeChangeCallback(mode, m_isInRouting);