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

Merge pull request #4555 from alexzatsepin/MAPSME-2761-uber-spinner

Browse source 
[android] Bound the toolbar progress bar to uber info request
This commit is contained in:
Vladimir Byko-Ianko 2016-10-27 11:52:40 +03:00 • committed by GitHub
commit b870b7e469
2 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
android/src/com/mapswithme/maps/routing/RoutingController.java
View file

@ -99,6 +99,7 @@ public class RoutingController
@Nullable
private RoutingInfo mCachedRoutingInfo;
private boolean mUberInfoObtained;
private boolean mUberPlanning;
@SuppressWarnings("FieldCanBeLocal")
private final Framework.RoutingListener mRoutingListener = new Framework.RoutingListener()
@ -199,6 +200,9 @@ public class RoutingController
private void updateProgress()
{
if (isUberPlanning())
return;
if (mContainer != null)
mContainer.updateBuildProgress(mLastBuildProgress, mLastRouterType);
}
@ -232,15 +236,22 @@ public class RoutingController
mContainer = null;
}
@MainThread
public void restore()
{
mHasContainerSavedState = false;
if (isPlanning())
showRoutePlan();
mContainer.showNavigation(isNavigating());
mContainer.updateMenu();
mContainer.updatePoints();
if (mContainer != null)
{
if (isUberPlanning())
mContainer.updateBuildProgress(0, mLastRouterType);
mContainer.showNavigation(isNavigating());
mContainer.updateMenu();
mContainer.updatePoints();
}
processRoutingEvent();
}
@ -468,17 +479,22 @@ public class RoutingController
public boolean isPlanning()
{
return (mState == State.PREPARE);
return mState == State.PREPARE;
}
private boolean isUberPlanning()
{
return mLastRouterType == Framework.ROUTER_TYPE_TAXI && mUberPlanning;
}
public boolean isNavigating()
{
return (mState == State.NAVIGATION);
return mState == State.NAVIGATION;
}
public boolean isBuilding()
{
return (mState == State.PREPARE && mBuildState == BuildState.BUILDING);
return mState == State.PREPARE && mBuildState == BuildState.BUILDING;
}
public boolean isErrorEncountered()
@ -763,7 +779,10 @@ public class RoutingController
private void requestUberInfo()
{
mUberPlanning = true;
Uber.nativeRequestUberProducts(mStartPoint.getLat(), mStartPoint.getLon(), mEndPoint.getLat(), mEndPoint.getLon());
if (mContainer != null)
mContainer.updateBuildProgress(0, mLastRouterType);
}
@NonNull
@ -779,11 +798,13 @@ public class RoutingController
@MainThread
private void onUberInfoReceived(@NonNull UberInfo info)
{
mUberPlanning = false;
mLogger.d("onUberInfoReceived uberInfo = " + info);
if (mLastRouterType == Framework.ROUTER_TYPE_TAXI && mContainer != null)
{
mContainer.onUberInfoReceived(info);
mUberInfoObtained = true;
mContainer.updateBuildProgress(100, mLastRouterType);
mContainer.updateMenu();
}
}

2
android/src/com/mapswithme/maps/routing/RoutingPlanController.java
View file

@ -280,7 +280,7 @@ public class RoutingPlanController extends ToolbarController
updateProgressLabels();
if (!RoutingController.get().isBuilding())
if (!RoutingController.get().isBuilding() || RoutingController.get().isUberInfoObtained())
return;
UiUtils.show(progressView);