emi-indo-cordova-plugin-admob 1.6.7 → 1.6.9

package/README.md

@@ -8,7 +8,7 @@
  - AdSense New [example ](https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/blob/main/example/www/js/adSense.js)
 
 
-### Mobile Ads SDK (Android: 23.5.0) [Release Notes:](https://developers.google.com/admob/android/rel-notes)
+### Mobile Ads SDK (Android: 23.6.0) [Release Notes:](https://developers.google.com/admob/android/rel-notes)
 ### User Messaging Platform (UMP Android: 3.1.0) [Release Notes:](https://developers.google.com/admob/android/privacy/release-notes)
 
 ### Mobile Ads SDK (IOS: 11.12.0) [Release Notes:](https://developers.google.com/admob/ios/rel-notes)

package/example/www/js/bannerAd.js

@@ -114,7 +114,8 @@ on.banner.hide
 
 // EVENT For example
 
-document.addEventListener('on.banner.load', () => {
+document.addEventListener('on.banner.load', (arg) => {
+    let bannerAdHeight=arg.height;
     console.log("on banner load");
 });
 

package/example/www/js/deviceready.js

@@ -80,8 +80,17 @@ document.addEventListener("deviceready", function () {
         
         cordova.plugins.emiAdmobPlugin.requestIDFA(); // requestTrackingAuthorization
         
-    }
-    
+    } 
+
+
+   // deactivate Google's consent
+    /*
+     cordova.plugins.emiAdmobPlugin.metaData({
+
+            useCustomConsentManager: false // Default false only android
+
+    });
+    */
 
     // AdMob Sdk initialize
     
@@ -121,4 +130,4 @@ document.addEventListener("deviceready", function () {
 
 
 
-}, false);
+}, false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "1.6.7",
+  "version": "1.6.9",
   "description": "Cordova Plugin Admob Android IOS Support Capacitor",
   "cordova": {
     "id": "emi-indo-cordova-plugin-admob",

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.6.7">
+  id="emi-indo-cordova-plugin-admob" version="1.6.9">
 
   <name>emiAdmobPlugin</name>
   <description>Cordova Plugin Admob Android IOS</description>
@@ -40,10 +40,7 @@
       <uses-permission android:name="android.permission.INTERNET" />
       <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     </config-file>
-    
-    <config-file parent="./application" target="AndroidManifest.xml">
-            <property android:name="android.adservices.AD_SERVICES_CONFIG" android:resource="@xml/gma_ad_services_config" tools:replace="android:resource" />
-    </config-file>
+
 
     <config-file target="AndroidManifest.xml" parent="/manifest/application">
       <activity
@@ -67,7 +64,7 @@
     <!-- Sample AdMob app ID: ca-app-pub-3940256099942544~3347511713 -->
 
     <preference name="APP_ID_ANDROID" default="ca-app-pub-3940256099942544~3347511713" />
-    <preference name="PLAY_SERVICES_VERSION" default="23.5.0" />
+    <preference name="PLAY_SERVICES_VERSION" default="23.6.0" />
 
     <framework src="com.google.android.gms:play-services-ads:$PLAY_SERVICES_VERSION" />
 
@@ -309,4 +306,4 @@
     </podspec>
 
   </platform>
-</plugin>
+</plugin>

package/src/android/emiAdmobPlugin.kt

@@ -1132,8 +1132,8 @@ class emiAdmobPlugin : CordovaPlugin() {
                         editor.putString("IABTCF_TCString", consentString)
                         editor.putLong(LAST_ACCESS_SUFFIX, System.currentTimeMillis())
                         editor.apply()
-                        val key = "IABTCF_TCString"
-                        getString(key)
+                        //val key = "IABTCF_TCString"
+                        getString(consentString.toString())
                         callbackContext.success(userInfoJson)
                         cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.getIabTfc');")
                     } catch (e: Exception) {
@@ -1523,7 +1523,11 @@ class emiAdmobPlugin : CordovaPlugin() {
                 bannerOverlapping()
             }
 
-            cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.banner.load');")
+            val bannerHeight= adSize.height;
+
+            val bannerLoadEventData = String.format(Locale.US, "{\"height\": %d}", bannerHeight)
+
+            cWebView!!.loadUrl("javascript:cordova.fireDocumentEvent('on.banner.load', $bannerLoadEventData);")
 
             val eventData = String.format(
                 "{\"collapsible\": \"%s\"}",
@@ -1600,13 +1604,12 @@ class emiAdmobPlugin : CordovaPlugin() {
 
 
 
-
     // fix https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/issues/26
     private fun bannerOverlapping() {
         if (bannerView != null && mActivity != null && cWebView != null) {
             mActivity!!.runOnUiThread {
                 try {
-                    val bannerHeightInPx = bannerView!!.height
+                   // val bannerHeightInPx = bannerView!!.height
                     val displayMetrics = DisplayMetrics()
                     mActivity!!.windowManager.defaultDisplay.getMetrics(displayMetrics)
                     val screenHeightInPx = displayMetrics.heightPixels
@@ -1630,6 +1633,8 @@ class emiAdmobPlugin : CordovaPlugin() {
 
 
 
+
+
     private val bannerPaidAdListener = OnPaidEventListener { adValue ->
         val valueMicros = adValue.valueMicros
         val currencyCode = adValue.currencyCode
@@ -1787,7 +1792,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                     try {
                         (brandSafetyUrls as ArrayList<String>).add(brandSafetyArr.getString(i))
                     } catch (e: JSONException) {
-                         e.printStackTrace();
+                        e.printStackTrace();
                     }
                 }
             }
@@ -1796,7 +1801,7 @@ class emiAdmobPlugin : CordovaPlugin() {
             this.ppIdVl = ppId
             this.cURLVl = ctURL
         } catch (e: JSONException) {
-              e.printStackTrace();
+            e.printStackTrace();
         }
     }
 
@@ -1810,7 +1815,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                 }
             }
         } catch (e: JSONException) {
-             e.printStackTrace();
+            e.printStackTrace();
         }
     }
 
@@ -2001,7 +2006,7 @@ class emiAdmobPlugin : CordovaPlugin() {
                     }
                     return sb.toString().uppercase(Locale.getDefault())
                 } catch (ex: NoSuchAlgorithmException) {
-                    // ex.printStackTrace();
+                     ex.printStackTrace();
                     return null
                 }
             }

package/src/ios/emiAdmobPlugin.m

@@ -1446,8 +1446,19 @@ BOOL isUsingAdManagerRequest = YES;
         NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
         [self fireEvent:@"" event:@"on.is.collapsible" withData:jsonString];
     }
+    
+    // Get the banner height
+    CGFloat bannerHeight = bannerView.bounds.size.height;
+
 
-    [self fireEvent:@"" event:@"on.banner.load" withData:nil];
+    
+    // Prepare height data for banner load event
+    NSDictionary *bannerLoadData = @{@"height" : @(bannerHeight)};
+    NSData *bannerLoadJsonData = [NSJSONSerialization dataWithJSONObject:bannerLoadData options:0 error:&error];
+    NSString *bannerLoadJsonString = [[NSString alloc] initWithData:bannerLoadJsonData encoding:NSUTF8StringEncoding];
+    
+    // Fire the banner load event with the height data
+    [self fireEvent:@"" event:@"on.banner.load" withData:bannerLoadJsonString];
     
     if (auto_Show && self.bannerView) {
         [self addBannerViewToView:command];