From bce10a5a8265154d0abf742387607ab794edcd09 Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Mon, 2 Sep 2019 15:32:03 +0300 Subject: [PATCH] jni for crown --- android/jni/com/mapswithme/maps/Framework.cpp | 7 +++++++ .../jni/com/mapswithme/maps/metrics/UserActionsLogger.cpp | 6 ++++++ android/src/com/mapswithme/maps/Framework.java | 2 ++ .../src/com/mapswithme/maps/metrics/UserActionsLogger.java | 6 ++++++ 4 files changed, 21 insertions(+) diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 19590821aa..bc5824c932 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -7,6 +7,7 @@ #include "com/mapswithme/vulkan/android_vulkan_context_factory.hpp" #include "map/chart_generator.hpp" +#include "map/crown.hpp" #include "map/everywhere_search_params.hpp" #include "map/notifications/notification_queue.hpp" #include "map/user_mark.hpp" @@ -2228,4 +2229,10 @@ Java_com_mapswithme_maps_Framework_nativeSetSearchViewport(JNIEnv *, jclass, jdo auto const rect = df::GetRectForDrawScale(static_cast(zoom), center); frm()->GetSearchAPI().OnViewportChanged(rect); } + +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_Framework_nativeNeedToShowCrown(JNIEnv *, jclass) +{ + return static_cast(crown::NeedToShow(frm()->GetPurchase())); +} } // extern "C" diff --git a/android/jni/com/mapswithme/maps/metrics/UserActionsLogger.cpp b/android/jni/com/mapswithme/maps/metrics/UserActionsLogger.cpp index 95bfe5eef8..6e49646c3c 100644 --- a/android/jni/com/mapswithme/maps/metrics/UserActionsLogger.cpp +++ b/android/jni/com/mapswithme/maps/metrics/UserActionsLogger.cpp @@ -112,4 +112,10 @@ Java_com_mapswithme_maps_metrics_UserActionsLogger_nativePromoAfterBookingShown( { eye::Eye::Event::PromoAfterBookingShown(jni::ToNativeString(env, id)); } + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_metrics_UserActionsLogger_nativeCrownClicked(JNIEnv *, jclass) +{ + eye::Eye::Event::CrownClicked(); +} } diff --git a/android/src/com/mapswithme/maps/Framework.java b/android/src/com/mapswithme/maps/Framework.java index 475aca9b92..01ff35b9ad 100644 --- a/android/src/com/mapswithme/maps/Framework.java +++ b/android/src/com/mapswithme/maps/Framework.java @@ -533,6 +533,8 @@ public class Framework public static native void nativeSetSearchViewport(double lat, double lon, int zoom); + public static native boolean nativeNeedToShowCrown(); + public enum LocalAdsEventType { LOCAL_ADS_EVENT_SHOW_POINT, diff --git a/android/src/com/mapswithme/maps/metrics/UserActionsLogger.java b/android/src/com/mapswithme/maps/metrics/UserActionsLogger.java index 7f8cadf0a9..864d095319 100644 --- a/android/src/com/mapswithme/maps/metrics/UserActionsLogger.java +++ b/android/src/com/mapswithme/maps/metrics/UserActionsLogger.java @@ -70,6 +70,11 @@ public class UserActionsLogger nativePromoAfterBookingShown(id); } + public static void logCrownClicked() + { + nativeCrownClicked(); + } + private static native void nativeTipClicked(int type, int event); private static native void nativeBookingFilterUsed(); private static native void nativeBookmarksCatalogShown(); @@ -83,4 +88,5 @@ public class UserActionsLogger private static native void nativeBookingReviewsClicked(); private static native void nativeBookingDetailsClicked(); private static native void nativePromoAfterBookingShown(@NonNull String id); + private static native void nativeCrownClicked(); }