Skip to content

Commit

Permalink
comment everything
Browse files Browse the repository at this point in the history
  • Loading branch information
noa-kogonia committed Sep 1, 2024
1 parent 440cd65 commit ad26570
Show file tree
Hide file tree
Showing 6 changed files with 165 additions and 165 deletions.
1 change: 0 additions & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,4 @@
</pods>
</podspec>
</platform>

</plugin>
99 changes: 50 additions & 49 deletions src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
import com.appsflyer.internal.platform_extension.Plugin;
import com.appsflyer.internal.platform_extension.PluginInfo;
import com.appsflyer.AppsFlyerConsent;
import com.appsflyer.MediationNetwork;
import com.appsflyer.AFAdRevenueData;
// import com.appsflyer.MediationNetwork;
// import com.appsflyer.AFAdRevenueData;

import org.apache.cordova.CallbackContext;
import org.apache.cordova.CordovaInterface;
Expand Down Expand Up @@ -178,57 +178,58 @@ public boolean execute(final String action, JSONArray args, CallbackContext call
return setConsentData(args);
} else if ("enableTCFDataCollection".equals(action)) {
return enableTCFDataCollection(args);
} else if ("logAdRevenue".equals(action)) {
return logAdRevenue(args);
}
// else if ("logAdRevenue".equals(action)) {
// return logAdRevenue(args);
// }
return false;
}

/**
* log AdRevenue event
*
* @param args - event params
* @return true
*/
private boolean logAdRevenue(JSONArray args) {
cordova.getThreadPool().execute(() -> {
Map<String, Object> additionalParameters = null;
try {
if(!args.get(0).equals(null)){
JSONObject afAdRevenueDataJsonObj = args.getJSONObject(0);
String monetizationNetwork = afAdRevenueDataJsonObj.optString("monetizationNetwork", null);
String mediationNetwork = afAdRevenueDataJsonObj.optString("mediationNetwork", null);
String currencyIso4217Code = afAdRevenueDataJsonObj.optString("currencyIso4217Code", null);
double revenue = afAdRevenueDataJsonObj.optDouble("revenue", -1);
MediationNetwork mediationNetworkEnumVal = null;

if(mediationNetwork != null){
for(MediationNetwork mediationNetworkEnum: MediationNetwork.values()){
if(mediationNetworkEnum.getValue().equals(mediationNetwork)){
mediationNetworkEnumVal = mediationNetworkEnum;
continue;
}
}
}

if(!args.get(1).equals(null)){
JSONObject additionalParametersJson = args.getJSONObject(1);
additionalParameters = toObjectMap(additionalParametersJson);
}
if(mediationNetworkEnumVal != null){
AFAdRevenueData afAdRevenueData = new AFAdRevenueData(monetizationNetwork, mediationNetworkEnumVal, currencyIso4217Code, revenue);
AppsFlyerLib.getInstance().logAdRevenue(afAdRevenueData, additionalParameters);
}
else{
Log.d("AppsFlyer", "Could not log Ad-Revenue event, bad inputs");
}
}
} catch (JSONException e) {
e.printStackTrace();
}
});
return true;
}
// /**
// * log AdRevenue event
// *
// * @param args - event params
// * @return true
// */
// private boolean logAdRevenue(JSONArray args) {
// cordova.getThreadPool().execute(() -> {
// Map<String, Object> additionalParameters = null;
// try {
// if(!args.get(0).equals(null)){
// JSONObject afAdRevenueDataJsonObj = args.getJSONObject(0);
// String monetizationNetwork = afAdRevenueDataJsonObj.optString("monetizationNetwork", null);
// String mediationNetwork = afAdRevenueDataJsonObj.optString("mediationNetwork", null);
// String currencyIso4217Code = afAdRevenueDataJsonObj.optString("currencyIso4217Code", null);
// double revenue = afAdRevenueDataJsonObj.optDouble("revenue", -1);
// MediationNetwork mediationNetworkEnumVal = null;
//
// if(mediationNetwork != null){
// for(MediationNetwork mediationNetworkEnum: MediationNetwork.values()){
// if(mediationNetworkEnum.getValue().equals(mediationNetwork)){
// mediationNetworkEnumVal = mediationNetworkEnum;
// continue;
// }
// }
// }
//
// if(!args.get(1).equals(null)){
// JSONObject additionalParametersJson = args.getJSONObject(1);
// additionalParameters = toObjectMap(additionalParametersJson);
// }
// if(mediationNetworkEnumVal != null){
// AFAdRevenueData afAdRevenueData = new AFAdRevenueData(monetizationNetwork, mediationNetworkEnumVal, currencyIso4217Code, revenue);
// AppsFlyerLib.getInstance().logAdRevenue(afAdRevenueData, additionalParameters);
// }
// else{
// Log.d("AppsFlyer", "Could not log Ad-Revenue event, bad inputs");
// }
// }
// } catch (JSONException e) {
// e.printStackTrace();
// }
// });
// return true;
// }

/**
* set consent data according to GDPR if applies or not.
Expand Down
10 changes: 5 additions & 5 deletions src/ios/AppsFlyerLib.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ios/AppsFlyerPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
168 changes: 84 additions & 84 deletions src/ios/AppsFlyerPlugin.m
Original file line number Diff line number Diff line change
Expand Up @@ -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){
AFAdRevenueData *adRevenueData = [[AFAdRevenueData alloc] initWithMonetizationNetwork:monetizationNetwork mediationNetwork:mediationNetwork currencyIso4217Code:currencyIso4217Code eventRevenue:revenue];
if([additionalParametersMap isKindOfClass:[NSNull class]]){
[[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:nil];
}
else{
[[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:additionalParametersMap];
}
}
}
}
// - (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]]){
// [[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:nil];
// }
// else{
// [[AppsFlyerLib shared] logAdRevenue:adRevenueData additionalParameters:additionalParametersMap];
// }
// }
// }
// }


/**
Expand Down
50 changes: 25 additions & 25 deletions www/appsflyer.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ if (!window.CustomEvent) {


(function (global) {

// Enum definition for MediationNetwork
global.MediationNetwork = Object.freeze({
IRONSOURCE: "ironsource",
APPLOVIN_MAX: "applovinmax",
GOOGLE_ADMOB: "googleadmob",
FYBER: "fyber",
APPODEAL: "appodeal",
ADMOST: "Admost",
TOPON: "Topon",
TRADPLUS: "Tradplus",
YANDEX: "Yandex",
CHARTBOOST: "chartboost",
UNITY: "Unity",
TOPON_PTE: "toponpte",
CUSTOM_MEDIATION: "customMediation",
DIRECT_MONETIZATION_NETWORK: "directMonetizationNetwork"
});
//
// // Enum definition for MediationNetwork
// global.MediationNetwork = Object.freeze({
// IRONSOURCE: "ironsource",
// APPLOVIN_MAX: "applovinmax",
// GOOGLE_ADMOB: "googleadmob",
// FYBER: "fyber",
// APPODEAL: "appodeal",
// ADMOST: "Admost",
// TOPON: "Topon",
// TRADPLUS: "Tradplus",
// YANDEX: "Yandex",
// CHARTBOOST: "chartboost",
// UNITY: "Unity",
// TOPON_PTE: "toponpte",
// CUSTOM_MEDIATION: "customMediation",
// DIRECT_MONETIZATION_NETWORK: "directMonetizationNetwork"
// });


var AppsFlyer = function () {
Expand Down Expand Up @@ -132,13 +132,13 @@ if (!window.CustomEvent) {
exec(null, null, 'AppsFlyerPlugin', 'setCurrencyCode', [currencyId]);
};

/**
* Public API - logAdRevenue function
*/
AppsFlyer.prototype.logAdRevenue = function(afAdRevenueData, additionalParameters) {
argscheck.checkArgs('OO', 'AppsFlyer.logAdRevenue', arguments);
exec(null, null, 'AppsFlyerPlugin', 'logAdRevenue', [afAdRevenueData, additionalParameters]);
};
// /**
// * Public API - logAdRevenue function
// */
// AppsFlyer.prototype.logAdRevenue = function(afAdRevenueData, additionalParameters) {
// argscheck.checkArgs('OO', 'AppsFlyer.logAdRevenue', arguments);
// exec(null, null, 'AppsFlyerPlugin', 'logAdRevenue', [afAdRevenueData, additionalParameters]);
// };

/**
* Setting your own Custom ID enables you to cross-reference your own unique ID with AppsFlyer’s user ID and the other devices’ IDs.
Expand Down

0 comments on commit ad26570

Please sign in to comment.