emi-indo-cordova-plugin-admob 1.4.1 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Cordova Plugin Admob Android IOS",
   "cordova": {
     "id": "emi-indo-cordova-plugin-admob",
@@ -20,7 +20,6 @@
     "cordova-admob-pro",
     "cordova-admob-ios",
     "cordova-admob-android"
-    
   ],
   "author": "EMI INDO",
   "email": "cordova.c3addon@gmail.com",

package/plugin.xml

@@ -1,6 +1,6 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
-	id="emi-indo-cordova-plugin-admob" version="1.4.1">
+	id="emi-indo-cordova-plugin-admob" version="1.4.2">
 	
     <name>emiAdmobPlugin</name>
   <description>Cordova Plugin Admob Android IOS</description>

package/src/ios/emiAdmobPlugin.h

@@ -2,13 +2,16 @@
 #import <Cordova/CDVPlugin.h>
 #import <GoogleMobileAds/GoogleMobileAds.h>
 #import <UserMessagingPlatform/UserMessagingPlatform.h>
-@interface emiAdmobPlugin : CDVPlugin<GADBannerViewDelegate, GADFullScreenContentDelegate>{}
+@interface emiAdmobPlugin : CDVPlugin<GADBannerViewDelegate, GADFullScreenContentDelegate>
+{}
 @property(nonatomic, strong) GADAppOpenAd *appOpenAd;
 @property(nonatomic, strong) GADBannerView *bannerView;
 @property(nonatomic, strong) GADInterstitialAd *interstitial;
 @property(nonatomic, strong) GADRewardedInterstitialAd* rewardedInterstitialAd;
 @property(nonatomic, strong) GADRewardedAd *rewardedAd;
 @property(nonatomic, readonly) BOOL isPrivacyOptionsRequired;
+@property(nonatomic, strong) CDVInvokedUrlCommand *command;
+@property(nonatomic, strong) GADResponseInfo *responseInfo;
 - (void)initialize:(CDVInvokedUrlCommand *)command;
 - (void)requestIDFA:(CDVInvokedUrlCommand *)command;
 - (void)showPrivacyOptionsForm:(CDVInvokedUrlCommand *)command;
@@ -17,9 +20,9 @@
 - (void)getIabTfc:(CDVInvokedUrlCommand *)command;
 - (void)loadAppOpenAd:(CDVInvokedUrlCommand *)command;
 - (void)showAppOpenAd:(CDVInvokedUrlCommand *)command;
-- (void)loadBannerAdIOS:(CDVInvokedUrlCommand *)command;
+- (void)loadBannerAd:(CDVInvokedUrlCommand *)command;
 - (void)showBannerAd:(CDVInvokedUrlCommand *)command;
-- (void)hiddenAd:(CDVInvokedUrlCommand *)command;
+- (void)hideBannerAd:(CDVInvokedUrlCommand *)command;
 - (void)removeBannerAd:(CDVInvokedUrlCommand *)command;
 - (void)loadInterstitialAd:(CDVInvokedUrlCommand *)command;
 - (void)showInterstitialAd:(CDVInvokedUrlCommand *)command;
@@ -29,5 +32,3 @@
 - (void)showRewardedAd:(CDVInvokedUrlCommand *)command;
 - (void) fireEvent:(NSString *)obj event:(NSString *)eventName withData:(NSString *)jsonStr;
 @end
-
-

package/src/ios/emiAdmobPlugin.m

@@ -1,4 +1,3 @@
-
 #import "emiAdmobPlugin.h"
 #import <Cordova/CDVPlugin.h>
 #import <UserMessagingPlatform/UserMessagingPlatform.h>
@@ -11,16 +10,47 @@
 @synthesize interstitial;
 @synthesize rewardedInterstitialAd;
 @synthesize rewardedAd;
+@synthesize command;
+@synthesize responseInfo;
 @synthesize isPrivacyOptionsRequired;
 int idfaStatus = 0;
 int fromStatus = 0;
 int adFormat = 0;
 int adWidth = 320;
+BOOL auto_Show = NO;
+NSString *Npa = @"1";
+NSString *Position = @"bottom";
+BOOL EnableCollapsible = NO;
+BOOL ResponseInfo = NO;
 BOOL isIAB = NO;
+- (void) fireEvent:(NSString *)obj event:(NSString *)eventName withData:(NSString *)jsonStr {
+    NSString* js;
+    if(obj && [obj isEqualToString:@"window"]) {
+        js = [NSString stringWithFormat:@"var evt=document.createEvent(\"UIEvents\");evt.initUIEvent(\"%@\",true,false,window,0);window.dispatchEvent(evt);", eventName];
+    } else if(jsonStr && [jsonStr length]>0) {
+        js = [NSString stringWithFormat:@"javascript:cordova.fireDocumentEvent('%@',%@);", eventName, jsonStr];
+    } else {
+        js = [NSString stringWithFormat:@"javascript:cordova.fireDocumentEvent('%@');", eventName];
+    }
+    [self.commandDelegate evalJs:js];
+}
 - (void)pluginInitialize {
     isIAB = YES;
     [[NSUserDefaults standardUserDefaults] synchronize];
 }
+- (void)initialize:(CDVInvokedUrlCommand*)command {
+    GADMobileAds *ads = [GADMobileAds sharedInstance];
+    [ads startWithCompletionHandler:^(GADInitializationStatus *status) {
+        // Optional: Log each adapter's initialization latency.
+        NSDictionary *adapterStatuses = [status adapterStatusesByClassName];
+        for (NSString *adapter in adapterStatuses) {
+            GADAdapterStatus *adapterStatus = adapterStatuses[adapter];
+            NSLog(@"Adapter Name: %@, Description: %@, Latency: %f", adapter,
+                  adapterStatus.description, adapterStatus.latency);
+        }
+        [self fireEvent:@"" event:@"on.sdkInitialization" withData:nil];
+    }];
+}
 - (void)requestIDFA:(CDVInvokedUrlCommand*)command {
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
@@ -34,9 +64,9 @@ BOOL isIAB = NO;
                 idfaStatus = ATTrackingManagerAuthorizationStatusRestricted;
             } else if (status == ATTrackingManagerAuthorizationStatusNotDetermined) {
                 idfaStatus = ATTrackingManagerAuthorizationStatusNotDetermined;
-            } 
+            }
         }];
-        [self fireEvent:@"" event:@"on.getIDFA" withData:nil];
+        [self fireEvent:@"" event:@"on.getIDFA.status" withData:nil];
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:idfaStatus];
     } else {
         [self fireEvent:@"" event:@"on.getIDFA.error" withData:nil];
@@ -48,12 +78,12 @@ BOOL isIAB = NO;
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
     UMPRequestParameters *parameters = [[UMPRequestParameters alloc] init];
-   // UMPDebugSettings *debugSettings = [[UMPDebugSettings alloc] init];
-   // debugSettings.testDeviceIdentifiers = @[@"59156CDC-B042-4D81-A9FA-900869782912"];
-   // parameters.debugSettings = debugSettings;
-   // debugSettings.geography = UMPDebugGeographyEEA;
-        BOOL tagForUnderAgeOfConsent = [[command argumentAtIndex:0] boolValue];
-        parameters.tagForUnderAgeOfConsent = tagForUnderAgeOfConsent;
+    // UMPDebugSettings *debugSettings = [[UMPDebugSettings alloc] init];
+    // debugSettings.testDeviceIdentifiers = @[@"59156CDC-B042-4D81-A9FA-900869782912"];
+    // parameters.debugSettings = debugSettings;
+    // debugSettings.geography = UMPDebugGeographyEEA;
+    BOOL tagForUnderAgeOfConsent = [[command argumentAtIndex:0] boolValue];
+    parameters.tagForUnderAgeOfConsent = tagForUnderAgeOfConsent;
     [UMPConsentInformation.sharedInstance
      requestConsentInfoUpdateWithParameters:parameters
      completionHandler:^(NSError *_Nullable requestConsentError) {
@@ -63,56 +93,54 @@ BOOL isIAB = NO;
             return;
         }
         [UMPConsentForm loadAndPresentIfRequiredFromViewController:self.viewController
-                        completionHandler:^(NSError *loadAndPresentError) {
-                          if (loadAndPresentError) {
-                            // Consent gathering failed.
-                            NSLog(@"Error: %@", loadAndPresentError.localizedDescription);
-                            return;
-                          }
+                                                 completionHandler:^(NSError *loadAndPresentError) {
+            if (loadAndPresentError) {
+                // Consent gathering failed.
+                NSLog(@"Error: %@", loadAndPresentError.localizedDescription);
+                return;
+            }
             UMPFormStatus formStatus = UMPConsentInformation.sharedInstance.formStatus;
             if (formStatus == UMPFormStatusUnknown) {
                 fromStatus = 0;
-            } else if (formStatus == UMPFormStatusAvailable) {                
+            } else if (formStatus == UMPFormStatusAvailable) {
                 fromStatus = 1;
-                                                
-           } else if (formStatus == UMPFormStatusUnavailable) {
-                 fromStatus = 2;
-          }
+            } else if (formStatus == UMPFormStatusUnavailable) {
+                fromStatus = 2;
+            }
             [self fireEvent:@"" event:@"on.get.from.status" withData:nil];
-         }];
-        
+        }];
     }];
-     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:fromStatus];
+    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:fromStatus];
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
 - (void)showPrivacyOptionsForm:(CDVInvokedUrlCommand*)command {
     UMPRequestParameters *parameters = [[UMPRequestParameters alloc] init];
-   // UMPDebugSettings *debugSettings = [[UMPDebugSettings alloc] init];
-   // debugSettings.testDeviceIdentifiers = @[@"59156CDC-B042-4D81-A9FA-900869782912"];
-   // parameters.debugSettings = debugSettings;
-   // debugSettings.geography = UMPDebugGeographyEEA;
+    // UMPDebugSettings *debugSettings = [[UMPDebugSettings alloc] init];
+    // debugSettings.testDeviceIdentifiers = @[@"59156CDC-B042-4D81-A9FA-900869782912"];
+    // parameters.debugSettings = debugSettings;
+    // debugSettings.geography = UMPDebugGeographyEEA;
     BOOL tagForUnderAgeOfConsent = [[command argumentAtIndex:0] boolValue];
     parameters.tagForUnderAgeOfConsent = tagForUnderAgeOfConsent;
     [UMPConsentInformation.sharedInstance
-         requestConsentInfoUpdateWithParameters:parameters
-             completionHandler:^(NSError *_Nullable requestConsentError) {
-               // ...
-               [UMPConsentForm loadAndPresentIfRequiredFromViewController:self.viewController
-                   completionHandler:^(NSError *loadAndPresentError) {
-                   }];
-                         [self isPrivacyOptionsRequired];
-             }];
+     requestConsentInfoUpdateWithParameters:parameters
+     completionHandler:^(NSError *_Nullable requestConsentError) {
+        // ...
+        [UMPConsentForm loadAndPresentIfRequiredFromViewController:self.viewController
+                                                 completionHandler:^(NSError *loadAndPresentError) {
+        }];
+        [self isPrivacyOptionsRequired];
+    }];
     [UMPConsentForm presentPrivacyOptionsFormFromViewController:self.viewController completionHandler:^(NSError * _Nullable formError) {
         if (formError) {
-          // Handle the error.
-             NSLog(@"Error: %@", formError.localizedDescription);
+            // Handle the error.
+            NSLog(@"Error: %@", formError.localizedDescription);
             [self fireEvent:@"" event:@"on.getPrivacyOptionsFrom.error" withData:nil];
         }
-      }];
+    }];
 }
 - (BOOL)isPrivacyOptionsRequired {
-  return UMPConsentInformation.sharedInstance.privacyOptionsRequirementStatus ==
-         UMPPrivacyOptionsRequirementStatusRequired;
+    return UMPConsentInformation.sharedInstance.privacyOptionsRequirementStatus ==
+    UMPPrivacyOptionsRequirementStatusRequired;
 }
 - (void)getIabTfc:(CDVInvokedUrlCommand*)command {
     CDVPluginResult *pluginResult;
@@ -124,28 +152,27 @@ BOOL isIAB = NO;
         NSString *purposeConsents = [NSUserDefaults.standardUserDefaults
                                      stringForKey:@"IABTCF_PurposeConsents"] ?: @"";
         NSString *tCString = [NSUserDefaults.standardUserDefaults
-                                     stringForKey:@"IABTCF_TCString"] ?: @"";
+                              stringForKey:@"IABTCF_TCString"] ?: @"";
         NSInteger gdprApplies = [NSUserDefaults.standardUserDefaults
                                  integerForKey:@"IABTCF_gdprApplies"] ?: 0;
         [result setObject:[NSNumber numberWithInteger:CmpSdkVersion] forKey:@"IABTCF_CmpSdkVersion"];
         [result setObject:[NSNumber numberWithInteger:gdprApplies] forKey:@"IABTCF_gdprApplies"];
         [result setObject:[NSString stringWithString:purposeConsents] forKey:@"IABTCF_PurposeConsents"];
         [result setObject:[NSString stringWithString:tCString] forKey:@"IABTCF_TCString"];
-        
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:result];
         [self fireEvent:@"" event:@"on.getIabTfc" withData:nil];
     } else {
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
-    } 
+    }
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
 - (void)consentReset:(CDVInvokedUrlCommand*)command {
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
     @try {
-    [UMPConsentInformation.sharedInstance reset];
+        [UMPConsentInformation.sharedInstance reset];
     }@catch (NSException *exception) {
-     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:exception.reason];
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:exception.reason];
     }
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
@@ -154,9 +181,15 @@ BOOL isIAB = NO;
     NSString *callbackId = command.callbackId;
     BOOL setAppMuted = [[command argumentAtIndex:0] boolValue];
     float setAppVolume = [[command argumentAtIndex:1] floatValue];
+    NSString* npa = [command.arguments objectAtIndex:2];
+    BOOL enableCollapsible = [[command argumentAtIndex:3] boolValue];
+    BOOL responseInfo = [[command argumentAtIndex:4] boolValue];
     @try {
-    GADMobileAds.sharedInstance.applicationVolume = setAppVolume;
-    GADMobileAds.sharedInstance.applicationMuted = setAppMuted;
+        GADMobileAds.sharedInstance.applicationVolume = setAppVolume;
+        GADMobileAds.sharedInstance.applicationMuted = setAppMuted;
+        Npa = npa;
+        EnableCollapsible = enableCollapsible;
+        ResponseInfo = responseInfo;
     }@catch (NSException *exception) {
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:exception.reason];
     }
@@ -169,33 +202,20 @@ BOOL isIAB = NO;
     NSNumber *tagForUnderAgeOfConsent = [command argumentAtIndex:1];
     NSString *maxAdContentRating = [command argumentAtIndex:2];
     @try {
-    GADRequestConfiguration *requestConfiguration = GADMobileAds.sharedInstance.requestConfiguration;
+        GADRequestConfiguration *requestConfiguration = GADMobileAds.sharedInstance.requestConfiguration;
         requestConfiguration.tagForChildDirectedTreatment = TagForChildDirectedTreatment;
         requestConfiguration.tagForUnderAgeOfConsent = tagForUnderAgeOfConsent;
         requestConfiguration.maxAdContentRating = maxAdContentRating;
-        }@catch (NSException *exception) {
-            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:exception.reason];
-        }
+    }@catch (NSException *exception) {
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:exception.reason];
+    }
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
-- (void)initialize:(CDVInvokedUrlCommand*)command {
-    GADMobileAds *ads = [GADMobileAds sharedInstance];
-    [ads startWithCompletionHandler:^(GADInitializationStatus *status) {
-        // Optional: Log each adapter's initialization latency.
-        NSDictionary *adapterStatuses = [status adapterStatusesByClassName];
-        for (NSString *adapter in adapterStatuses) {
-            GADAdapterStatus *adapterStatus = adapterStatuses[adapter];
-            NSLog(@"Adapter Name: %@, Description: %@, Latency: %f", adapter,
-                  adapterStatus.description, adapterStatus.latency);
-        }
-        [self fireEvent:@"" event:@"on.sdkInitialization" withData:nil];
-    }];
-}
 - (GADAdSize)__AdSizeFromString:(NSString *)size
 {
-    if ([size isEqualToString:@"Anchored_adaptive"]) {
+    if ([size isEqualToString:@"ANCHORED"]) {
         return GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(adWidth);
-    } else if ([size isEqualToString:@"Inline_adaptive"]) {
+    } else if ([size isEqualToString:@"IN_LINE"]) {
         return  GADCurrentOrientationInlineAdaptiveBannerAdSizeWithWidth(adWidth);
     } else if ([size isEqualToString:@"BANNER"]) {
         return GADAdSizeBanner;
@@ -209,7 +229,7 @@ BOOL isIAB = NO;
         return GADAdSizeBanner;
     }
 }
-- (void)loadBannerAdIOS:(CDVInvokedUrlCommand*)command {
+- (void)loadBannerAd:(CDVInvokedUrlCommand*)command {
     if(self.bannerView) {
         NSLog(@"Admob banner has been initing");
         return;
@@ -218,33 +238,39 @@ BOOL isIAB = NO;
     NSString *callbackId = command.callbackId;
     adFormat = 3;
     if (adFormat == 3) {
-                UIView *parentView = [self.webView superview];
-                NSString* adUnitId = [command.arguments objectAtIndex:0];
-                NSNumber* x = [command.arguments objectAtIndex:1];
-                NSNumber* y = [command.arguments objectAtIndex:2];
-                NSString* size = [command.arguments objectAtIndex:3];
-                NSNumber* adaptiveWidth = [command.arguments objectAtIndex:4];
-                NSString* collapsible = [command.arguments objectAtIndex:5];
-                int intValue = [adaptiveWidth intValue];
-                adWidth = intValue;
-                float posX = [x floatValue];
-                float posY = [y floatValue];
-                GADAdSize sizes = [self __AdSizeFromString:size];
-                CGPoint origin = CGPointMake(posX,posY);
-                self.bannerView = [[GADBannerView alloc]
-                                   initWithAdSize:sizes
-                                   origin:origin];
-                GADExtras *extras = [[GADExtras alloc] init];
-                extras.additionalParameters = @{@"collapsible" : collapsible};
-                self.bannerView.adUnitID = adUnitId;
-                self.bannerView.rootViewController = self.viewController;
-                self.bannerView.delegate = self;
-                GADRequest *request = [GADRequest request];
-                [self.bannerView loadRequest:request];
-                [request registerAdNetworkExtras:extras];
-                self.bannerView.hidden = YES;
-                [parentView addSubview:self.bannerView];
-                [parentView bringSubviewToFront:self.bannerView];
+        UIView *parentView = [self.webView superview];
+        NSString* adUnitId = [command.arguments objectAtIndex:0];
+        // NSNumber* x = [command.arguments objectAtIndex:1];
+        //  NSNumber* y = [command.arguments objectAtIndex:2];
+        NSString* position = [command.arguments objectAtIndex:1];
+        NSString* size = [command.arguments objectAtIndex:2];
+        NSString* collapsible = [command.arguments objectAtIndex:3];
+        NSNumber* adaptive_Width = [command.arguments objectAtIndex:4];
+        BOOL autoShow = [[command argumentAtIndex:5] boolValue];
+        auto_Show = autoShow;
+        int intValue = [adaptive_Width intValue];
+        adWidth = intValue;
+        Position = position;
+        //  float posX = [x floatValue];
+        //   float posY = [y floatValue];
+        GADAdSize sizes = [self __AdSizeFromString:size];
+        //  CGPoint origin = CGPointMake(posX,posY);
+        self.bannerView = [[GADBannerView alloc]
+                           initWithAdSize:sizes];
+        GADRequest *request = [GADRequest request];
+        GADExtras *extras = [[GADExtras alloc] init];
+        if (EnableCollapsible){
+            extras.additionalParameters = @{@"collapsible" : collapsible};
+        }
+        extras.additionalParameters = @{@"npa": Npa};
+        [request registerAdNetworkExtras:extras];
+        self.bannerView.adUnitID = adUnitId;
+        self.bannerView.rootViewController = self.viewController;
+        self.bannerView.delegate = self;
+        [self.bannerView loadRequest:request];
+        self.bannerView.hidden = YES;
+        [parentView addSubview:self.bannerView];
+        [parentView bringSubviewToFront:self.bannerView];
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
     } else {
         NSLog(@"Admob Option invalid for banner");
@@ -257,24 +283,66 @@ BOOL isIAB = NO;
     NSString *callbackId = command.callbackId;
     if(self.bannerView) {
         self.bannerView.hidden = NO;
+        [self addBannerViewToView:command];
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
     } else {
+        [self fireEvent:@"" event:@"on.banner.failed.show" withData:nil];
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
     }
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
-- (void)hiddenAd:(CDVInvokedUrlCommand*)command {
+- (void)addBannerViewToView:(CDVInvokedUrlCommand*)command{
+    bannerView.translatesAutoresizingMaskIntoConstraints = NO;
+    [self.viewController.view addSubview:bannerView];
+    if ([Position isEqualToString:@"bottom"]){
+        [self.viewController.view addConstraints:@[
+            [NSLayoutConstraint constraintWithItem:bannerView
+                                         attribute:NSLayoutAttributeBottom
+                                         relatedBy:NSLayoutRelationEqual
+                                            toItem:self.viewController.view.safeAreaLayoutGuide
+                                         attribute:NSLayoutAttributeBottom
+                                        multiplier:1
+                                          constant:0
+            ],
+            [NSLayoutConstraint constraintWithItem:bannerView
+                                         attribute:NSLayoutAttributeCenterX
+                                         relatedBy:NSLayoutRelationEqual
+                                            toItem:self.viewController.view
+                                         attribute:NSLayoutAttributeCenterX
+                                        multiplier:1
+                                          constant:0]
+        ]];
+    } else {
+        [self.viewController.view addConstraints:@[
+            [NSLayoutConstraint constraintWithItem:bannerView
+                                         attribute:NSLayoutAttributeTop
+                                         relatedBy:NSLayoutRelationEqual
+                                            toItem:self.viewController.view.safeAreaLayoutGuide
+                                         attribute:NSLayoutAttributeTop
+                                        multiplier:1
+                                          constant:0],
+            [NSLayoutConstraint constraintWithItem:bannerView
+                                         attribute:NSLayoutAttributeCenterX
+                                         relatedBy:NSLayoutRelationEqual
+                                            toItem:self.viewController.view
+                                         attribute:NSLayoutAttributeCenterX
+                                        multiplier:1
+                                          constant:0]
+        ]];
+    }
+}
+- (void)hideBannerAd:(CDVInvokedUrlCommand*)command {
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
     if(self.bannerView) {
         self.bannerView.hidden = YES;
+        [self fireEvent:@"" event:@"on.banner.hide" withData:nil];
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
     } else {
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
     }
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
-
 - (void)removeBannerAd:(CDVInvokedUrlCommand*)command {
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
@@ -282,6 +350,7 @@ BOOL isIAB = NO;
         self.bannerView.hidden = YES;
         [self.bannerView removeFromSuperview];
         self.bannerView = nil;
+        [self fireEvent:@"" event:@"on.banner.remove" withData:nil];
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
     } else {
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
@@ -292,13 +361,19 @@ BOOL isIAB = NO;
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
     NSString* adUnitId = [command.arguments objectAtIndex:0];
-        adFormat = 1;
+    BOOL autoShow = [[command argumentAtIndex:1] boolValue];
+    auto_Show = autoShow;
+    adFormat = 1;
     self.appOpenAd = nil;
     if (adFormat == 1){
+        GADRequest *request = [GADRequest request];
+        GADExtras *extras = [[GADExtras alloc] init];
+        extras.additionalParameters = @{@"npa": Npa};
+        [request registerAdNetworkExtras:extras];
         [GADAppOpenAd loadWithAdUnitID:adUnitId
-         request:[GADRequest request]
-         orientation:UIInterfaceOrientationPortrait
-         completionHandler:^(GADAppOpenAd *ad, NSError *error) {
+                               request:request
+                           orientation:UIInterfaceOrientationPortrait
+                     completionHandler:^(GADAppOpenAd *ad, NSError *error) {
             if (error) {
                 [self fireEvent:@"" event:@"on.appOpenAd.failed.loaded" withData:nil];
                 NSLog(@"Failed to load App Open Ad ad with error: %@", [error localizedDescription]);
@@ -307,29 +382,38 @@ BOOL isIAB = NO;
             self.appOpenAd = ad;
             self.appOpenAd.fullScreenContentDelegate = self;
             [self fireEvent:@"" event:@"on.appOpenAd.loaded" withData:nil];
+            if (auto_Show){
+                if (self.appOpenAd && [self.appOpenAd
+                                       canPresentFromRootViewController:self.viewController
+                                       error:nil]) { [self.appOpenAd presentFromRootViewController:self.viewController];
+                } else {
+                    [self fireEvent:@"" event:@"on.appOpenAd.failed.show" withData:nil];
+                }}
         }];
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
     }
-    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
 - (void)showAppOpenAd:(CDVInvokedUrlCommand *)command {
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
     if (self.appOpenAd && [self.appOpenAd
-        canPresentFromRootViewController:self.viewController
-            error:nil]) { [self.appOpenAd presentFromRootViewController:self.viewController];
-               pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
-                               } else {                
-            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
-            [self fireEvent:@"" event:@"on.appOpenAd.failed.show" withData:nil];               
-             }
+                           canPresentFromRootViewController:self.viewController
+                           error:nil]) { [self.appOpenAd presentFromRootViewController:self.viewController];
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    } else {
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
+        [self fireEvent:@"" event:@"on.appOpenAd.failed.show" withData:nil];
+    }
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
 - (void)loadInterstitialAd:(CDVInvokedUrlCommand *)command {
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
-        NSString* adUnitId = [command.arguments objectAtIndex:0];
-        adFormat = 2;
+    NSString* adUnitId = [command.arguments objectAtIndex:0];
+    BOOL autoShow = [[command argumentAtIndex:1] boolValue];
+    auto_Show = autoShow;
+    adFormat = 2;
     if (adFormat == 2){
         GADRequest *request = [GADRequest request];
         [GADInterstitialAd
@@ -338,72 +422,94 @@ BOOL isIAB = NO;
          completionHandler:^(GADInterstitialAd *ad, NSError *error) {
             if (error) {
                 NSLog(@"Failed to load interstitial ad with error: %@", [error localizedDescription]);
+                // [self fireEvent:@"" event:@"on.interstitial.failed.load" withData:nil];
                 return;
             }
             self.interstitial = ad;
             self.interstitial.fullScreenContentDelegate = self;
             [self fireEvent:@"" event:@"on.interstitial.loaded" withData:nil];
+            if (auto_Show){
+                if (self.interstitial && [self.interstitial
+                                          canPresentFromRootViewController:self.viewController error:nil]) {
+                    [self.interstitial presentFromRootViewController:self.viewController];
+                } else {
+                    [self fireEvent:@"" event:@"on.interstitial.failed.show" withData:nil];
+                }
+            }
         }];
     }
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
-    
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
 - (void)showInterstitialAd:(CDVInvokedUrlCommand *)command {
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
     if (self.interstitial && [self.interstitial
-        canPresentFromRootViewController:self.viewController error:nil]) {
-        
-           [self.interstitial presentFromRootViewController:self.viewController];
-           pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
-      } else {
-                pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
-                [self fireEvent:@"" event:@"on.interstitial.failed.show" withData:nil];
-                               }
+                              canPresentFromRootViewController:self.viewController error:nil]) {
+        [self.interstitial presentFromRootViewController:self.viewController];
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    } else {
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
+        [self fireEvent:@"" event:@"on.interstitial.failed.show" withData:nil];
+    }
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
 - (void)loadRewardedInterstitialAd:(CDVInvokedUrlCommand*)command {
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
     NSString* adUnitId = [command.arguments objectAtIndex:0];
+    BOOL autoShow = [[command argumentAtIndex:1] boolValue];
+    auto_Show = autoShow;
     adFormat = 4;
-if (adFormat == 4){
+    if (adFormat == 4){
         GADRequest *request = [GADRequest request];
-          [GADRewardedInterstitialAd
-           loadWithAdUnitID:adUnitId
-                           request:request
-              completionHandler:^(GADRewardedInterstitialAd *ad, NSError *error) {
-                if (error) {
-                  NSLog(@"Rewarded ad failed to load with error: %@", [error localizedDescription]);
-                  return;
+        [GADRewardedInterstitialAd
+         loadWithAdUnitID:adUnitId
+         request:request
+         completionHandler:^(GADRewardedInterstitialAd *ad, NSError *error) {
+            if (error) {
+                NSLog(@"Rewarded ad failed to load with error: %@", [error localizedDescription]);
+                return;
+            }
+            self.rewardedInterstitialAd = ad;
+            NSLog(@"Rewarded ad loaded.");
+            self.rewardedInterstitialAd.fullScreenContentDelegate = self;
+            [self fireEvent:@"" event:@"on.rewardedInt.loaded" withData:nil];
+            if (auto_Show){
+                if (self.rewardedInterstitialAd && [self.rewardedInterstitialAd canPresentFromRootViewController:self.viewController error:nil]) {
+                    [self.rewardedInterstitialAd presentFromRootViewController:self.viewController
+                                                      userDidEarnRewardHandler:^{
+                        GADAdReward *reward =
+                        self.rewardedInterstitialAd.adReward;
+                        [self fireEvent:@"" event:@"on.rewardedInt.userEarnedReward" withData:nil];
+                        NSString *rewardMessage = [NSString stringWithFormat:@"Reward received with "
+                                                   @"currency %@ , amount %ld",
+                                                   reward.type, [reward.amount longValue]];
+                        NSLog(@"%@", rewardMessage);
+                    }];
+                } else {
+                    [self fireEvent:@"" event:@"on.rewardedInt.failed.show" withData:nil];
                 }
-                self.rewardedInterstitialAd = ad;
-                NSLog(@"Rewarded ad loaded.");
-                self.rewardedInterstitialAd.fullScreenContentDelegate = self;
-                [self fireEvent:@"" event:@"on.rewardedInt.loaded" withData:nil];
-              }];
+            }
+        }];
     }
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
- -(void)showRewardedInterstitialAd:(CDVInvokedUrlCommand *)command {
+-(void)showRewardedInterstitialAd:(CDVInvokedUrlCommand *)command {
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
     if (self.rewardedInterstitialAd && [self.rewardedInterstitialAd canPresentFromRootViewController:self.viewController error:nil]) {
-
         [self.rewardedInterstitialAd presentFromRootViewController:self.viewController
-                                      userDidEarnRewardHandler:^{
-                                      GADAdReward *reward =
-                                      self.rewardedInterstitialAd.adReward;
-        [self fireEvent:@"" event:@"on.rewardedInt.userEarnedReward" withData:nil];
-            
-        NSString *rewardMessage = [NSString stringWithFormat:@"Reward received with "
-                                                          @"currency %@ , amount %ld",
-                                                          reward.type, [reward.amount longValue]];
-                           NSLog(@"%@", rewardMessage);
-            
-                                    }];
+                                          userDidEarnRewardHandler:^{
+            GADAdReward *reward =
+            self.rewardedInterstitialAd.adReward;
+            [self fireEvent:@"" event:@"on.rewardedInt.userEarnedReward" withData:nil];
+            NSString *rewardMessage = [NSString stringWithFormat:@"Reward received with "
+                                       @"currency %@ , amount %ld",
+                                       reward.type, [reward.amount longValue]];
+            NSLog(@"%@", rewardMessage);
+        }];
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
     } else {
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
@@ -412,45 +518,57 @@ if (adFormat == 4){
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
 - (void)loadRewardedAd:(CDVInvokedUrlCommand*)command {
-    
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
     NSString* adUnitId = [command.arguments objectAtIndex:0];
+    BOOL autoShow = [[command argumentAtIndex:1] boolValue];
+    auto_Show = autoShow;
     adFormat = 3;
-if (adFormat == 3){
+    if (adFormat == 3){
         GADRequest *request = [GADRequest request];
-          [GADRewardedAd
-           loadWithAdUnitID:adUnitId
-                           request:request
-              completionHandler:^(GADRewardedAd *ad, NSError *error) {
-                if (error) {
-                  NSLog(@"Rewarded ad failed to load with error: %@", [error localizedDescription]);
-                  return;
+        [GADRewardedAd
+         loadWithAdUnitID:adUnitId
+         request:request
+         completionHandler:^(GADRewardedAd *ad, NSError *error) {
+            if (error) {
+                NSLog(@"Rewarded ad failed to load with error: %@", [error localizedDescription]);
+                return;
+            }
+            self.rewardedAd = ad;
+            NSLog(@"Rewarded ad loaded.");
+            self.rewardedAd.fullScreenContentDelegate = self;
+            [self fireEvent:@"" event:@"on.rewarded.loaded" withData:nil];
+            if (auto_Show){
+                if (self.rewardedAd && [self.rewardedAd canPresentFromRootViewController:self.viewController error:nil]) {
+                    [self.rewardedAd presentFromRootViewController:self.viewController
+                                          userDidEarnRewardHandler:^{
+                        GADAdReward *reward =
+                        self.rewardedAd.adReward;
+                        [self fireEvent:@"" event:@"on.reward.userEarnedReward" withData:nil];
+                        NSString *rewardMessage = [NSString stringWithFormat:@"Reward received with currency %@ , amount %lf", reward.type, [reward.amount doubleValue]];
+                        NSLog(@"%@", rewardMessage);
+                    }];
+                } else {
+                    [self fireEvent:@"" event:@"on.rewarded.failed.show" withData:nil];
                 }
-                self.rewardedAd = ad;
-                NSLog(@"Rewarded ad loaded.");
-                self.rewardedAd.fullScreenContentDelegate = self;
-                [self fireEvent:@"" event:@"on.rewarded.loaded" withData:nil];
-              }];
+            }
+        }];
     }
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
- -(void)showRewardedAd:(CDVInvokedUrlCommand *)command {
+-(void)showRewardedAd:(CDVInvokedUrlCommand *)command {
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
     if (self.rewardedAd && [self.rewardedAd canPresentFromRootViewController:self.viewController error:nil]) {
-
         [self.rewardedAd presentFromRootViewController:self.viewController
-                                      userDidEarnRewardHandler:^{
-                                      GADAdReward *reward =
-                                          self.rewardedAd.adReward;
-       [self fireEvent:@"" event:@"on.reward.userEarnedReward" withData:nil];
-            
-    NSString *rewardMessage = [NSString stringWithFormat:@"Reward received with currency %@ , amount %lf", reward.type, [reward.amount doubleValue]];
-                                             NSLog(@"%@", rewardMessage);
-                                      
-                                    }];
+                              userDidEarnRewardHandler:^{
+            GADAdReward *reward =
+            self.rewardedAd.adReward;
+            [self fireEvent:@"" event:@"on.reward.userEarnedReward" withData:nil];
+            NSString *rewardMessage = [NSString stringWithFormat:@"Reward received with currency %@ , amount %lf", reward.type, [reward.amount doubleValue]];
+            NSLog(@"%@", rewardMessage);
+        }];
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
     } else {
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
@@ -458,21 +576,18 @@ if (adFormat == 3){
     }
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
-- (void) fireEvent:(NSString *)obj event:(NSString *)eventName withData:(NSString *)jsonStr {
-    NSString* js;
-    if(obj && [obj isEqualToString:@"window"]) {
-        js = [NSString stringWithFormat:@"var evt=document.createEvent(\"UIEvents\");evt.initUIEvent(\"%@\",true,false,window,0);window.dispatchEvent(evt);", eventName];
-    } else if(jsonStr && [jsonStr length]>0) {
-        js = [NSString stringWithFormat:@"javascript:cordova.fireDocumentEvent('%@',%@);", eventName, jsonStr];
-    } else {
-        js = [NSString stringWithFormat:@"javascript:cordova.fireDocumentEvent('%@');", eventName];
-    }
-    [self.commandDelegate evalJs:js];
-}
 #pragma mark GADBannerViewDelegate implementation
 - (void)bannerViewDidReceiveAd:(GADBannerView *)bannerView {
     [self fireEvent:@"" event:@"on.banner.load" withData:nil];
-  NSLog(@"bannerViewDidReceiveAd");
+    NSLog(@"bannerViewDidReceiveAd");
+    if (auto_Show){
+        if(self.bannerView) {
+            [self addBannerViewToView:command];
+            self.bannerView.hidden = NO; 
+        }
+    } else {
+        [self fireEvent:@"" event:@"on.banner.failed.show" withData:nil];
+    }
 }
 - (void)bannerView:(GADBannerView *)bannerView didFailToReceiveAdWithError:(NSError *)error {
     [self fireEvent:@"" event:@"on.banner.failed.load" withData:nil];
@@ -500,13 +615,12 @@ if (adFormat == 3){
         [self fireEvent:@"" event:@"on.appOpenAd.show" withData:nil];
         NSLog(@"Ad will present full screen content App Open Ad.");
     } else if (adFormat == 2){
-        
         [self fireEvent:@"" event:@"on.interstitial.show" withData:nil];
         [self fireEvent:@"" event:@"onPresentAd" withData:nil];
         NSLog(@"Ad will present full screen content interstitial.");
     } else if (adFormat == 3) {
         [self fireEvent:@"" event:@"on.rewarded.show" withData:nil];
-        NSLog(@"Ad will present full screen content rewarded."); 
+        NSLog(@"Ad will present full screen content rewarded.");
     } else if (adFormat == 4) {
         [self fireEvent:@"" event:@"on.rewardedInt.showed" withData:nil];
         NSLog(@"Ad will present full screen content interstitial rewarded.");
@@ -524,7 +638,7 @@ if (adFormat == 3){
         NSLog(@"Ad failed to present full screen content with error rewarded %@.", [error localizedDescription]);
     } else if (adFormat == 4) {
         [self fireEvent:@"" event:@"on.rewardedInt.failed.load" withData:nil];
-        NSLog(@"Ad failed to present full screen content with error interstitial rewarded %@.", [error localizedDescription]); 
+        NSLog(@"Ad failed to present full screen content with error interstitial rewarded %@.", [error localizedDescription]);
     }
 }
 - (void)adDidDismissFullScreenContent:(id)ad {
@@ -551,4 +665,3 @@ if (adFormat == 3){
     self.rewardedInterstitialAd = nil;
 }
 @end
-

package/www/emiAdmobPlugin.js

@@ -1,69 +1,61 @@
 var exec = require('cordova/exec');
-
 exports.initialize = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'initialize', []);
 };
-
+exports.getIabTfc = function (success, error) {
+    exec(success, error, 'emiAdmobPlugin', 'getIabTfc', []);
+};
+exports.showPrivacyOptionsForm = function (success, error) {
+    exec(success, error, 'emiAdmobPlugin', 'showPrivacyOptionsForm', []);
+};
 exports.loadAppOpenAd = function (arg0, arg1, success, error) {
     exec(success, error, 'emiAdmobPlugin', 'loadAppOpenAd', [arg0, arg1]);
 };
-
 exports.showAppOpenAd = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'showAppOpenAd', []);
 };
-
 exports.loadBannerAd = function (arg0, arg1, arg2, arg3, arg4, arg5, success, error) {
     exec(success, error, 'emiAdmobPlugin', 'loadBannerAd', [arg0, arg1, arg2, arg3, arg4, arg5]);
 };
-
+exports.requestIDFA = function (success, error) {
+        exec(success, error, 'emiAdmobPlugin', 'requestIDFA', []);
+};
 exports.showBannerAd = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'showBannerAd', []);
 };
-
+exports.hideBannerAd = function (success, error) {
+        exec(success, error, 'emiAdmobPlugin', 'hideBannerAd', []);
+};
 exports.removeBannerAd = function (arg0, success, error) {
     exec(success, error, 'emiAdmobPlugin', 'removeBannerAd', [arg0]);
 };
-
-exports.hideBannerAd = function (success, error) {
-    exec(success, error, 'emiAdmobPlugin', 'hideBannerAd', []);
-};
-
 exports.loadInterstitialAd = function (arg0, arg1, success, error) {
     exec(success, error, 'emiAdmobPlugin', 'loadInterstitialAd', [arg0, arg1]);
 };
-
 exports.showInterstitialAd = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'showInterstitialAd', []);
 };
-
 exports.loadRewardedAd = function (arg0, arg1, success, error) {
     exec(success, error, 'emiAdmobPlugin', 'loadRewardedAd', [arg0, arg1]);
 };
-
 exports.showRewardedAd = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'showRewardedAd', []);
 };
-
 exports.loadRewardedInterstitialAd = function (arg0, arg1, success, error) {
     exec(success, error, 'emiAdmobPlugin', 'loadRewardedInterstitialAd', [arg0, arg1]);
 };
-
 exports.showRewardedInterstitialAd = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'showRewardedInterstitialAd', []);
 };
-
 exports.getConsentRequest = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'getConsentRequest', []);
 };
-
 exports.consentReset = function (success, error) {
     exec(success, error, 'emiAdmobPlugin', 'consentReset', []);
 };
-
 exports.targeting = function (arg0, arg1, arg2, success, error) {
     exec(success, error, 'emiAdmobPlugin', 'targeting', [arg0, arg1, arg2]);
 };
-
-exports.globalSettings = function (arg0, arg1, arg2, arg3, arg4, arg5, success, error) {
-    exec(success, error, 'emiAdmobPlugin', 'globalSettings', [arg0, arg1, arg2, arg3, arg4, arg5]);
+exports.globalSettings = function (arg0, arg1, arg2, arg3, arg4, success, error) {
+    exec(success, error, 'emiAdmobPlugin', 'globalSettings', [arg0, arg1, arg2, arg3, arg4]);
 };