From 56347174828c1982b397a4671b1e9991d209a912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= Date: Wed, 21 Jun 2017 09:50:20 +0300 Subject: [PATCH] [android] Added getUgcApi method to Framework --- android/jni/Android.mk | 1 + android/jni/com/mapswithme/maps/Framework.cpp | 9 +++++++++ android/jni/com/mapswithme/maps/Framework.hpp | 2 ++ android/jni/com/mapswithme/maps/ugc/UGC.cpp | 2 ++ android/jni/com/mapswithme/maps/ugc/UGC.hpp | 9 +++++++++ 5 files changed, 23 insertions(+) create mode 100644 android/jni/com/mapswithme/maps/ugc/UGC.cpp create mode 100644 android/jni/com/mapswithme/maps/ugc/UGC.hpp diff --git a/android/jni/Android.mk b/android/jni/Android.mk index a50c779c52..4cce6d8883 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -97,6 +97,7 @@ LOCAL_SRC_FILES := \ com/mapswithme/maps/sound/tts.cpp \ com/mapswithme/maps/Sponsored.cpp \ com/mapswithme/maps/taxi/TaxiManager.cpp \ + com/mapswithme/maps/ugc/UGC.cpp \ com/mapswithme/maps/TrackRecorder.cpp \ com/mapswithme/maps/TrafficState.cpp \ com/mapswithme/maps/UserMarkHelper.cpp \ diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 81719dd76b..d5ea0365b5 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -577,6 +577,15 @@ void Framework::RequestViatorProducts(JNIEnv * env, jobject policy, std::string viatorApi->GetTop5Products(destId, currency, callback); } +void Framework::RequestUGC(JNIEnv * env, ugc::Api::UGCCallback const & ugcCallback) +{ + ugc::Api & ugcApi = m_work.GetUGCApi(); + + auto const & info = g_framework->GetPlacePageInfo(); + + ugcApi.GetUGC(info.GetID(), ugcCallback); +} + int Framework::ToDoAfterUpdate() const { return (int) m_work.ToDoAfterUpdate(); diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp index 129948c51f..e64160ee2d 100644 --- a/android/jni/com/mapswithme/maps/Framework.hpp +++ b/android/jni/com/mapswithme/maps/Framework.hpp @@ -194,6 +194,8 @@ namespace android std::string const & currency, viator::GetTop5ProductsCallback const & callback); + void RequestUGC(JNIEnv * env, ugc::Api::UGCCallback const & ugcCallback); + int ToDoAfterUpdate() const; void LogLocalAdsEvent(local_ads::EventType event, double lat, double lon, uint16_t accuracy); diff --git a/android/jni/com/mapswithme/maps/ugc/UGC.cpp b/android/jni/com/mapswithme/maps/ugc/UGC.cpp new file mode 100644 index 0000000000..139597f9cb --- /dev/null +++ b/android/jni/com/mapswithme/maps/ugc/UGC.cpp @@ -0,0 +1,2 @@ + + diff --git a/android/jni/com/mapswithme/maps/ugc/UGC.hpp b/android/jni/com/mapswithme/maps/ugc/UGC.hpp new file mode 100644 index 0000000000..326a7d0cee --- /dev/null +++ b/android/jni/com/mapswithme/maps/ugc/UGC.hpp @@ -0,0 +1,9 @@ +#include "../Framework.hpp" +#include "../../core/jni_helper.hpp" +#include "ugc/api.hpp" +#include "ugc/types.hpp" + +namespace +{ + +}