diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.h b/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.h index 215002272a..789ed216b6 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.h +++ b/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.h @@ -10,6 +10,7 @@ typedef NS_ENUM(NSInteger, MWMBannerType) { MWMBannerTypeMts, MWMBannerTypeSkyeng, MWMBannerTypeBookmarkCatalog, + MWMBannerTypeMastercardSberbank, }; NS_ASSUME_NONNULL_BEGIN diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.mm b/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.mm index 348667f5e1..12b8351aa8 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.mm +++ b/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.mm @@ -20,6 +20,8 @@ static MWMBannerType ConvertBannerType(ads::Banner::Type coreType) { return MWMBannerTypeSkyeng; case ads::Banner::Type::BookmarkCatalog: return MWMBannerTypeBookmarkCatalog; + case ads::Banner::Type::MastercardSberbank: + return MWMBannerTypeMastercardSberbank; } } diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm index 10b9428aca..9c2b46f689 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm +++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm @@ -281,6 +281,8 @@ using namespace storage; case MWMBannerTypeMts: return kStatMts; case MWMBannerTypeSkyeng: return kStatSkyeng; case MWMBannerTypeBookmarkCatalog: return kStatMapsmeGuides; + case MWMBannerTypeMastercardSberbank: + return kStatMastercardSberbank; default: return @(""); } } @@ -295,9 +297,10 @@ using namespace storage; case MWMBannerTypeTinkoffAllAirlines: case MWMBannerTypeTinkoffInsurance: case MWMBannerTypeMts: - case MWMBannerTypeSkyeng: { + case MWMBannerTypeSkyeng: + case MWMBannerTypeMastercardSberbank: { __weak __typeof(self) ws = self; - PartnerBannerViewController *controller = [[PartnerBannerViewController alloc] initWithTapHandler:^{ + MWMVoidBlock onClick = ^{ [ws bannerAction]; [Statistics logEvent:kStatDownloaderBannerClick withParameters:@{ @@ -305,13 +308,15 @@ using namespace storage; kStatProvider: statProvider, kStatMWMName: @(self->m_countryId.c_str()) }]; - }]; - [Statistics logEvent:kStatDownloaderBannerShow - withParameters:@{ - kStatFrom: kStatMap, - kStatProvider: statProvider, - kStatMWMName: @(self->m_countryId.c_str()) - }]; + }; + + // TODO: instantiate correct controller. + if (bannerType == MWMBannerTypeMastercardSberbank) { + self.bannerViewController = nil; + break; + } + + PartnerBannerViewController *controller = [[PartnerBannerViewController alloc] initWithTapHandler:onClick]; [controller configWithType:bannerType]; self.bannerViewController = controller; break; @@ -332,11 +337,6 @@ using namespace storage; kStatProvider: statProvider }]; }]; - [Statistics logEvent:kStatDownloaderBannerShow - withParameters:@{ - kStatFrom: kStatMap, - kStatProvider: statProvider - }]; break; } default: @@ -363,6 +363,9 @@ using namespace storage; self.bannerView.alpha = 1; [self layoutIfNeeded]; }]; + [Statistics + logEvent:kStatDownloaderBannerShow + withParameters:@{kStatFrom: kStatMap, kStatProvider: statProvider, kStatMWMName: @(self->m_countryId.c_str())}]; } } } diff --git a/iphone/Maps/Common/Statistics/StatisticsStrings.h b/iphone/Maps/Common/Statistics/StatisticsStrings.h index 3d83033dcf..c9dd80a028 100644 --- a/iphone/Maps/Common/Statistics/StatisticsStrings.h +++ b/iphone/Maps/Common/Statistics/StatisticsStrings.h @@ -300,6 +300,7 @@ static NSString *const kStatTinkoffInsurance = @"Tinkoff_Insurance"; static NSString *const kStatTurnOn = @"turn_on"; static NSString *const kStatMts = @"MTS"; static NSString *const kStatSkyeng = @"Skyeng"; +static NSString *const kStatMastercardSberbank = @"MastercardSberbank"; static NSString *const kStatSubway = @"subway"; static NSString *const kStatMenu = @"menu"; static NSString *const kStatMethod = @"method"; diff --git a/iphone/Maps/Core/Ads/MWMBannerHelpers.h b/iphone/Maps/Core/Ads/MWMBannerHelpers.h index 060a200f77..998569f138 100644 --- a/iphone/Maps/Core/Ads/MWMBannerHelpers.h +++ b/iphone/Maps/Core/Ads/MWMBannerHelpers.h @@ -19,6 +19,8 @@ static inline MWMBannerType MatchBannerType(ads::Banner::Type coreType) case ads::Banner::Type::Mts: return MWMBannerTypeMts; case ads::Banner::Type::Skyeng: return MWMBannerTypeSkyeng; case ads::Banner::Type::BookmarkCatalog: return MWMBannerTypeBookmarkCatalog; + case ads::Banner::Type::MastercardSberbank: + return MWMBannerTypeMastercardSberbank; } }