uncomment

AppsFlyerSDK · Sep 1, 2024 · d3941ec · d3941ec
1 parent ad26570
commit d3941ec
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 89 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-appsflyer-sdk",
-  "version": "6.15.1-rc2",
+  "version": "6.15.1",
   "description": "Cordova AppsFlyer SDK Plugin",
   "cordova": {
     "id": "cordova-plugin-appsflyer-sdk",

diff --git a/plugin.xml b/plugin.xml
@@ -21,7 +21,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="cordova-plugin-appsflyer-sdk"
-        version="6.13.1-rc1">
+        version="6.15.1-rc2">
     <name>AppsFlyer</name>
     <description>Cordova Plugin AppsFlyer</description>
     <license>Apache 2.0</license>

diff --git a/src/ios/AppsFlyerLib.h b/src/ios/AppsFlyerLib.h
@@ -125,11 +125,11 @@ NS_ASSUME_NONNULL_BEGIN
 #define AFEventParamPreferredNeighborhoods  @"af_preferred_neighborhoods" //array of string
 #define AFEventParamPreferredNumStops       @"af_preferred_num_stops"
 
-// #define AFEventParamAdRevenueAdType              @"af_adrev_ad_type"
-// #define AFEventParamAdRevenueNetworkName         @"af_adrev_network_name"
-// #define AFEventParamAdRevenuePlacementId         @"af_adrev_placement_id"
-// #define AFEventParamAdRevenueAdSize              @"af_adrev_ad_size"
-// #define AFEventParamAdRevenueMediatedNetworkName @"af_adrev_mediated_network_name"
+#define AFEventParamAdRevenueAdType              @"af_adrev_ad_type"
+#define AFEventParamAdRevenueNetworkName         @"af_adrev_network_name"
+#define AFEventParamAdRevenuePlacementId         @"af_adrev_placement_id"
+#define AFEventParamAdRevenueAdSize              @"af_adrev_ad_size"
+#define AFEventParamAdRevenueMediatedNetworkName @"af_adrev_mediated_network_name"
 
 
 /// Mail hashing type

diff --git a/src/ios/AppsFlyerPlugin.h b/src/ios/AppsFlyerPlugin.h
@@ -33,7 +33,7 @@
 - (void)setCurrentDeviceLanguage:(CDVInvokedUrlCommand*)command;
 - (void)setAdditionalData:(CDVInvokedUrlCommand*)command;
 - (void)setConsentData:(CDVInvokedUrlCommand*)command;
-// - (void)logAdRevenue:(CDVInvokedUrlCommand*)command;
+- (void)logAdRevenue:(CDVInvokedUrlCommand*)command;
 - (void)enableTCFDataCollection:(CDVInvokedUrlCommand*)command;
 - (void)setSharingFilter:(CDVInvokedUrlCommand*)command __attribute__((deprecated));
 - (void)setSharingFilterForAllPartners:(CDVInvokedUrlCommand*)command __attribute__((deprecated));

diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m
@@ -197,90 +197,90 @@ - (void)setCurrencyCode:(CDVInvokedUrlCommand*)command
 }
 
 
-// - (AppsFlyerAdRevenueMediationNetworkType)getEnumValueFromString:(NSString *)mediationNetworkString {
-//     NSDictionary<NSString *, NSNumber *> *stringToEnumMap = @{
-//         @"googleadmob": @(AppsFlyerAdRevenueMediationNetworkTypeGoogleAdMob),
-//         @"ironsource": @(AppsFlyerAdRevenueMediationNetworkTypeIronSource),
-//         @"applovinmax": @(AppsFlyerAdRevenueMediationNetworkTypeApplovinMax),
-//         @"fyber": @(AppsFlyerAdRevenueMediationNetworkTypeFyber),
-//         @"appodeal": @(AppsFlyerAdRevenueMediationNetworkTypeAppodeal),
-//         @"Admost": @(AppsFlyerAdRevenueMediationNetworkTypeAdmost),
-//         @"Topon": @(AppsFlyerAdRevenueMediationNetworkTypeTopon),
-//         @"Tradplus": @(AppsFlyerAdRevenueMediationNetworkTypeTradplus),
-//         @"Yandex": @(AppsFlyerAdRevenueMediationNetworkTypeYandex),
-//         @"Saturchartboostday": @(AppsFlyerAdRevenueMediationNetworkTypeChartBoost),
-//         @"Unity": @(AppsFlyerAdRevenueMediationNetworkTypeUnity),
-//         @"toponpte": @(AppsFlyerAdRevenueMediationNetworkTypeToponPte),
-//         @"customMediation": @(AppsFlyerAdRevenueMediationNetworkTypeCustom),
-//         @"directMonetizationNetwork": @(AppsFlyerAdRevenueMediationNetworkTypeDirectMonetization)
-//     };
-//
-//     NSNumber *enumValueNumber = stringToEnumMap[mediationNetworkString];
-//     if (enumValueNumber) {
-//         return (AppsFlyerAdRevenueMediationNetworkType)[enumValueNumber integerValue];
-//     } else {
-//         return -1;
-//     }
-// }
-
-// /**
-// *    log AdRevenue event
-// */
-// - (void)logAdRevenue:(CDVInvokedUrlCommand*)command
-// {
-//     if ([command.arguments count] == 0) {
-//         return;
-//     }
-//
-//     NSDictionary* afAdRevenueDataMap = [command argumentAtIndex:0 withDefault:[NSNull null]];
-//     NSDictionary *additionalParametersMap = (NSDictionary*)[command.arguments objectAtIndex: 1];
-//
-//     id monetizationNetwork = nil;
-//     AppsFlyerAdRevenueMediationNetworkType mediationNetwork;
-//     id currencyIso4217Code = nil;
-//     NSNumber *revenue = 0;
-//
-//     id monetizationNetworkValue = nil;
-//     id mediationNetworkValue = nil;
-//     id currencyIso4217CodeValue = nil;
-//     id revenueValue = nil;
-//
-//     if(![afAdRevenueDataMap isKindOfClass:[NSNull class]]){
-//         monetizationNetworkValue = [afAdRevenueDataMap objectForKey:@"monetizationNetwork"];
-//         if (monetizationNetworkValue != nil && [monetizationNetworkValue isKindOfClass:[NSString class]]) {
-//            monetizationNetwork = monetizationNetworkValue;
-//         }
-//
-//         mediationNetworkValue = [afAdRevenueDataMap objectForKey:@"mediationNetwork"];
-//         if (mediationNetworkValue != nil && [mediationNetworkValue isKindOfClass:[NSString class]]) {
-//             if([self getEnumValueFromString: mediationNetworkValue] != -1){
-//                 mediationNetwork = [self getEnumValueFromString: mediationNetworkValue];
-//             }
-//             else{
-//                 return;
-//             }
-//         }
-//
-//         currencyIso4217CodeValue = [afAdRevenueDataMap objectForKey:@"currencyIso4217Code"];
-//         if (currencyIso4217CodeValue != nil && [currencyIso4217CodeValue isKindOfClass:[NSString class]]) {
-//            currencyIso4217Code = currencyIso4217CodeValue;
-//         }
-//
-//         revenueValue = [afAdRevenueDataMap objectForKey:@"revenue"];
-//         if (revenueValue != nil && [revenueValue isKindOfClass:[NSNumber class]]) {
-//             revenue = revenueValue;
-//         }
-//         if(monetizationNetwork != nil && currencyIso4217Code != nil && revenue != nil){
+- (AppsFlyerAdRevenueMediationNetworkType)getEnumValueFromString:(NSString *)mediationNetworkString {
+    NSDictionary<NSString *, NSNumber *> *stringToEnumMap = @{
+        @"googleadmob": @(AppsFlyerAdRevenueMediationNetworkTypeGoogleAdMob),
+        @"ironsource": @(AppsFlyerAdRevenueMediationNetworkTypeIronSource),
+        @"applovinmax": @(AppsFlyerAdRevenueMediationNetworkTypeApplovinMax),
+        @"fyber": @(AppsFlyerAdRevenueMediationNetworkTypeFyber),
+        @"appodeal": @(AppsFlyerAdRevenueMediationNetworkTypeAppodeal),
+        @"Admost": @(AppsFlyerAdRevenueMediationNetworkTypeAdmost),
+        @"Topon": @(AppsFlyerAdRevenueMediationNetworkTypeTopon),
+        @"Tradplus": @(AppsFlyerAdRevenueMediationNetworkTypeTradplus),
+        @"Yandex": @(AppsFlyerAdRevenueMediationNetworkTypeYandex),
+        @"Saturchartboostday": @(AppsFlyerAdRevenueMediationNetworkTypeChartBoost),
+        @"Unity": @(AppsFlyerAdRevenueMediationNetworkTypeUnity),
+        @"toponpte": @(AppsFlyerAdRevenueMediationNetworkTypeToponPte),
+        @"customMediation": @(AppsFlyerAdRevenueMediationNetworkTypeCustom),
+        @"directMonetizationNetwork": @(AppsFlyerAdRevenueMediationNetworkTypeDirectMonetization)
+    };
+
+    NSNumber *enumValueNumber = stringToEnumMap[mediationNetworkString];
+    if (enumValueNumber) {
+        return (AppsFlyerAdRevenueMediationNetworkType)[enumValueNumber integerValue];
+    } else {
+        return -1;
+    }
+}
+
+/**
+*    log AdRevenue event
+*/
+- (void)logAdRevenue:(CDVInvokedUrlCommand*)command
+{
+    if ([command.arguments count] == 0) {
+        return;
+    }
+
+    NSDictionary* afAdRevenueDataMap = [command argumentAtIndex:0 withDefault:[NSNull null]];
+    NSDictionary *additionalParametersMap = (NSDictionary*)[command.arguments objectAtIndex: 1];
+
+    id monetizationNetwork = nil;
+    AppsFlyerAdRevenueMediationNetworkType mediationNetwork;
+    id currencyIso4217Code = nil;
+    NSNumber *revenue = 0;
+
+    id monetizationNetworkValue = nil;
+    id mediationNetworkValue = nil;
+    id currencyIso4217CodeValue = nil;
+    id revenueValue = nil;
+
+    if(![afAdRevenueDataMap isKindOfClass:[NSNull class]]){
+        monetizationNetworkValue = [afAdRevenueDataMap objectForKey:@"monetizationNetwork"];
+        if (monetizationNetworkValue != nil && [monetizationNetworkValue isKindOfClass:[NSString class]]) {
+           monetizationNetwork = monetizationNetworkValue;
+        }
+
+        mediationNetworkValue = [afAdRevenueDataMap objectForKey:@"mediationNetwork"];
+        if (mediationNetworkValue != nil && [mediationNetworkValue isKindOfClass:[NSString class]]) {
+            if([self getEnumValueFromString: mediationNetworkValue] != -1){
+                mediationNetwork = [self getEnumValueFromString: mediationNetworkValue];
+            }
+            else{
+                return;
+            }
+        }
+
+        currencyIso4217CodeValue = [afAdRevenueDataMap objectForKey:@"currencyIso4217Code"];
+        if (currencyIso4217CodeValue != nil && [currencyIso4217CodeValue isKindOfClass:[NSString class]]) {
+           currencyIso4217Code = currencyIso4217CodeValue;
+        }
+
+        revenueValue = [afAdRevenueDataMap objectForKey:@"revenue"];
+        if (revenueValue != nil && [revenueValue isKindOfClass:[NSNumber class]]) {
+            revenue = revenueValue;
+        }
+        if(monetizationNetwork != nil && currencyIso4217Code != nil && revenue != nil){
 //             AFAdRevenueData *adRevenueData = [[AFAdRevenueData alloc] initWithMonetizationNetwork:monetizationNetwork mediationNetwork:mediationNetwork currencyIso4217Code:currencyIso4217Code eventRevenue:revenue];
-//             if([additionalParametersMap isKindOfClass:[NSNull class]]){
+            if([additionalParametersMap isKindOfClass:[NSNull class]]){
 //                 [[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:nil];
-//             }
-//             else{
+            }
+            else{
 //                 [[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:additionalParametersMap];
-//             }
-//         }
-//     }
-// }
+            }
+        }
+    }
+}
 
 
 /**