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

[ios] Added marketing events sender to platform.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-09-15 13:31:21 +03:00
parent 46193618b6
commit 048dc6cb90
7 changed files with 58 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/jni/com/mapswithme/platform/Platform.cpp
View file

@ -84,6 +84,11 @@ void Platform::SendPushWooshTag(string const & tag, vector<string> const & value
android::Platform::Instance().SendPushWooshTag(tag, values);
}
void Platform::SendMarketingEvent(string const & tag, map<string, string> const & params)
{
// TODO: Add implementation.
}
Platform::EConnectionType Platform::ConnectionStatus()
{
JNIEnv * env = jni::GetEnv();

39
iphone/Maps/main.mm
View file

@ -1,6 +1,7 @@
#import <Pushwoosh/PushNotificationManager.h>
#import "Common.h"
#import "MapsAppDelegate.h"
#import <MyTrackerSDK/MRMyTracker.h>
#ifdef OMIM_PRODUCTION
# include "fabric_logging.hpp"
@ -10,17 +11,9 @@
#include "platform/platform.hpp"
#include "platform/settings.hpp"
int main(int argc, char * argv[])
void setPushWooshSender()
{
#ifdef MWM_LOG_TO_FILE
my::SetLogMessageFn(LogMessageFile);
#elif OMIM_PRODUCTION
my::SetLogMessageFn(platform::LogMessageFabric);
#endif
auto & p = GetPlatform();
LOG(LINFO, ("maps.me started, detected CPU cores:", p.CpuCores()));
p.SetPushWooshSender([](string const & tag, vector<string> const & values) {
GetPlatform().SetPushWooshSender([](string const & tag, vector<string> const & values) {
if (values.empty() || tag.empty())
return;
PushNotificationManager * pushManager = [PushNotificationManager pushManager];
@ -36,6 +29,32 @@ int main(int argc, char * argv[])
[pushManager setTags:@{ @(tag.c_str()) : tags }];
}
});
}
void setMarketingSender()
{
GetPlatform().SetMarketingSender([](string const & tag, map<string, string> const & params) {
if (tag.empty())
return;
NSMutableDictionary<NSString *, NSString *> * eventParams = [@{} mutableCopy];
for(auto const & param : params)
eventParams[@(param.first.c_str())] = @(param.second.c_str());
[MRMyTracker trackEvent:@(tag.c_str()) eventParams:eventParams];
});
}
int main(int argc, char * argv[])
{
#ifdef MWM_LOG_TO_FILE
my::SetLogMessageFn(LogMessageFile);
#elif OMIM_PRODUCTION
my::SetLogMessageFn(platform::LogMessageFabric);
#endif
auto & p = GetPlatform();
LOG(LINFO, ("maps.me started, detected CPU cores:", p.CpuCores()));
setPushWooshSender();
setMarketingSender();
int retVal;
@autoreleasepool

8
platform/platform.hpp
View file

@ -8,6 +8,7 @@
#include "std/string.hpp"
#include "std/vector.hpp"
#include "std/map.hpp"
#include "std/utility.hpp"
#include "std/function.hpp"
#include "std/bitset.hpp"
@ -55,6 +56,7 @@ public:
using TFilesWithType = vector<pair<string, EFileType>>;
using TPushWooshSenderFn = function<void(string const & tag, vector<string> const & values)>;
using TMarketingSenderFn = function<void(string const & tag, map<string, string> const & params)>;
protected:
/// Usually read-only directory for application resources
@ -90,6 +92,9 @@ protected:
/// Callback fucntion for setting PushWoosh tags.
TPushWooshSenderFn m_pushwooshSender;
/// Callback fucntion for sending marketing events.
TMarketingSenderFn m_marketingSender;
public:
Platform();
@ -233,6 +238,9 @@ public:
void SendPushWooshTag(string const & tag, string const & value);
void SendPushWooshTag(string const & tag, vector<string> const & values);
void SetMarketingSender(TMarketingSenderFn const & fn) { m_marketingSender = fn; }
void SendMarketingEvent(string const & tag, map<string, string> const & params);
private:
void GetSystemFontNames(FilesList & res) const;
};

1
platform/platform_android.cpp
View file

@ -265,6 +265,7 @@ void Platform::SetupMeasurementSystem() const
//void Platform::SendPushWooshTag(string const & tag){}
//void Platform::SendPushWooshTag(string const & tag, string const & value){}
//void Platform::SendPushWooshTag(string const & tag, vector<string> const & values){}
//void Platform::SendMarketingEvent(string const & tag, map<string, string> const & params){}
namespace
{

6
platform/platform_ios.mm
View file

@ -229,6 +229,12 @@ void Platform::SendPushWooshTag(string const & tag, vector<string> const & value
m_pushwooshSender(tag, values);
}
void Platform::SendMarketingEvent(string const & tag, map<string, string> const & params)
{
if (m_marketingSender)
m_marketingSender(tag, params);
}
////////////////////////////////////////////////////////////////////////
extern Platform & GetPlatform()
{

4
platform/platform_mac.mm
View file

@ -151,3 +151,7 @@ void Platform::SendPushWooshTag(string const & tag, string const & value)
void Platform::SendPushWooshTag(string const & tag, vector<string> const & values)
{
}
void Platform::SendMarketingEvent(string const & tag, map<string, string> const & params)
{
}

5
platform/platform_qt.cpp
View file

@ -107,6 +107,11 @@ void Platform::SendPushWooshTag(string const & tag, string const & value)
void Platform::SendPushWooshTag(string const & tag, vector<string> const & values)
{
}
void Platform::SendMarketingEvent(string const & tag, map<string, string> const & params)
{
}
#endif // defined(OMIM_OS_LINUX)
extern Platform & GetPlatform()