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

[android] Added EMPTY check for taxi types

Browse source
This commit is contained in:
Александр Зацепин 2017-07-03 12:40:18 +03:00 • committed by Arsentiy Milchakov
parent 45025c8d77
commit 430d3c081f
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/jni/com/mapswithme/maps/UserMarkHelper.cpp
View file

@ -167,7 +167,11 @@ jobjectArray ToBannersArray(JNIEnv * env, vector<ads::Banner> const & banners)
jintArray ToReachableByTaxiProvidersArray(JNIEnv * env, vector<taxi::Provider::Type> const & types)
{
if (types.size() == 0)
return nullptr;
jintArray result = env->NewIntArray(types.size());
ASSERT(result, ());
jint tmp[types.size()];
for (int i = 0; i < types.size(); i++)

5
android/jni/com/mapswithme/maps/taxi/TaxiManager.cpp
View file

@ -1,7 +1,6 @@
#include "../Framework.hpp"
#include "com/mapswithme/core/jni_helper.hpp"
#include "com/mapswithme/maps/Framework.hpp"
#include "com/mapswithme/core/jni_helper.hpp"
#include "partners_api/taxi_provider.hpp"
namespace

4
android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
View file

@ -62,7 +62,7 @@ public class MapObject implements Parcelable
public MapObject(@NonNull String mwmName, long mwmVersion, int featureIndex,
@MapObjectType int mapObjectType, String title, @Nullable String secondaryTitle,
String subtitle, String address, double lat, double lon, String apiId,
@Nullable Banner[] banners, @TaxiManager.TaxiType int[] types,
@Nullable Banner[] banners, @Nullable @TaxiManager.TaxiType int[] types,
@Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo,
@Nullable RoutePointInfo routePointInfo)
{
@ -74,7 +74,7 @@ public class MapObject implements Parcelable
public MapObject(@NonNull String mwmName, long mwmVersion, int featureIndex,
@MapObjectType int mapObjectType, String title, @Nullable String secondaryTitle,
String subtitle, String address, double lat, double lon, Metadata metadata,
String apiId, @Nullable Banner[] banners, @TaxiManager.TaxiType int[] taxiTypes,
String apiId, @Nullable Banner[] banners, @Nullable @TaxiManager.TaxiType int[] taxiTypes,
@Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo,
@Nullable RoutePointInfo routePointInfo)
{

2
android/src/com/mapswithme/maps/taxi/TaxiAdapter.java
View file

@ -51,7 +51,7 @@ public class TaxiAdapter extends PagerAdapter
View v = LayoutInflater.from(mContext).inflate(R.layout.taxi_pager_item, container, false);
TextView name = (TextView) v.findViewById(R.id.product_name);
// We ignore all Yandex.Taxi product names until they do support of passing product parameters
// to their app vie deeplink.
// to their app via deeplink.
if (mType == TaxiManager.PROVIDER_YANDEX)
name.setText(R.string.yandex_taxi_title);
else

3
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -1313,10 +1313,9 @@ public class PlacePageView extends RelativeLayout
if (!showTaxiOffer)
return;
List<Integer> types = mapObject.getReachableByTaxiTypes();
// At this moment we display only a one taxi provider at the same time.
@TaxiManager.TaxiType
int type = types.get(0);
int type = taxiTypes.get(0);
UiUtils.showTaxiIcon((ImageView) mTaxi.findViewById(R.id.iv__place_page_taxi), type);
UiUtils.showTaxiTitle((TextView) mTaxi.findViewById(R.id.tv__place_page_taxi), type);
Statistics.INSTANCE.trackTaxiEvent(Statistics.EventName.ROUTING_TAXI_SHOW_IN_PP, type);