cordova-admob-tomitank 1.0.10 → 1.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/api.d.ts +3 -4
- package/esm/api.js +1 -12
- package/esm/api.js.map +1 -1
- package/lib/api.d.ts +3 -4
- package/lib/api.js +1 -12
- package/lib/api.js.map +1 -1
- package/package.json +1 -1
- package/plugin.xml +1 -1
- package/src/ios/AMBPlugin.swift +16 -26
- package/src/www/api.ts +4 -16
- package/www/admob.js +1 -12
package/esm/api.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { execAsync, AdSizeType, Events, NativeActions } from './generated';
|
|
2
2
|
/** @internal */
|
|
3
3
|
export declare type MobileAdOptions = {
|
|
4
|
-
id?:
|
|
4
|
+
id?: string;
|
|
5
5
|
adUnitId: string;
|
|
6
6
|
contentUrl?: string;
|
|
7
7
|
keywords?: string[];
|
|
@@ -16,13 +16,12 @@ export declare class MobileAd<T extends MobileAdOptions = MobileAdOptions> {
|
|
|
16
16
|
static readonly type: string;
|
|
17
17
|
private static allAds;
|
|
18
18
|
private static idCounter;
|
|
19
|
-
readonly id:
|
|
19
|
+
readonly id: string;
|
|
20
20
|
protected readonly opts: T;
|
|
21
21
|
private _created;
|
|
22
22
|
private _init;
|
|
23
23
|
constructor(opts: T);
|
|
24
|
-
static getAdById(id:
|
|
25
|
-
private static nextId;
|
|
24
|
+
static getAdById(id: string): any;
|
|
26
25
|
get adUnitId(): string;
|
|
27
26
|
on(...args: Parameters<typeof document.addEventListener>): () => void;
|
|
28
27
|
protected isLoaded(): Promise<boolean>;
|
package/esm/api.js
CHANGED
|
@@ -82,23 +82,12 @@ var MobileAd = /** @class */ (function () {
|
|
|
82
82
|
this._created = false;
|
|
83
83
|
this._init = null;
|
|
84
84
|
this.opts = opts;
|
|
85
|
-
this.id = (_a = opts.id) !== null && _a !== void 0 ? _a :
|
|
85
|
+
this.id = (_a = opts.id) !== null && _a !== void 0 ? _a : opts.adUnitId;
|
|
86
86
|
MobileAd.allAds[this.id] = this;
|
|
87
87
|
}
|
|
88
88
|
MobileAd.getAdById = function (id) {
|
|
89
89
|
return this.allAds[id];
|
|
90
90
|
};
|
|
91
|
-
MobileAd.nextId = function () {
|
|
92
|
-
var storage = window.localStorage;
|
|
93
|
-
var key = 'admob-ad-id-counter';
|
|
94
|
-
var value = storage.getItem(key);
|
|
95
|
-
if (value !== null) {
|
|
96
|
-
MobileAd.idCounter = Number(value);
|
|
97
|
-
}
|
|
98
|
-
MobileAd.idCounter += 1;
|
|
99
|
-
storage.setItem(key, "".concat(MobileAd.idCounter));
|
|
100
|
-
return MobileAd.idCounter;
|
|
101
|
-
};
|
|
102
91
|
Object.defineProperty(MobileAd.prototype, "adUnitId", {
|
|
103
92
|
get: function () {
|
|
104
93
|
return this.opts.adUnitId;
|
package/esm/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/www/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEtD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAW1E,IAAI,OAAO,GAAG,KAAK,CAAA;AACnB,IAAI,YAAY,GAAwC,IAAI,CAAA;AAE5D,gBAAgB;AAChB,MAAM,UAAgB,KAAK;;;;;;oBACzB,YAAY,GAAG,SAAS,CAAC,aAAa,CAAC,KAAK,CAAiC,CAAA;oBAC9D,qBAAM,YAAY,EAAA;;oBAA3B,MAAM,GAAG,SAAkB;oBACjC,OAAO,GAAG,IAAI,CAAA;oBACd,sBAAO,MAAM,EAAA;;;;CACd;AAED,gBAAgB;AAChB;IAYE,kBAAY,IAAO;;QAHX,aAAQ,GAAG,KAAK,CAAA;QAChB,UAAK,GAAwB,IAAI,CAAA;QAGvC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAEhB,IAAI,CAAC,EAAE,GAAG,MAAA,IAAI,CAAC,EAAE,mCAAI,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/www/api.ts"],"names":[],"mappings":"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"}
|
package/lib/api.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { execAsync, AdSizeType, Events, NativeActions } from './generated';
|
|
2
2
|
/** @internal */
|
|
3
3
|
export declare type MobileAdOptions = {
|
|
4
|
-
id?:
|
|
4
|
+
id?: string;
|
|
5
5
|
adUnitId: string;
|
|
6
6
|
contentUrl?: string;
|
|
7
7
|
keywords?: string[];
|
|
@@ -16,13 +16,12 @@ export declare class MobileAd<T extends MobileAdOptions = MobileAdOptions> {
|
|
|
16
16
|
static readonly type: string;
|
|
17
17
|
private static allAds;
|
|
18
18
|
private static idCounter;
|
|
19
|
-
readonly id:
|
|
19
|
+
readonly id: string;
|
|
20
20
|
protected readonly opts: T;
|
|
21
21
|
private _created;
|
|
22
22
|
private _init;
|
|
23
23
|
constructor(opts: T);
|
|
24
|
-
static getAdById(id:
|
|
25
|
-
private static nextId;
|
|
24
|
+
static getAdById(id: string): any;
|
|
26
25
|
get adUnitId(): string;
|
|
27
26
|
on(...args: Parameters<typeof document.addEventListener>): () => void;
|
|
28
27
|
protected isLoaded(): Promise<boolean>;
|
package/lib/api.js
CHANGED
|
@@ -90,23 +90,12 @@ var MobileAd = /** @class */ (function () {
|
|
|
90
90
|
this._created = false;
|
|
91
91
|
this._init = null;
|
|
92
92
|
this.opts = opts;
|
|
93
|
-
this.id = (_a = opts.id) !== null && _a !== void 0 ? _a :
|
|
93
|
+
this.id = (_a = opts.id) !== null && _a !== void 0 ? _a : opts.adUnitId;
|
|
94
94
|
MobileAd.allAds[this.id] = this;
|
|
95
95
|
}
|
|
96
96
|
MobileAd.getAdById = function (id) {
|
|
97
97
|
return this.allAds[id];
|
|
98
98
|
};
|
|
99
|
-
MobileAd.nextId = function () {
|
|
100
|
-
var storage = window.localStorage;
|
|
101
|
-
var key = 'admob-ad-id-counter';
|
|
102
|
-
var value = storage.getItem(key);
|
|
103
|
-
if (value !== null) {
|
|
104
|
-
MobileAd.idCounter = Number(value);
|
|
105
|
-
}
|
|
106
|
-
MobileAd.idCounter += 1;
|
|
107
|
-
storage.setItem(key, "".concat(MobileAd.idCounter));
|
|
108
|
-
return MobileAd.idCounter;
|
|
109
|
-
};
|
|
110
99
|
Object.defineProperty(MobileAd.prototype, "adUnitId", {
|
|
111
100
|
get: function () {
|
|
112
101
|
return this.opts.adUnitId;
|
package/lib/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/www/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAsD;AAEtD,yCAA0E;AAAjE,sGAAA,SAAS,OAAA;AAAE,uGAAA,UAAU,OAAA;AAAE,mGAAA,MAAM,OAAA;AAAE,0GAAA,aAAa,OAAA;AAWrD,IAAI,OAAO,GAAG,KAAK,CAAA;AACnB,IAAI,YAAY,GAAwC,IAAI,CAAA;AAE5D,gBAAgB;AAChB,SAAsB,KAAK;;;;;;oBACzB,YAAY,GAAG,IAAA,qBAAS,EAAC,yBAAa,CAAC,KAAK,CAAiC,CAAA;oBAC9D,qBAAM,YAAY,EAAA;;oBAA3B,MAAM,GAAG,SAAkB;oBACjC,OAAO,GAAG,IAAI,CAAA;oBACd,sBAAO,MAAM,EAAA;;;;CACd;AALD,sBAKC;AAED,gBAAgB;AAChB;IAYE,kBAAY,IAAO;;QAHX,aAAQ,GAAG,KAAK,CAAA;QAChB,UAAK,GAAwB,IAAI,CAAA;QAGvC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAEhB,IAAI,CAAC,EAAE,GAAG,MAAA,IAAI,CAAC,EAAE,mCAAI,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/www/api.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/plugin.xml
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<?xml version='1.0' encoding='utf-8'?>
|
|
2
|
-
<plugin id="cordova-admob-tomitank" version="1.0.
|
|
2
|
+
<plugin id="cordova-admob-tomitank" version="1.0.12"
|
|
3
3
|
xmlns="http://apache.org/cordova/ns/plugins/1.0"
|
|
4
4
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
|
5
5
|
<name>cordova-admob-tomitank</name>
|
package/src/ios/AMBPlugin.swift
CHANGED
|
@@ -16,9 +16,6 @@ class AMBPlugin: CDVPlugin {
|
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
override func pluginInitialize() {
|
|
19
|
-
|
|
20
|
-
print("DEBUG - Initialize..")
|
|
21
|
-
|
|
22
19
|
super.pluginInitialize()
|
|
23
20
|
|
|
24
21
|
AMBContext.plugin = self
|
|
@@ -44,25 +41,7 @@ class AMBPlugin: CDVPlugin {
|
|
|
44
41
|
|
|
45
42
|
@objc func configRequest(_ command: CDVInvokedUrlCommand) {
|
|
46
43
|
let ctx = AMBContext(command)
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
if let maxAdContentRating = ctx.optMaxAdContentRating() {
|
|
50
|
-
requestConfiguration.maxAdContentRating = maxAdContentRating
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
if let tag = ctx.optChildDirectedTreatmentTag() {
|
|
54
|
-
requestConfiguration.tag(forChildDirectedTreatment: tag)
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
if let tag = ctx.optUnderAgeOfConsentTag() {
|
|
58
|
-
requestConfiguration.tagForUnderAge(ofConsent: tag)
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
if let testDevices = ctx.optTestDeviceIds() {
|
|
62
|
-
requestConfiguration.testDeviceIdentifiers = testDevices
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
ctx.resolve()
|
|
44
|
+
ctx.configure()
|
|
66
45
|
}
|
|
67
46
|
|
|
68
47
|
@objc func requestTrackingAuthorization(_ command: CDVInvokedUrlCommand) {
|
|
@@ -79,9 +58,8 @@ class AMBPlugin: CDVPlugin {
|
|
|
79
58
|
|
|
80
59
|
@objc func start(_ command: CDVInvokedUrlCommand) {
|
|
81
60
|
let ctx = AMBContext(command)
|
|
82
|
-
|
|
83
61
|
GADMobileAds.sharedInstance().start(completionHandler: { _ in
|
|
84
|
-
ctx.resolve(["version": GADMobileAds.sharedInstance().
|
|
62
|
+
ctx.resolve(["version": GADGetStringFromVersionNumber(GADMobileAds.sharedInstance().versionNumber)])
|
|
85
63
|
})
|
|
86
64
|
}
|
|
87
65
|
|
|
@@ -132,7 +110,7 @@ class AMBPlugin: CDVPlugin {
|
|
|
132
110
|
if ad != nil {
|
|
133
111
|
ctx.resolve()
|
|
134
112
|
} else {
|
|
135
|
-
ctx.reject("fail to create ad: \(ctx.optId() ?? -
|
|
113
|
+
ctx.reject("fail to create ad: \(ctx.optId() ?? "-")")
|
|
136
114
|
}
|
|
137
115
|
} else {
|
|
138
116
|
ctx.reject()
|
|
@@ -193,9 +171,21 @@ class AMBPlugin: CDVPlugin {
|
|
|
193
171
|
}
|
|
194
172
|
}
|
|
195
173
|
|
|
174
|
+
@objc func webviewGoto(_ command: CDVInvokedUrlCommand) {
|
|
175
|
+
let ctx = AMBContext(command)
|
|
176
|
+
|
|
177
|
+
DispatchQueue.main.async {
|
|
178
|
+
if let url = URL(string: ctx.optWebviewGoto()+"#from_webview_goto") {
|
|
179
|
+
let webView = self.webViewEngine.engineWebView as! WKWebView
|
|
180
|
+
webView.load(URLRequest(url: url))
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
|
|
196
185
|
func emit(_ eventName: String, data: Any = NSNull()) {
|
|
197
186
|
let result = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: ["type": eventName, "data": data])
|
|
198
187
|
result?.setKeepCallbackAs(true)
|
|
199
188
|
self.commandDelegate.send(result, callbackId: readyCallbackId)
|
|
200
189
|
}
|
|
201
|
-
|
|
190
|
+
|
|
191
|
+
}
|
package/src/www/api.ts
CHANGED
|
@@ -4,7 +4,7 @@ export { execAsync, AdSizeType, Events, NativeActions } from './generated'
|
|
|
4
4
|
|
|
5
5
|
/** @internal */
|
|
6
6
|
export type MobileAdOptions = {
|
|
7
|
-
id?:
|
|
7
|
+
id?: string
|
|
8
8
|
adUnitId: string
|
|
9
9
|
contentUrl?: string
|
|
10
10
|
keywords?: string[]
|
|
@@ -29,7 +29,7 @@ export class MobileAd<T extends MobileAdOptions = MobileAdOptions> {
|
|
|
29
29
|
private static allAds: { [s: number]: MobileAd } = {}
|
|
30
30
|
private static idCounter = 0
|
|
31
31
|
|
|
32
|
-
public readonly id:
|
|
32
|
+
public readonly id: string
|
|
33
33
|
|
|
34
34
|
protected readonly opts: T
|
|
35
35
|
private _created = false
|
|
@@ -38,26 +38,14 @@ export class MobileAd<T extends MobileAdOptions = MobileAdOptions> {
|
|
|
38
38
|
constructor(opts: T) {
|
|
39
39
|
this.opts = opts
|
|
40
40
|
|
|
41
|
-
this.id = opts.id ??
|
|
41
|
+
this.id = opts.id ?? opts.adUnitId;
|
|
42
42
|
MobileAd.allAds[this.id] = this
|
|
43
43
|
}
|
|
44
44
|
|
|
45
|
-
public static getAdById(id:
|
|
45
|
+
public static getAdById(id: string) {
|
|
46
46
|
return this.allAds[id]
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
-
private static nextId() {
|
|
50
|
-
const storage = window.localStorage
|
|
51
|
-
const key = 'admob-ad-id-counter'
|
|
52
|
-
const value = storage.getItem(key)
|
|
53
|
-
if (value !== null) {
|
|
54
|
-
MobileAd.idCounter = Number(value)
|
|
55
|
-
}
|
|
56
|
-
MobileAd.idCounter += 1
|
|
57
|
-
storage.setItem(key, `${MobileAd.idCounter}`)
|
|
58
|
-
return MobileAd.idCounter
|
|
59
|
-
}
|
|
60
|
-
|
|
61
49
|
public get adUnitId() {
|
|
62
50
|
return this.opts.adUnitId
|
|
63
51
|
}
|
package/www/admob.js
CHANGED
|
@@ -233,23 +233,12 @@ var MobileAd = /** @class */ (function () {
|
|
|
233
233
|
this._created = false;
|
|
234
234
|
this._init = null;
|
|
235
235
|
this.opts = opts;
|
|
236
|
-
this.id = (_a = opts.id) !== null && _a !== void 0 ? _a :
|
|
236
|
+
this.id = (_a = opts.id) !== null && _a !== void 0 ? _a : opts.adUnitId;
|
|
237
237
|
MobileAd.allAds[this.id] = this;
|
|
238
238
|
}
|
|
239
239
|
MobileAd.getAdById = function (id) {
|
|
240
240
|
return this.allAds[id];
|
|
241
241
|
};
|
|
242
|
-
MobileAd.nextId = function () {
|
|
243
|
-
var storage = window.localStorage;
|
|
244
|
-
var key = 'admob-ad-id-counter';
|
|
245
|
-
var value = storage.getItem(key);
|
|
246
|
-
if (value !== null) {
|
|
247
|
-
MobileAd.idCounter = Number(value);
|
|
248
|
-
}
|
|
249
|
-
MobileAd.idCounter += 1;
|
|
250
|
-
storage.setItem(key, "".concat(MobileAd.idCounter));
|
|
251
|
-
return MobileAd.idCounter;
|
|
252
|
-
};
|
|
253
242
|
Object.defineProperty(MobileAd.prototype, "adUnitId", {
|
|
254
243
|
get: function () {
|
|
255
244
|
return this.opts.adUnitId;
|