diff --git a/Amazon/Amazon.asmdef b/Amazon/Amazon.asmdef index 04ce4ba..7d1153c 100644 --- a/Amazon/Amazon.asmdef +++ b/Amazon/Amazon.asmdef @@ -1,6 +1,6 @@ { "name": "Amazon", - "rootNamespace": "", + "rootNamespace": "AmazonAds", "references": [ "MaxSdk", "MaxSdk.Scripts" diff --git a/Amazon/Plugins/iOS.meta b/Amazon/Plugins/iOS.meta index 103e0d1..ed1612d 100644 --- a/Amazon/Plugins/iOS.meta +++ b/Amazon/Plugins/iOS.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fd97fc7641615462abc63e027208b9a2 +guid: 24337d8fd6824de408fd642c0e3146b9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Amazon/Plugins/iOS/Amazon-SDK-Plugin.podspec b/Amazon/Plugins/iOS/Amazon-SDK-Plugin.podspec index c7e21c1..b5c9f9a 100644 --- a/Amazon/Plugins/iOS/Amazon-SDK-Plugin.podspec +++ b/Amazon/Plugins/iOS/Amazon-SDK-Plugin.podspec @@ -11,6 +11,7 @@ Pod::Spec.new do |s| s.dependency 'AmazonPublisherServicesSDK' s.pod_target_xcconfig = { + 'ENABLE_BITCODE' => 'NO', 'OTHER_CPLUSPLUSFLAGS' => '-fcxx-modules', } -end +end \ No newline at end of file diff --git a/Amazon/Plugins/iOS/Amazon-SDK-Plugin.podspec.meta b/Amazon/Plugins/iOS/Amazon-SDK-Plugin.podspec.meta index 2ab557c..193c093 100644 --- a/Amazon/Plugins/iOS/Amazon-SDK-Plugin.podspec.meta +++ b/Amazon/Plugins/iOS/Amazon-SDK-Plugin.podspec.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ce7a667caa6f64752b219fe8edd61617 +guid: ef1aca82fadf5594c9294472e9a39a60 DefaultImporter: externalObjects: {} userData: diff --git a/Amazon/Plugins/iOS/AmazonBinding.m b/Amazon/Plugins/iOS/AmazonBinding.m index eb30853..7ad920b 100644 --- a/Amazon/Plugins/iOS/AmazonBinding.m +++ b/Amazon/Plugins/iOS/AmazonBinding.m @@ -162,10 +162,6 @@ void _addSlotGroup(DTBSlotGroup* slot){ [[AmazonManager sharedManager] addSlotGroup:slot]; } -const char* _fetchMoPubKeywords(DTBAdResponse* response){ - return amazonStringCopy([[AmazonManager sharedManager] fetchMoPubKeywords:response]); -} - const char* _fetchAmznSlots(DTBAdResponse* response){ return amazonStringCopy([[AmazonManager sharedManager] fetchAmznSlots:response]); } diff --git a/Amazon/Plugins/iOS/AmazonBinding.m.meta b/Amazon/Plugins/iOS/AmazonBinding.m.meta index bd71100..5903014 100644 --- a/Amazon/Plugins/iOS/AmazonBinding.m.meta +++ b/Amazon/Plugins/iOS/AmazonBinding.m.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bc75c2542fbb6469798f0dc4baf0100e +guid: 9d97bf664a8fcf944992cbb98d7bc72c PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Plugins/iOS/AmazonManager.h b/Amazon/Plugins/iOS/AmazonManager.h index 7735ac4..bcadcb0 100755 --- a/Amazon/Plugins/iOS/AmazonManager.h +++ b/Amazon/Plugins/iOS/AmazonManager.h @@ -46,7 +46,6 @@ -(DTBSlotGroup*)createSlotGroup:(NSString*)slotGroupName; -(void)addSlot:(DTBSlotGroup*)slot size:(DTBAdSize*)size; -(void)addSlotGroup:(DTBSlotGroup*)group; --(NSString*)fetchMoPubKeywords:(DTBAdResponse*)response; -(NSString*)fetchAmznSlots:(DTBAdResponse*)response; -(int)fetchAdWidth:(DTBAdResponse*)response; -(int)fetchAdHeight:(DTBAdResponse*)response; diff --git a/Amazon/Plugins/iOS/AmazonManager.h.meta b/Amazon/Plugins/iOS/AmazonManager.h.meta index dd4b61d..64384be 100644 --- a/Amazon/Plugins/iOS/AmazonManager.h.meta +++ b/Amazon/Plugins/iOS/AmazonManager.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9d0a8448aa0c147e8a0225de1609f269 +guid: 2e1cac3d96762d449875050ca121f4da PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Plugins/iOS/AmazonManager.mm b/Amazon/Plugins/iOS/AmazonManager.mm index 075dc1e..96ef36d 100644 --- a/Amazon/Plugins/iOS/AmazonManager.mm +++ b/Amazon/Plugins/iOS/AmazonManager.mm @@ -1,5 +1,7 @@ #import "AmazonManager.h" +static NSString * const SKADNETWORK_PARAM = @"skadn_params"; + @implementation AmazonManager #pragma mark NSObject @@ -182,9 +184,6 @@ [DTBAds.sharedInstance addSlotGroup:group]; } --(NSString*)fetchMoPubKeywords:(DTBAdResponse*)response { - return [response keywordsForMopub]; -} -(NSString*)fetchAmznSlots:(DTBAdResponse *)response { return [response amznSlots]; @@ -209,6 +208,27 @@ [dateFormatter setDateFormat:@"dd-MM-yyyy"]; NSString *stringDate = [dateFormatter stringFromDate:myDate]; [mHint setValue:stringDate forKey:@"load_start"]; + + if (mHint[SKADNETWORK_PARAM]) { + @try { + NSMutableDictionary *skadn_dict = [[NSMutableDictionary alloc] initWithDictionary:[mHint objectForKey:SKADNETWORK_PARAM]]; + for(id key in skadn_dict) { + if ([[skadn_dict objectForKey:key] isKindOfClass:NSDate.class]) { + NSString *FormatedDate = [dateFormatter stringFromDate:[skadn_dict objectForKey:key]]; + [skadn_dict setValue:FormatedDate forKey:key]; + [mHint setValue:skadn_dict forKey:SKADNETWORK_PARAM ]; + } + } + } @catch (NSException *exception) { + NSLog(@"Exception :%@",exception.reason); + } + } + + if (![NSJSONSerialization isValidJSONObject:mHint]) { + NSLog(@"Invalid JSON Object"); + return nil; + } + NSData * jsonData = [NSJSONSerialization dataWithJSONObject:mHint options:0 error:&err]; NSString * mediationHints = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; return mediationHints; diff --git a/Amazon/Plugins/iOS/AmazonManager.mm.meta b/Amazon/Plugins/iOS/AmazonManager.mm.meta index 41eacc2..c2cbd68 100644 --- a/Amazon/Plugins/iOS/AmazonManager.mm.meta +++ b/Amazon/Plugins/iOS/AmazonManager.mm.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 65a7bcd4e95cc47c88cd2b6280e00c17 +guid: 3eda61770afc43b42aa9ec92fea59924 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Plugins/iOS/AmazonUnityCallback.h.meta b/Amazon/Plugins/iOS/AmazonUnityCallback.h.meta index b0ae32f..43ad9cd 100644 --- a/Amazon/Plugins/iOS/AmazonUnityCallback.h.meta +++ b/Amazon/Plugins/iOS/AmazonUnityCallback.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4ab68d8321afe4cca8177a404f816891 +guid: eccfcb2b937138c48b44c7208b81ff98 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Plugins/iOS/AmazonUnityCallback.mm.meta b/Amazon/Plugins/iOS/AmazonUnityCallback.mm.meta index e2a421d..b7b060f 100644 --- a/Amazon/Plugins/iOS/AmazonUnityCallback.mm.meta +++ b/Amazon/Plugins/iOS/AmazonUnityCallback.mm.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ab36449d445ac4544afe77c7c0539ec0 +guid: 459e879fe800355479f460f15ae3f34a PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Plugins/iOS/DTBBannerDelegate.h.meta b/Amazon/Plugins/iOS/DTBBannerDelegate.h.meta index 64b2f50..3e0b42c 100644 --- a/Amazon/Plugins/iOS/DTBBannerDelegate.h.meta +++ b/Amazon/Plugins/iOS/DTBBannerDelegate.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a58dbc723902c4dd6a148f77e0845a3c +guid: 48b2839701f014a86bce37c62ac4c698 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Plugins/iOS/DTBBannerDelegate.mm.meta b/Amazon/Plugins/iOS/DTBBannerDelegate.mm.meta index b00cb27..c56f819 100644 --- a/Amazon/Plugins/iOS/DTBBannerDelegate.mm.meta +++ b/Amazon/Plugins/iOS/DTBBannerDelegate.mm.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 64f2586d9fb3549848bbd34f6f8085d2 +guid: ddf46b748d5ca4bd1b52a59e051346a5 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Plugins/iOS/DTBInterstitialDelegate.h.meta b/Amazon/Plugins/iOS/DTBInterstitialDelegate.h.meta index e89a3e0..fcadea6 100644 --- a/Amazon/Plugins/iOS/DTBInterstitialDelegate.h.meta +++ b/Amazon/Plugins/iOS/DTBInterstitialDelegate.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ec64dc94f39894ffba7e39a14f3b2102 +guid: 23a35b63b9ca64f63ac1e624f7ec73d4 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Plugins/iOS/DTBInterstitialDelegate.mm.meta b/Amazon/Plugins/iOS/DTBInterstitialDelegate.mm.meta index d22315a..9d415a0 100644 --- a/Amazon/Plugins/iOS/DTBInterstitialDelegate.mm.meta +++ b/Amazon/Plugins/iOS/DTBInterstitialDelegate.mm.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4f43b5dc42cf54011b96f66d261f2619 +guid: f6abf5beb5efe42ad88f270ed8f412e1 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Sample/APSMaxMediation.unity b/Amazon/Sample/APSMaxMediation.unity index 70c896f..d34851a 100644 --- a/Amazon/Sample/APSMaxMediation.unity +++ b/Amazon/Sample/APSMaxMediation.unity @@ -387,7 +387,7 @@ RectTransform: m_Children: - {fileID: 491590228} m_Father: {fileID: 640056004} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -576,11 +576,12 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1889519549} + - {fileID: 1477954961} - {fileID: 820223061} - {fileID: 620422002} - {fileID: 735603278} - {fileID: 739627434} - - {fileID: 1477954961} + - {fileID: 929227399} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -621,7 +622,7 @@ RectTransform: m_Children: - {fileID: 1079672022} m_Father: {fileID: 640056004} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -751,7 +752,7 @@ RectTransform: m_Children: - {fileID: 1682398784} m_Father: {fileID: 640056004} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -849,6 +850,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 739627433} m_CullTransparentMesh: 0 +--- !u!1 &795246048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 795246049} + - component: {fileID: 795246051} + - component: {fileID: 795246050} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &795246049 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 795246048} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 929227399} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &795246050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 795246048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Go Back +--- !u!222 &795246051 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 795246048} + m_CullTransparentMesh: 0 --- !u!1 &820223060 GameObject: m_ObjectHideFlags: 0 @@ -881,7 +960,7 @@ RectTransform: m_Children: - {fileID: 1290993690} m_Father: {fileID: 640056004} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -979,6 +1058,136 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 820223060} m_CullTransparentMesh: 0 +--- !u!1 &929227398 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 929227399} + - component: {fileID: 929227402} + - component: {fileID: 929227401} + - component: {fileID: 929227400} + m_Layer: 5 + m_Name: Go Back + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &929227399 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 929227398} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 795246049} + m_Father: {fileID: 640056004} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -144} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &929227400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 929227398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 929227401} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 946867261} + m_MethodName: goBack + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &929227401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 929227398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &929227402 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 929227398} + m_CullTransparentMesh: 0 --- !u!1 &946867260 GameObject: m_ObjectHideFlags: 0 @@ -1360,7 +1569,7 @@ RectTransform: m_Children: - {fileID: 499681495} m_Father: {fileID: 640056004} - m_RootOrder: 5 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Amazon/Sample/APSMaxMediation.unity.meta b/Amazon/Sample/APSMaxMediation.unity.meta index 143fe30..2e7bdf6 100644 --- a/Amazon/Sample/APSMaxMediation.unity.meta +++ b/Amazon/Sample/APSMaxMediation.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fb8e1477d33cb4076b8aa247ae7dd237 +guid: 2024bb7799cb45c489867a78c4ef889c DefaultImporter: externalObjects: {} userData: diff --git a/Amazon/Sample/AmazonMaxDemo.cs b/Amazon/Sample/AmazonMaxDemo.cs index a2c8167..49cf40e 100644 --- a/Amazon/Sample/AmazonMaxDemo.cs +++ b/Amazon/Sample/AmazonMaxDemo.cs @@ -3,6 +3,7 @@ using System; using AmazonAds; using UnityEngine; using System.Collections.Generic; +using UnityEngine.SceneManagement; public class AmazonMaxDemo : MonoBehaviour { @@ -47,6 +48,7 @@ public class AmazonMaxDemo : MonoBehaviour { Amazon.EnableTesting(true); Amazon.EnableLogging(true); Amazon.UseGeoLocation(true); + Amazon.IsLocationEnabled(); Amazon.SetMRAIDPolicy(Amazon.MRAIDPolicy.CUSTOM); Amazon.SetAdNetworkInfo(new AdNetworkInfo(DTBAdNetwork.MAX)); Amazon.SetMRAIDSupportedVersions(new string[] { "1.0", "2.0", "3.0" }); @@ -121,17 +123,18 @@ public class AmazonMaxDemo : MonoBehaviour { const int width = 320; const int height = 50; - if (bannerAdRequest != null) bannerAdRequest.DestroyFetchManager(); bannerAdRequest = new APSBannerAdRequest(width, height, amazonBannerSlotId); bannerAdRequest.onFailedWithError += (adError) => { MaxSdk.SetBannerLocalExtraParameter(maxBannerAdId, "amazon_ad_error", adError.GetAdError()); CreateMaxBannerAd(); + bannerAdRequest.Dispose(); }; bannerAdRequest.onSuccess += (adResponse) => { MaxSdk.SetBannerLocalExtraParameter(maxBannerAdId, "amazon_ad_response", adResponse.GetResponse()); CreateMaxBannerAd(); + bannerAdRequest.Dispose(); }; bannerAdRequest.LoadAd(); } @@ -294,4 +297,10 @@ public class AmazonMaxDemo : MonoBehaviour { { Debug.Log("OnRewardedAdRevenuePaidEvent"); } + + public void goBack() + { + MaxSdk.DestroyBanner(maxBannerAdId); + SceneManager.LoadScene(0); + } } \ No newline at end of file diff --git a/Amazon/Sample/AmazonMaxDemo.cs.meta b/Amazon/Sample/AmazonMaxDemo.cs.meta index f63575d..5da3891 100644 --- a/Amazon/Sample/AmazonMaxDemo.cs.meta +++ b/Amazon/Sample/AmazonMaxDemo.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 34ed58385e8924837ad87a1f2966e16b +guid: 312c0b7796265224ca6bd13197a7d5d6 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Amazon.cs b/Amazon/Scripts/Amazon.cs index 56a6544..555d95d 100644 --- a/Amazon/Scripts/Amazon.cs +++ b/Amazon/Scripts/Amazon.cs @@ -45,14 +45,18 @@ namespace AmazonAds { api.SetMRAIDPolicy (policy); } + + [Obsolete("APS no longer supports this API. For GDPR, we support TCFv2 strings. Implementation instructions can be found on the APS Portal under Resources > Privacy", false)] public static void SetCMPFlavor(Amazon.CMPFlavor cFlavor){ api.SetCMPFlavor(cFlavor); } + [Obsolete("APS no longer supports this API. For GDPR, we support TCFv2 strings. Implementation instructions can be found on the APS Portal under Resources > Privacy", false)] public static void SetConsentStatus(Amazon.ConsentStatus consentStatus){ api.SetConsentStatus(consentStatus); } + [Obsolete("APS no longer supports this API. For GDPR, we support TCFv2 strings. Implementation instructions can be found on the APS Portal under Resources > Privacy", false)] public static void SetVendorList(List vendorList){ api.SetVendorList(vendorList); } diff --git a/Amazon/Scripts/Amazon.cs.meta b/Amazon/Scripts/Amazon.cs.meta index d0579ef..9ad617c 100644 --- a/Amazon/Scripts/Amazon.cs.meta +++ b/Amazon/Scripts/Amazon.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d5987cccc71fa4c51877e7c22d2d5f56 +guid: 8b51dd1c8083d0a43b10a2507d7c4077 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/AmazonConstants.cs b/Amazon/Scripts/AmazonConstants.cs index 8e29fee..2a655f4 100644 --- a/Amazon/Scripts/AmazonConstants.cs +++ b/Amazon/Scripts/AmazonConstants.cs @@ -1,8 +1,8 @@ -using System; +using System; public static class AmazonConstants { - public const string VERSION = "1.4.3"; + public const string VERSION = "1.9.0"; public const string RELEASE_NOTES_URL = "https://ams.amazon.com/webpublisher/uam/docs/aps-mobile/resources"; //TODO : add Unity Release Notes link public const string titleAboutDialog = "About Amazon SDK"; diff --git a/Amazon/Scripts/AmazonConstants.cs.meta b/Amazon/Scripts/AmazonConstants.cs.meta index 178d6b3..858c89c 100644 --- a/Amazon/Scripts/AmazonConstants.cs.meta +++ b/Amazon/Scripts/AmazonConstants.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a4c36066dbdad415b978c38a01a2b675 +guid: b7f4b6635633144c4a35f2a254c0cca2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Common.meta b/Amazon/Scripts/Common.meta index 400da0c..4bda34d 100644 --- a/Amazon/Scripts/Common.meta +++ b/Amazon/Scripts/Common.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8c45974962ec542baad78d4c30cd0056 +guid: 822aefd58f1740341957f448c17e0527 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Amazon/Scripts/Common/IAdInterstitial.cs.meta b/Amazon/Scripts/Common/IAdInterstitial.cs.meta index b43ecab..9b8c7da 100644 --- a/Amazon/Scripts/Common/IAdInterstitial.cs.meta +++ b/Amazon/Scripts/Common/IAdInterstitial.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d4da15e7be3dc455d97abce962533892 +guid: ed7d5de51284c48cb8938e48e74c1b48 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Common/IAdRequest.cs b/Amazon/Scripts/Common/IAdRequest.cs index 2aa4bcf..61154a4 100644 --- a/Amazon/Scripts/Common/IAdRequest.cs +++ b/Amazon/Scripts/Common/IAdRequest.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Runtime.InteropServices; using UnityEngine; namespace AmazonAds { - public abstract class IAdRequest { + public abstract class IAdRequest : IDisposable { protected int refreshTime = 60; protected string autoRefreshID = "0"; //FetchManageerUniqueID protected bool isAutoRefreshAdMob = false; @@ -38,6 +38,9 @@ namespace AmazonAds { public abstract void StartFetchManager(); public abstract void SetRefreshFlag(bool flag); + public void Dispose() { + } + protected static class Schedule { private class Runner : MonoBehaviour { } private static Runner _backer; diff --git a/Amazon/Scripts/Common/IAdRequest.cs.meta b/Amazon/Scripts/Common/IAdRequest.cs.meta index 5740c6e..a341cf8 100644 --- a/Amazon/Scripts/Common/IAdRequest.cs.meta +++ b/Amazon/Scripts/Common/IAdRequest.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ba13283bbee174961b809f3b9e502094 +guid: 7168c7b8916657b40b6a8e4f32705497 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Common/IAdSize.cs.meta b/Amazon/Scripts/Common/IAdSize.cs.meta index 56bd287..4d5ae54 100644 --- a/Amazon/Scripts/Common/IAdSize.cs.meta +++ b/Amazon/Scripts/Common/IAdSize.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 33e37a43420f84a408938af12117ff08 +guid: ac582b3e4345e494ca3609440fc4fe2b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Common/IAdView.cs b/Amazon/Scripts/Common/IAdView.cs index 2c9a617..e1eb286 100644 --- a/Amazon/Scripts/Common/IAdView.cs +++ b/Amazon/Scripts/Common/IAdView.cs @@ -7,5 +7,7 @@ using UnityEngine; namespace AmazonAds { public abstract class IAdView { public abstract void FetchAd (AdResponse adResponse); + public void Dispose() { + } } } \ No newline at end of file diff --git a/Amazon/Scripts/Common/IAdView.cs.meta b/Amazon/Scripts/Common/IAdView.cs.meta index 3497cce..800cc5a 100644 --- a/Amazon/Scripts/Common/IAdView.cs.meta +++ b/Amazon/Scripts/Common/IAdView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: adeba99c4a0f04b54b8af9623665e2d5 +guid: 48d4f5afa2a1440c29ea78d8f33885dc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Common/IFetchManager.cs.meta b/Amazon/Scripts/Common/IFetchManager.cs.meta index 38b4b40..ee75f59 100644 --- a/Amazon/Scripts/Common/IFetchManager.cs.meta +++ b/Amazon/Scripts/Common/IFetchManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dec92b206e59e400c8706ec073e326d1 +guid: 9145340011b3e427dbfe964d0bf59f55 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Common/ISlotGroup.cs.meta b/Amazon/Scripts/Common/ISlotGroup.cs.meta index b11a657..9e1de7b 100644 --- a/Amazon/Scripts/Common/ISlotGroup.cs.meta +++ b/Amazon/Scripts/Common/ISlotGroup.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2b1f29380367c47c6a1c112ddc47ad84 +guid: 53a2d09f4898f244c84722134fc51501 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Editor.meta b/Amazon/Scripts/Editor.meta index bc42966..01e6165 100644 --- a/Amazon/Scripts/Editor.meta +++ b/Amazon/Scripts/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 60916135eefd74087bcd8ca80bd94ddc +guid: 43367e8560d848a4da8a31062731720b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Amazon/Scripts/Editor/Amazon.Editor.asmdef.meta b/Amazon/Scripts/Editor/Amazon.Editor.asmdef.meta index ce8fb75..15a429f 100644 --- a/Amazon/Scripts/Editor/Amazon.Editor.asmdef.meta +++ b/Amazon/Scripts/Editor/Amazon.Editor.asmdef.meta @@ -1,3 +1,7 @@ fileFormatVersion: 2 -guid: 59f42bdf21710439a90f93e01e1f8984 -timeCreated: 1700190285 \ No newline at end of file +guid: 2bfb493dbc0ec40a29dde187397eb936 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Amazon/Scripts/Editor/AmazonAboutDialog.cs.meta b/Amazon/Scripts/Editor/AmazonAboutDialog.cs.meta index 6ff607b..9f0e6c4 100644 --- a/Amazon/Scripts/Editor/AmazonAboutDialog.cs.meta +++ b/Amazon/Scripts/Editor/AmazonAboutDialog.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 431a6434bfc0a47e8a2c936e434c3d3b +guid: 59ff8b0c895196d4bbec7aad4098ab3d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Editor/AmazonBuildScript.cs b/Amazon/Scripts/Editor/AmazonBuildScript.cs index a27cfd2..5c31840 100644 --- a/Amazon/Scripts/Editor/AmazonBuildScript.cs +++ b/Amazon/Scripts/Editor/AmazonBuildScript.cs @@ -14,6 +14,8 @@ public class AmazonBuildScript string[] scenes = EditorBuildSettings.scenes.Where(s => s.enabled).Select(s => s.path).ToArray(); EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.iOS, BuildTarget.iOS); string outputFileName = GetArg("-output", DEFAULT_IOS_BUILD_DIR); + PlayerSettings.iOS.appleDeveloperTeamID = "P78AXXW29G"; + PlayerSettings.iOS.appleEnableAutomaticSigning = true; BuildPipeline.BuildPlayer(scenes, outputFileName, BuildTarget.iOS, BuildOptions.Development); } diff --git a/Amazon/Scripts/Editor/AmazonBuildScript.cs.meta b/Amazon/Scripts/Editor/AmazonBuildScript.cs.meta index 8fe0170..959f709 100644 --- a/Amazon/Scripts/Editor/AmazonBuildScript.cs.meta +++ b/Amazon/Scripts/Editor/AmazonBuildScript.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c1378b372e98d4b56a16725bf370ae6c +guid: e80f7a57e62ab4edabfda12a4e7b34fe MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Editor/AmazonCoroutineExtensions.cs.meta b/Amazon/Scripts/Editor/AmazonCoroutineExtensions.cs.meta index e05f050..fcacf02 100644 --- a/Amazon/Scripts/Editor/AmazonCoroutineExtensions.cs.meta +++ b/Amazon/Scripts/Editor/AmazonCoroutineExtensions.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aae61b43441904bbcbf7f24ff05e20d2 +guid: fb7213131ee033443bc8caa6cf8201aa MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Editor/AmazonCoroutines.cs.meta b/Amazon/Scripts/Editor/AmazonCoroutines.cs.meta index 0e52197..6b4cd3e 100644 --- a/Amazon/Scripts/Editor/AmazonCoroutines.cs.meta +++ b/Amazon/Scripts/Editor/AmazonCoroutines.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dcee96832dc4141299f36d8b10b10467 +guid: 768de77ca8c7ccc47b233b0b09a42d9c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Editor/AmazonDependencies.xml b/Amazon/Scripts/Editor/AmazonDependencies.xml index 979a6f6..c331fd3 100644 --- a/Amazon/Scripts/Editor/AmazonDependencies.xml +++ b/Amazon/Scripts/Editor/AmazonDependencies.xml @@ -1,16 +1,16 @@ - - - + + + https://aws.oss.sonatype.org/content/repositories/releases/ - - + + - \ No newline at end of file + diff --git a/Amazon/Scripts/Editor/AmazonDependencies.xml.meta b/Amazon/Scripts/Editor/AmazonDependencies.xml.meta index ad2f0f9..68aa041 100644 --- a/Amazon/Scripts/Editor/AmazonDependencies.xml.meta +++ b/Amazon/Scripts/Editor/AmazonDependencies.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c9bc3db2384e74f03ae6d3b496e9fdc9 +guid: 54e062f8003d00e469680f856f94a517 TextScriptImporter: externalObjects: {} userData: diff --git a/Amazon/Scripts/Editor/AmazonPostBuildiOS.cs b/Amazon/Scripts/Editor/AmazonPostBuildiOS.cs index be5be2b..c920c2d 100644 --- a/Amazon/Scripts/Editor/AmazonPostBuildiOS.cs +++ b/Amazon/Scripts/Editor/AmazonPostBuildiOS.cs @@ -6,49 +6,25 @@ using UnityEditor.iOS.Xcode; using UnityEngine; namespace AmazonInternal.Editor.Postbuild { public static class AmazonPostBuildiOS { - [PostProcessBuild( 45 )] - public static void OnPostprocessBuild(BuildTarget buildTarget, string path) - { + [PostProcessBuildAttribute(1)] + public static void OnPostprocessBuild(BuildTarget buildTarget, string path) { if (buildTarget != BuildTarget.iOS) return; - - string pbxProjectPath = PBXProject.GetPBXProjectPath(path); - PBXProject project = new PBXProject(); - - project.ReadFromFile(pbxProjectPath); - -#if UNITY_2019_3_OR_NEWER - string targetGuid = project.GetUnityFrameworkTargetGuid(); -#else - string targetGuid = project.TargetGuidByName(PBXProject.GetUnityTargetName()); -#endif - project.SetBuildProperty(targetGuid, "LD_RUNPATH_SEARCH_PATHS", "$(inherited)"); - project.SetBuildProperty(targetGuid, "CLANG_ENABLE_MODULES", "YES"); - project.AddBuildProperty(targetGuid, "LD_RUNPATH_SEARCH_PATHS", "@executable_path/Frameworks"); - project.WriteToFile(pbxProjectPath); + string projPath = path + "/Unity-iPhone.xcodeproj/project.pbxproj"; + string pbxProjectPath = PBXProject.GetPBXProjectPath(path); + PBXProject pbxProject = new PBXProject(); -#if UNITY_2019_3_OR_NEWER - if (buildTarget == BuildTarget.iOS) - { - bool iPhoneExist = false; - using (StreamReader sr = new StreamReader(path + "/Podfile")) - { - string contents = sr.ReadToEnd(); - if (contents.Contains("Unity-iPhone")) - { - iPhoneExist = true; - } - } - if ( !iPhoneExist ){ - using (StreamWriter sw = File.AppendText(path + "/Podfile")) - { - sw.WriteLine("\ntarget 'Unity-iPhone' do\nend"); - } - } - } -#endif - } + pbxProject.ReadFromFile(pbxProjectPath); + + string[] targetGuids = new string[2] { + pbxProject.GetUnityMainTargetGuid(), + pbxProject.GetUnityFrameworkTargetGuid() + }; + pbxProject.SetBuildProperty(targetGuids, "ENABLE_BITCODE", "NO"); + + pbxProject.WriteToFile(pbxProjectPath); + } } } #endif \ No newline at end of file diff --git a/Amazon/Scripts/Editor/AmazonPostBuildiOS.cs.meta b/Amazon/Scripts/Editor/AmazonPostBuildiOS.cs.meta index 52e2e0e..d96c2f0 100644 --- a/Amazon/Scripts/Editor/AmazonPostBuildiOS.cs.meta +++ b/Amazon/Scripts/Editor/AmazonPostBuildiOS.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f7474cff9dfc144e89f4e7696b4b8d9c +guid: ddd7aae4d9bd0644485bb967a9d9d838 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Editor/AmazonSDKManager.cs b/Amazon/Scripts/Editor/AmazonSDKManager.cs index 2de5da2..6cbf3bf 100644 --- a/Amazon/Scripts/Editor/AmazonSDKManager.cs +++ b/Amazon/Scripts/Editor/AmazonSDKManager.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections; using System.Collections.Generic; using System.IO; @@ -31,17 +31,17 @@ public class AmazonSDKManager : EditorWindow { } } -// [MenuItem ("Amazon/About Amazon SDK", false, 0)] + [MenuItem ("Amazon/About Amazon SDK", false, 0)] public static void About () { AmazonAboutDialog.ShowDialog (); } -// [MenuItem ("Amazon/Documentation...", false, 1)] + [MenuItem ("Amazon/Documentation...", false, 1)] public static void Documentation () { Application.OpenURL (AmazonConstants.docUrl); } -// [MenuItem ("Amazon/Manage SDKs...", false, 4)] + [MenuItem ("Amazon/Manage SDKs...", false, 4)] public static void SdkManagerProd () { AmazonSDKManager.ShowSDKManager (); } @@ -397,4 +397,4 @@ public class AmazonSDKManager : EditorWindow { downloader = null; coroutine = null; } -} +} \ No newline at end of file diff --git a/Amazon/Scripts/Editor/AmazonSDKManager.cs.meta b/Amazon/Scripts/Editor/AmazonSDKManager.cs.meta index ad401dd..78b1b8e 100644 --- a/Amazon/Scripts/Editor/AmazonSDKManager.cs.meta +++ b/Amazon/Scripts/Editor/AmazonSDKManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9436cb85e61464fbb8e7434090ec1af2 +guid: 970ae7f36073f3f4fb04767c1223a840 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Editor/Tests.meta b/Amazon/Scripts/Editor/Tests.meta index 86157cb..889342c 100644 --- a/Amazon/Scripts/Editor/Tests.meta +++ b/Amazon/Scripts/Editor/Tests.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e64d0b097e7e04e59b22cd2d61ff42a5 +guid: d58a19dba1752614fb20bbe8420899e5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Amazon/Scripts/Editor/Tests/AmazonSDKTests.cs.meta b/Amazon/Scripts/Editor/Tests/AmazonSDKTests.cs.meta index 88df821..f480b21 100644 --- a/Amazon/Scripts/Editor/Tests/AmazonSDKTests.cs.meta +++ b/Amazon/Scripts/Editor/Tests/AmazonSDKTests.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8b00fb31f302f4b26a43151fd12cffbc +guid: ebb19576a0bf36a4faa016a9fb7a88ee MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Editor/Tests/AmazonTest.cs.meta b/Amazon/Scripts/Editor/Tests/AmazonTest.cs.meta index 372fa7c..74bb6e7 100644 --- a/Amazon/Scripts/Editor/Tests/AmazonTest.cs.meta +++ b/Amazon/Scripts/Editor/Tests/AmazonTest.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fe3a64de565fa4daa9ac26c80cdb1f6e +guid: c6db4e2f03cecbf4c83eb7416ebbd623 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Editor/Tests/AmazonUtilsTests.cs.meta b/Amazon/Scripts/Editor/Tests/AmazonUtilsTests.cs.meta index de0683f..95ceb6d 100644 --- a/Amazon/Scripts/Editor/Tests/AmazonUtilsTests.cs.meta +++ b/Amazon/Scripts/Editor/Tests/AmazonUtilsTests.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e4a38f41a15b0444380ccd4a74a12ac2 +guid: 84c1ddf10f083ef4ab7614bd9a8edd62 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal.meta b/Amazon/Scripts/Internal.meta index 105edc6..04868f4 100644 --- a/Amazon/Scripts/Internal.meta +++ b/Amazon/Scripts/Internal.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3eac84282b79049f0bbadc32296d7b29 +guid: 2dba0aed518058e42959ba3e629b0bb6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Amazon/Scripts/Internal/APSAdDelegate.cs.meta b/Amazon/Scripts/Internal/APSAdDelegate.cs.meta index e2c3bdb..e72c3ff 100644 --- a/Amazon/Scripts/Internal/APSAdDelegate.cs.meta +++ b/Amazon/Scripts/Internal/APSAdDelegate.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d06f90422ce794d848656240f4d00aae +guid: 6d2b55178eeb0496e9d81c6a3ddb8d3d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/APSAdRequestExtra.cs b/Amazon/Scripts/Internal/APSAdRequestExtra.cs new file mode 100644 index 0000000..7ece90a --- /dev/null +++ b/Amazon/Scripts/Internal/APSAdRequestExtra.cs @@ -0,0 +1,145 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace AmazonAds +{ + public class APSAdRequestExtra + { + private static readonly string ADMOB_SLOTUUID_KEY = "amazon_custom_event_slot_uuid"; + private static readonly string ADMOB_REQUEST_ID_KEY = "amazon_custom_event_request_id"; + private static readonly string APS_ADAPTER_VERSION = "amazon_custom_event_adapter_version"; + private static readonly string ADMOB_ISVIDEO_KEY = "amazon_custom_event_is_video"; + private static readonly string ADMOB_WIDTH_KEY = "amazon_custom_event_width"; + private static readonly string ADMOB_HEIGHT_KEY = "amazon_custom_event_height"; + private static readonly string APS_ADMOB_CONST_CCPA_APS_PRIVACY = "aps_privacy"; + private static readonly string APS_ADMOB_CONST_CCPA_US_PRIVACY = "us_privacy"; + private static readonly AndroidJavaClass dtbAdUtil = new AndroidJavaClass ("com.amazon.device.ads.DTBAdUtil"); + + private APSAdRequestExtra (Builder builder) { + this.SlotUUID = builder.SlotUUID; + this.BannerAdHeight = builder.AdHeight; + this.BannerAdWidth = builder.AdWidth; + this.CCPAPrivacy = builder.CCPAPrivacy; + } + + public string SlotUUID { get; private set; } + public int BannerAdHeight { get; private set; } + public int BannerAdWidth { get; private set; } + public Dictionary CCPAPrivacy { private get; set; } + + public Dictionary GetAdMobInterstitialRequestExtras () + { + Dictionary AdMobRequestExtras = createExtras (); + if (SlotUUID == null) + { + return AdMobRequestExtras; + } + +#if UNITY_ANDROID + AndroidJavaObject bundle = dtbAdUtil.CallStatic("createAdMobInterstitialVideoRequestBundle", SlotUUID); + AdMobRequestExtras.Add (ADMOB_SLOTUUID_KEY, bundle.Call("getString", ADMOB_SLOTUUID_KEY)); + AdMobRequestExtras.Add (ADMOB_REQUEST_ID_KEY, bundle.Call("getString", ADMOB_REQUEST_ID_KEY)); + AdMobRequestExtras.Add (APS_ADAPTER_VERSION, bundle.Call("getString", APS_ADAPTER_VERSION)); +#else + AdMobRequestExtras.Add (ADMOB_SLOTUUID_KEY, SlotUUID); +#endif + return AdMobRequestExtras; + + } + + public Dictionary GetAdMobBannerRequestExtras () + { + Dictionary AdMobRequestExtras = createExtras(); + if (SlotUUID == null || BannerAdWidth == 0 || BannerAdHeight == 0) + { + return AdMobRequestExtras; + } + +#if UNITY_ANDROID + AndroidJavaObject bundle = dtbAdUtil.CallStatic ("createAdMobBannerRequestBundle", SlotUUID, BannerAdWidth, BannerAdHeight); + AdMobRequestExtras.Add (ADMOB_SLOTUUID_KEY, bundle.Call("getString", ADMOB_SLOTUUID_KEY)); + AdMobRequestExtras.Add (ADMOB_HEIGHT_KEY, bundle.Call("getInt", ADMOB_HEIGHT_KEY).ToString()); + AdMobRequestExtras.Add (ADMOB_WIDTH_KEY, bundle.Call("getInt", ADMOB_WIDTH_KEY).ToString()); + AdMobRequestExtras.Add (ADMOB_REQUEST_ID_KEY, bundle.Call("getString", ADMOB_REQUEST_ID_KEY)); + AdMobRequestExtras.Add (APS_ADAPTER_VERSION, bundle.Call("getString", APS_ADAPTER_VERSION)); +#else + + AdMobRequestExtras.Add (ADMOB_SLOTUUID_KEY, SlotUUID); + AdMobRequestExtras.Add (ADMOB_WIDTH_KEY, BannerAdWidth.ToString()); + AdMobRequestExtras.Add (ADMOB_HEIGHT_KEY, BannerAdHeight.ToString()); + +#endif + + return AdMobRequestExtras; + } + + private Dictionary createExtras() + { + Dictionary extrasMap = new Dictionary(); + if (CCPAPrivacy != null) + { + if (CCPAPrivacy.TryGetValue (APS_ADMOB_CONST_CCPA_APS_PRIVACY, out string ccpa_aps_privacy)) + { + extrasMap.Add (APS_ADMOB_CONST_CCPA_APS_PRIVACY, ccpa_aps_privacy); + } + if (CCPAPrivacy.TryGetValue (APS_ADMOB_CONST_CCPA_US_PRIVACY, out string ccpa_us_privacy)) + { + extrasMap.Add (APS_ADMOB_CONST_CCPA_US_PRIVACY, ccpa_us_privacy); + } + + } + return extrasMap; + + } + + + public class Builder + { + public Builder() + { + this.SlotUUID = null; + this.AdHeight = 0; + this.AdWidth = 0; + this.CCPAPrivacy = new Dictionary(); + } + + internal string SlotUUID { get; private set; } + internal int AdHeight { get; private set; } + internal int AdWidth { get; private set; } + internal Dictionary CCPAPrivacy { get; private set; } + + public Builder AddSlotUUID(string SlotUUID) + { + this.SlotUUID = SlotUUID; + return this; + } + + public Builder AddHeight(int AdHeight) + { + this.AdHeight = AdHeight; + return this; + } + + public Builder AddWidth(int AdWidth) + { + this.AdWidth = AdWidth; + return this; + } + + public Builder AddCCPAPrivacy(Dictionary CCPAPrivacy) + { + this.CCPAPrivacy = CCPAPrivacy; + return this; + } + + public APSAdRequestExtra Build() + { + return new APSAdRequestExtra(this); + } + } + } + +} + + diff --git a/Amazon/Scripts/Internal/IOS/IOSAdResponce.cs.meta b/Amazon/Scripts/Internal/APSAdRequestExtra.cs.meta similarity index 83% rename from Amazon/Scripts/Internal/IOS/IOSAdResponce.cs.meta rename to Amazon/Scripts/Internal/APSAdRequestExtra.cs.meta index 99f191e..2fe393f 100644 --- a/Amazon/Scripts/Internal/IOS/IOSAdResponce.cs.meta +++ b/Amazon/Scripts/Internal/APSAdRequestExtra.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9111bf37862934342b4a39f926faa2b7 +guid: 75f392fb260fb45329f6b11ae4a21e9b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/APSBannerAdRequest.cs b/Amazon/Scripts/Internal/APSBannerAdRequest.cs index 2499c4c..ab645c4 100644 --- a/Amazon/Scripts/Internal/APSBannerAdRequest.cs +++ b/Amazon/Scripts/Internal/APSBannerAdRequest.cs @@ -1,23 +1,22 @@ -namespace AmazonAds { +using System; +using UnityEngine; + +namespace AmazonAds { public class APSBannerAdRequest : AdRequest { - public APSBannerAdRequest () : base() { - Amazon.OnApplicationPause += OnApplicationPause; + public APSBannerAdRequest () : base() { } public APSBannerAdRequest (string slotGroupName) : base() { - Amazon.OnApplicationPause += OnApplicationPause; client.SetSlotGroup (slotGroupName); } public APSBannerAdRequest (int width, int height, string uid) : base() { - Amazon.OnApplicationPause += OnApplicationPause; AdSize size = new AdSize (width, height, uid); client.SetSizes (size.GetInstance ()); } public APSBannerAdRequest (AdSize size) { - Amazon.OnApplicationPause += OnApplicationPause; client.SetSizes (size.GetInstance ()); } @@ -42,47 +41,47 @@ client.SetSlotGroup (slotGroupName); } + [Obsolete("This API has been deprecated", false)] public void SetAutoRefreshAdMob (bool flag, bool isSmartBanner = false) { - client.SetAutoRefreshAdMob (flag, isSmartBanner); + Debug.LogError("This API has been deprecated"); } + [Obsolete("This API has been deprecated", false)] public void SetAutoRefreshMoPub (bool flag, int refreshTime) { - client.SetAutoRefreshMoPub (flag, refreshTime); + Debug.LogError("This API has been deprecated"); } + [Obsolete("This API has been deprecated", false)] public void DisposeAd () { - client.DisposeAd (); + Debug.LogError("This API has been deprecated"); } + [Obsolete("This API has been deprecated", false)] public void IsAutoRefreshAdMob () { - client.IsAutoRefreshAdMob (); + Debug.LogError("This API has been deprecated"); } + [Obsolete("This API has been deprecated", false)] public void IsAutoRefreshMoPub () { - client.IsAutoRefreshMoPub (); + Debug.LogError("This API has been deprecated"); } public string AutoRefreshID () { return client.AutoRefreshID (); } + [Obsolete("This API has been deprecated", false)] public void CreateFetchManager (bool isSmartBanner = false) { - client.CreateFetchManager (isSmartBanner); + Debug.LogError("This API has been deprecated"); } + [Obsolete("This API has been deprecated", false)] public void DestroyFetchManager () { - client.DestroyFetchManager (); + Debug.LogError("The API has been deprecated"); } + [Obsolete("This API has been deprecated", false)] public void OnApplicationPause (bool isPaused) { - if (isPaused) { - if( client.IsAutoRefreshAdMob() ){ - client.StopFetchManager(); - } - } else { - if( client.IsAutoRefreshAdMob() ){ - client.StartFetchManager(); - } - } + Debug.LogError("This API has been deprecated"); } } } \ No newline at end of file diff --git a/Amazon/Scripts/Internal/APSBannerAdRequest.cs.meta b/Amazon/Scripts/Internal/APSBannerAdRequest.cs.meta index a0d7ff0..722fa2d 100644 --- a/Amazon/Scripts/Internal/APSBannerAdRequest.cs.meta +++ b/Amazon/Scripts/Internal/APSBannerAdRequest.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 62abdd252c1aa49beb917ca0a7b4d3b3 +guid: 93f096fe94c739c42bd555fff7f57571 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/APSInterstitialAdRequest.cs.meta b/Amazon/Scripts/Internal/APSInterstitialAdRequest.cs.meta index 95fc792..3a7d8e6 100644 --- a/Amazon/Scripts/Internal/APSInterstitialAdRequest.cs.meta +++ b/Amazon/Scripts/Internal/APSInterstitialAdRequest.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a60589c70736841a6b26fa39087d8e98 +guid: 5e132029d7bab2d4684faf398279497b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/APSMediationUtils.cs b/Amazon/Scripts/Internal/APSMediationUtils.cs index 4ef747a..4151994 100644 --- a/Amazon/Scripts/Internal/APSMediationUtils.cs +++ b/Amazon/Scripts/Internal/APSMediationUtils.cs @@ -5,33 +5,99 @@ namespace AmazonAds { public class APSMediationUtils { public static string APS_IRON_SOURCE_NETWORK_KEY = "APS"; + private static string APS_REWARDED_VIDEO_KEY = "rewardedvideo"; + private static string APS_INTERSTITIAL_KEY = "interstitial"; - public static string GetInterstitialNetworkData(string amazonSlotId, string bidInfo, string pricePoint) + public static string GetInterstitialNetworkData(string amazonSlotId, AmazonAds.AdResponse adResponse) { - APSIronSourceNetworkBaseInputData ironSourceInputData = new APSIronSourceNetworkBaseInputData(); - ironSourceInputData.bidInfo = bidInfo; - ironSourceInputData.pricePointEncoded = pricePoint; - ironSourceInputData.uuid = amazonSlotId; + return GetNetworkData(amazonSlotId, adResponse, APS_INTERSTITIAL_KEY); - APSIronSourceInterstitialNetworkData networkData = new APSIronSourceInterstitialNetworkData(); - networkData.interstitial = ironSourceInputData; - - string jsonData = "{ \"interstitial\" :" + JsonUtility.ToJson(ironSourceInputData) + "}"; - return jsonData; - - //return JsonUtility.ToJson(networkData); } - public class APSIronSourceNetworkBaseInputData + public static string GetRewardedNetworkData(string amazonSlotId, AmazonAds.AdResponse adResponse) { + return GetNetworkData(amazonSlotId, adResponse, APS_REWARDED_VIDEO_KEY); + } + + private static string GetNetworkData(string amazonSlotId, AmazonAds.AdResponse adResponse , string adInventoryType) + { + APSIronSourceNetworkInputData ironSourceInputData = new APSIronSourceNetworkInputData(); +#if UNITY_ANDROID + ironSourceInputData.bidInfo = adResponse.GetBidInfo(); + +#endif + ironSourceInputData.pricePointEncoded = adResponse.GetPricePoint(); + ironSourceInputData.uuid = amazonSlotId; + APSIronSourceNetworkData networkData = new APSIronSourceNetworkData(); + networkData.networkInputData = ironSourceInputData; + +#if UNITY_IOS + string mediationHints = "\"mediationHints\" :" + adResponse.GetMediationHints(); + string jsonData = "{\""+adInventoryType+"\" :" + JsonUtility.ToJson(ironSourceInputData); + jsonData = jsonData.Remove(jsonData.Length - 1); + jsonData = jsonData + ", " + mediationHints + "}}"; +#else + string jsonData = "{\""+adInventoryType+"\" :" + JsonUtility.ToJson(ironSourceInputData) + "}"; +#endif + return jsonData; + } + + + public static string GetBannerNetworkData(string amazonSlotId, AmazonAds.AdResponse adResponse) + { + APSIronSourceNetworkBannerInputData ironSourceInputData = new APSIronSourceNetworkBannerInputData(); +#if UNITY_ANDROID + ironSourceInputData.bidInfo = adResponse.GetBidInfo(); +#endif + ironSourceInputData.pricePointEncoded = adResponse.GetPricePoint(); + ironSourceInputData.uuid = amazonSlotId; + ironSourceInputData.width = adResponse.GetWidth(); + ironSourceInputData.height = adResponse.GetHeight(); + + APSIronSourceBannerNetworkData networkData = new APSIronSourceBannerNetworkData(); + networkData.banner = ironSourceInputData; + +#if UNITY_IOS + string mediationHints = "\"mediationHints\" :" + adResponse.GetMediationHints(); + string jsonData = "{ \"banner\" :" + JsonUtility.ToJson(ironSourceInputData); + jsonData = jsonData.Remove(jsonData.Length - 1); + jsonData = jsonData + ", " + mediationHints + "}}"; +#else + string jsonData = "{ \"banner\" :" + JsonUtility.ToJson(ironSourceInputData) + "}"; +#endif + return jsonData; + } + + public class APSIronSourceNetworkInputData + { + public string uuid; + public string pricePointEncoded; +#if UNITY_ANDROID public string bidInfo; + +#endif + } + + public class APSIronSourceNetworkBannerInputData + { +#if UNITY_ANDROID + public string bidInfo; + +#endif public string pricePointEncoded; public string uuid; + public int width; + public int height; } - public class APSIronSourceInterstitialNetworkData + public class APSIronSourceBannerNetworkData { - public APSIronSourceNetworkBaseInputData interstitial; + public APSIronSourceNetworkBannerInputData banner; + } + + public class APSIronSourceNetworkData + { + public APSIronSourceNetworkInputData networkInputData; } private APSMediationUtils() diff --git a/Amazon/Scripts/Internal/APSMediationUtils.cs.meta b/Amazon/Scripts/Internal/APSMediationUtils.cs.meta index e90afa5..a343531 100644 --- a/Amazon/Scripts/Internal/APSMediationUtils.cs.meta +++ b/Amazon/Scripts/Internal/APSMediationUtils.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a9a84a300e9084005845d7561b5941de +guid: 6462f49a627cd4380aecc9aff2a008ae MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/APSVideoAdRequest.cs.meta b/Amazon/Scripts/Internal/APSVideoAdRequest.cs.meta index 6891e4f..a117066 100644 --- a/Amazon/Scripts/Internal/APSVideoAdRequest.cs.meta +++ b/Amazon/Scripts/Internal/APSVideoAdRequest.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f887445d62a094bdcaeba6843c76de52 +guid: 0116cf1c62b814514ac6cca1ac619af8 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/AdError.cs.meta b/Amazon/Scripts/Internal/AdError.cs.meta index 870b541..7c2dc64 100644 --- a/Amazon/Scripts/Internal/AdError.cs.meta +++ b/Amazon/Scripts/Internal/AdError.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 56cbe6c6e32004910b2c76cefbf4e0c6 +guid: 3215ade8b363a427891857ff10c3981f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/AdInterstitial.cs.meta b/Amazon/Scripts/Internal/AdInterstitial.cs.meta index de5b71b..1d416ef 100644 --- a/Amazon/Scripts/Internal/AdInterstitial.cs.meta +++ b/Amazon/Scripts/Internal/AdInterstitial.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b6b4a1dc9a6eb4aac89ddfeb50a829a5 +guid: a03e9d205385f4937b8627db76ac71a4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/AdNetworkInfo.cs b/Amazon/Scripts/Internal/AdNetworkInfo.cs index 574f126..d2bf3fe 100644 --- a/Amazon/Scripts/Internal/AdNetworkInfo.cs +++ b/Amazon/Scripts/Internal/AdNetworkInfo.cs @@ -3,7 +3,6 @@ using System; namespace AmazonAds { public enum DTBAdNetwork { GOOGLE_AD_MANAGER, - MOPUB_AD_SERVER, ADMOB, AD_GENERATION, IRON_SOURCE, diff --git a/Amazon/Scripts/Internal/AdNetworkInfo.cs.meta b/Amazon/Scripts/Internal/AdNetworkInfo.cs.meta index 95b41e8..66c4c26 100644 --- a/Amazon/Scripts/Internal/AdNetworkInfo.cs.meta +++ b/Amazon/Scripts/Internal/AdNetworkInfo.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 86929efe844004ce4a245fed201d6f9b +guid: 06e9bcca68bcd4c268eaf4d0dbd27002 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/AdRequest.cs b/Amazon/Scripts/Internal/AdRequest.cs index 3e340a1..14e6153 100644 --- a/Amazon/Scripts/Internal/AdRequest.cs +++ b/Amazon/Scripts/Internal/AdRequest.cs @@ -16,6 +16,12 @@ namespace AmazonAds { #endif } + public void Dispose() { + #if UNITY_ANDROID + client.Dispose(); + #endif + } + public AdRequest (IAdRequest adRequest) { client = adRequest; } diff --git a/Amazon/Scripts/Internal/AdRequest.cs.meta b/Amazon/Scripts/Internal/AdRequest.cs.meta index 9dd12d2..3f52327 100644 --- a/Amazon/Scripts/Internal/AdRequest.cs.meta +++ b/Amazon/Scripts/Internal/AdRequest.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 470ce0a8c403f4531ac94b5ebe2ea5f4 +guid: b9e5b4e4e1cabfc4c85b094dd97956b5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/AdResponce.cs b/Amazon/Scripts/Internal/AdResponce.cs deleted file mode 100644 index c02e32c..0000000 --- a/Amazon/Scripts/Internal/AdResponce.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace AmazonAds { - public abstract class AdResponseObsolete { - } -} diff --git a/Amazon/Scripts/Internal/AdResponce.cs.meta b/Amazon/Scripts/Internal/AdResponce.cs.meta deleted file mode 100644 index 928912a..0000000 --- a/Amazon/Scripts/Internal/AdResponce.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 07d84938416874bbb97e941098b24279 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Amazon/Scripts/Internal/AdResponse.cs.meta b/Amazon/Scripts/Internal/AdResponse.cs.meta index 8003906..49d5fca 100644 --- a/Amazon/Scripts/Internal/AdResponse.cs.meta +++ b/Amazon/Scripts/Internal/AdResponse.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 80115d4cd111a4902804a0557a637367 +guid: ddb5dd3e28b574a74b676b9a456bdb41 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/AdSize.cs.meta b/Amazon/Scripts/Internal/AdSize.cs.meta index 3ac671a..30f546a 100644 --- a/Amazon/Scripts/Internal/AdSize.cs.meta +++ b/Amazon/Scripts/Internal/AdSize.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6669e9284e4b5497fb351ae7bcb28436 +guid: 3fe91a7e44a1a364e8bfaa45f0af5a48 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/AdView.cs b/Amazon/Scripts/Internal/AdView.cs index fbf3c39..6421ce5 100644 --- a/Amazon/Scripts/Internal/AdView.cs +++ b/Amazon/Scripts/Internal/AdView.cs @@ -15,6 +15,12 @@ namespace AmazonAds { #endif } + public void Dispose() { + #if UNITY_ANDROID + adView.Dispose(); + #endif + } + public void fetchAd (AdResponse adResponse) { adView.FetchAd(adResponse); } diff --git a/Amazon/Scripts/Internal/AdView.cs.meta b/Amazon/Scripts/Internal/AdView.cs.meta index 575a4d3..ec7044f 100644 --- a/Amazon/Scripts/Internal/AdView.cs.meta +++ b/Amazon/Scripts/Internal/AdView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ae0729fd51c4548638665a625582c64e +guid: 3c1cdb4ad102d47eab59e8df1f917c4d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/AmazonPackageConfig.cs.meta b/Amazon/Scripts/Internal/AmazonPackageConfig.cs.meta index 29bd54c..0ffff8e 100644 --- a/Amazon/Scripts/Internal/AmazonPackageConfig.cs.meta +++ b/Amazon/Scripts/Internal/AmazonPackageConfig.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c289908250a174f72824418c6968e5f6 +guid: 732f6afbd1c571441bdc86f6f48e847e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/AmazonUtils.cs.meta b/Amazon/Scripts/Internal/AmazonUtils.cs.meta index 2d7d7c4..8096851 100644 --- a/Amazon/Scripts/Internal/AmazonUtils.cs.meta +++ b/Amazon/Scripts/Internal/AmazonUtils.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8472e80d0d208414880cdcf4c8b6889f +guid: dd98afcb8352e134ab09ab54c5c8b844 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/Android.meta b/Amazon/Scripts/Internal/Android.meta index eafc62e..6c6459f 100644 --- a/Amazon/Scripts/Internal/Android.meta +++ b/Amazon/Scripts/Internal/Android.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7b3522bb34b494fbfac3a4d58f6de400 +guid: 56389f93bf97fcd4e97d5360316491c1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Amazon/Scripts/Internal/Android/AdRegistration.cs b/Amazon/Scripts/Internal/Android/AdRegistration.cs index 1f65d82..b1c4de7 100644 --- a/Amazon/Scripts/Internal/Android/AdRegistration.cs +++ b/Amazon/Scripts/Internal/Android/AdRegistration.cs @@ -83,7 +83,7 @@ namespace AmazonAds.Android { } public bool IsLocationEnabled () { - return adRegistration.CallStatic ("іsLocationEnabled"); + return adRegistration.CallStatic ("isLocationEnabled"); } public String GetVersion () { diff --git a/Amazon/Scripts/Internal/Android/AdRegistration.cs.meta b/Amazon/Scripts/Internal/Android/AdRegistration.cs.meta index 0dd61fd..7953f22 100644 --- a/Amazon/Scripts/Internal/Android/AdRegistration.cs.meta +++ b/Amazon/Scripts/Internal/Android/AdRegistration.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 211753c343932487aaf8fa3e3f23a237 +guid: b8e246fc101d65e4e8ee19eb598fcbf8 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/Android/AndroidAdInterstitial.cs b/Amazon/Scripts/Internal/Android/AndroidAdInterstitial.cs index 8939514..869256c 100644 --- a/Amazon/Scripts/Internal/Android/AndroidAdInterstitial.cs +++ b/Amazon/Scripts/Internal/Android/AndroidAdInterstitial.cs @@ -8,15 +8,24 @@ namespace AmazonAds.Android { private AndroidJavaObject dtbAdInterstitial = null; private static readonly AndroidJavaClass SDKUtilitiesClass = new AndroidJavaClass(AmazonConstants.sdkUtilitiesClass); + UnityEngine.AndroidJavaClass playerClass; + UnityEngine.AndroidJavaObject currentActivityObject; + public AndroidAdInterstitial (APSAdDelegate delegates) { - UnityEngine.AndroidJavaClass playerClass = new UnityEngine.AndroidJavaClass(AmazonConstants.unityPlayerClass); - UnityEngine.AndroidJavaObject currentActivityObject = playerClass.GetStatic ("currentActivity"); + playerClass = new UnityEngine.AndroidJavaClass(AmazonConstants.unityPlayerClass); + currentActivityObject = playerClass.GetStatic ("currentActivity"); DTBAdInterstitialListener adInterstitialListener = new DTBAdInterstitialListener(); adInterstitialListener.adDelegate = delegates; dtbAdInterstitial = new AndroidJavaObject(AmazonConstants.dtbAdInterstitialClass, currentActivityObject, adInterstitialListener); } + public void Dispose() { + playerClass.Dispose(); + currentActivityObject.Dispose(); + dtbAdInterstitial.Dispose(); + } + public override void FetchAd (AdResponse adResponse) { if (dtbAdInterstitial != null) { AndroidJavaObject response = adResponse.GetAndroidResponseObject(); diff --git a/Amazon/Scripts/Internal/Android/AndroidAdInterstitial.cs.meta b/Amazon/Scripts/Internal/Android/AndroidAdInterstitial.cs.meta index ae80685..c5a90b4 100644 --- a/Amazon/Scripts/Internal/Android/AndroidAdInterstitial.cs.meta +++ b/Amazon/Scripts/Internal/Android/AndroidAdInterstitial.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ec1e99cd2191f4570bda447b3e0b031b +guid: d75f31e61413f4531ad341980cb0056d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/Android/AndroidAdResponce.cs b/Amazon/Scripts/Internal/Android/AndroidAdResponce.cs deleted file mode 100644 index ef1a130..0000000 --- a/Amazon/Scripts/Internal/Android/AndroidAdResponce.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace AmazonAds.Android { - public class AndroidAdResponceObsolete { - } -} diff --git a/Amazon/Scripts/Internal/Android/AndroidAdResponce.cs.meta b/Amazon/Scripts/Internal/Android/AndroidAdResponce.cs.meta deleted file mode 100644 index 6b35c90..0000000 --- a/Amazon/Scripts/Internal/Android/AndroidAdResponce.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b59d5cd7e7903495f8d952a28060400d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Amazon/Scripts/Internal/Android/AndroidAdResponse.cs.meta b/Amazon/Scripts/Internal/Android/AndroidAdResponse.cs.meta index 911a717..ee517f1 100644 --- a/Amazon/Scripts/Internal/Android/AndroidAdResponse.cs.meta +++ b/Amazon/Scripts/Internal/Android/AndroidAdResponse.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ea64b8dd761b64dc48d3963f41d7c964 +guid: 225ce61c153884d2498752934b9e5e02 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/Android/AndroidAdView.cs b/Amazon/Scripts/Internal/Android/AndroidAdView.cs index d067f9b..859bb54 100644 --- a/Amazon/Scripts/Internal/Android/AndroidAdView.cs +++ b/Amazon/Scripts/Internal/Android/AndroidAdView.cs @@ -7,16 +7,24 @@ namespace AmazonAds.Android { public class AndroidAdView : IAdView { private AndroidJavaObject dtbAdView = null; private static readonly AndroidJavaClass SDKUtilitiesClass = new AndroidJavaClass(AmazonConstants.sdkUtilitiesClass); + UnityEngine.AndroidJavaClass playerClass; + UnityEngine.AndroidJavaObject currentActivityObject; public AndroidAdView (APSAdDelegate delegates) { - UnityEngine.AndroidJavaClass playerClass = new UnityEngine.AndroidJavaClass(AmazonConstants.unityPlayerClass); - UnityEngine.AndroidJavaObject currentActivityObject = playerClass.GetStatic ("currentActivity"); + playerClass = new UnityEngine.AndroidJavaClass(AmazonConstants.unityPlayerClass); + currentActivityObject = playerClass.GetStatic ("currentActivity"); DTBAdBannerListener adBannerListener = new DTBAdBannerListener(); adBannerListener.adDelegate = delegates; dtbAdView = new AndroidJavaObject(AmazonConstants.dtbAdViewClass, currentActivityObject, adBannerListener); } + public void Dispose() { + playerClass.Dispose(); + currentActivityObject.Dispose(); + dtbAdView.Dispose(); + } + public override void FetchAd (AdResponse adResponse) { if (dtbAdView != null) { AndroidJavaObject response = adResponse.GetAndroidResponseObject(); diff --git a/Amazon/Scripts/Internal/Android/AndroidAdView.cs.meta b/Amazon/Scripts/Internal/Android/AndroidAdView.cs.meta index 3beb77e..8790e51 100644 --- a/Amazon/Scripts/Internal/Android/AndroidAdView.cs.meta +++ b/Amazon/Scripts/Internal/Android/AndroidAdView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d65a0f0dd42564508aa82269ce06336f +guid: 915f068be076545579598f0e166613b1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/Android/AndroidPlatform.cs b/Amazon/Scripts/Internal/Android/AndroidPlatform.cs index 739b5ba..a6f3978 100644 --- a/Amazon/Scripts/Internal/Android/AndroidPlatform.cs +++ b/Amazon/Scripts/Internal/Android/AndroidPlatform.cs @@ -49,16 +49,19 @@ namespace AmazonAds.Android { adRegistration.EnableLogging (flag); } + [Obsolete("APS no longer supports this API. For GDPR, we support TCFv2 strings. Implementation instructions can be found on the APS Portal under Resources > Privacy", false)] public override void SetCMPFlavor(Amazon.CMPFlavor cFlavor) { adRegistration.SetCMPFlavor(cFlavor); } + [Obsolete("APS no longer supports this API. For GDPR, we support TCFv2 strings. Implementation instructions can be found on the APS Portal under Resources > Privacy", false)] public override void SetConsentStatus(Amazon.ConsentStatus consentStatus) { adRegistration.SetConsentStatus(consentStatus); } + [Obsolete("APS no longer supports this API. For GDPR, we support TCFv2 strings. Implementation instructions can be found on the APS Portal under Resources > Privacy", false)] public override void SetVendorList(List vendorList) { adRegistration.SetVendorList(vendorList); diff --git a/Amazon/Scripts/Internal/Android/AndroidPlatform.cs.meta b/Amazon/Scripts/Internal/Android/AndroidPlatform.cs.meta index cc1b0f0..c27a542 100644 --- a/Amazon/Scripts/Internal/Android/AndroidPlatform.cs.meta +++ b/Amazon/Scripts/Internal/Android/AndroidPlatform.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5b2de7cfcde534331acecd109d027803 +guid: c21cb058ae626f248833fdab8d85aa44 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/Android/DTBAdBannerListener.cs.meta b/Amazon/Scripts/Internal/Android/DTBAdBannerListener.cs.meta index 81ce259..4844012 100644 --- a/Amazon/Scripts/Internal/Android/DTBAdBannerListener.cs.meta +++ b/Amazon/Scripts/Internal/Android/DTBAdBannerListener.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 38ecf85701e30431f9c29008f398e51b +guid: 96eb7e2874b874e7e9f4045bb0ea4db9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/Android/DTBAdInterstitialListener.cs.meta b/Amazon/Scripts/Internal/Android/DTBAdInterstitialListener.cs.meta index 769558a..2377af5 100644 --- a/Amazon/Scripts/Internal/Android/DTBAdInterstitialListener.cs.meta +++ b/Amazon/Scripts/Internal/Android/DTBAdInterstitialListener.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a7709955494bd4212a25ccc336841875 +guid: 453e75923c4e54a16b77e815a3df9e76 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/Android/DTBAdRequest.cs b/Amazon/Scripts/Internal/Android/DTBAdRequest.cs index d277728..6c7d9ec 100644 --- a/Amazon/Scripts/Internal/Android/DTBAdRequest.cs +++ b/Amazon/Scripts/Internal/Android/DTBAdRequest.cs @@ -9,12 +9,21 @@ namespace AmazonAds.Android { private IInterstitialAdSize _interstitialAdSize = null; private IVideo _videoAdSize = null; + UnityEngine.AndroidJavaClass playerClass; + UnityEngine.AndroidJavaObject currentActivityObject; + public DTBAdRequest () { - UnityEngine.AndroidJavaClass playerClass = new UnityEngine.AndroidJavaClass ("com.unity3d.player.UnityPlayer"); - UnityEngine.AndroidJavaObject currentActivityObject = playerClass.GetStatic ("currentActivity"); + playerClass = new UnityEngine.AndroidJavaClass ("com.unity3d.player.UnityPlayer"); + currentActivityObject = playerClass.GetStatic ("currentActivity"); dTBAdRequest = new AndroidJavaObject ("com.amazon.device.ads.DTBAdRequest", currentActivityObject); } + public void Dispose() { + playerClass.Dispose(); + currentActivityObject.Dispose(); + dTBAdRequest.Dispose(); + } + public DTBAdRequest (AndroidJavaObject dtbRequest) { dTBAdRequest = dtbRequest; } diff --git a/Amazon/Scripts/Internal/Android/DTBAdRequest.cs.meta b/Amazon/Scripts/Internal/Android/DTBAdRequest.cs.meta index de7d3db..159cfdd 100644 --- a/Amazon/Scripts/Internal/Android/DTBAdRequest.cs.meta +++ b/Amazon/Scripts/Internal/Android/DTBAdRequest.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 02bd534875030442a8c3a9f1bedc6967 +guid: e75f3eee6b627e647979f4f3680abc47 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/Android/DTBAdSize.cs b/Amazon/Scripts/Internal/Android/DTBAdSize.cs index 486711a..e5fd9ce 100644 --- a/Amazon/Scripts/Internal/Android/DTBAdSize.cs +++ b/Amazon/Scripts/Internal/Android/DTBAdSize.cs @@ -8,6 +8,7 @@ namespace AmazonAds.Android { public DTBAdSize (int width, int height, String slotUUID) { client = new AndroidJavaObject ("com.amazon.device.ads.DTBAdSize", width, height, slotUUID); } + public int GetWidth () { return client.Call ("getWidth"); } @@ -41,6 +42,10 @@ namespace AmazonAds.Android { client = new AndroidJavaObject ("com.amazon.device.ads.DTBAdSize$DTBVideo", playerWidth, playerHeight, slotUUID); } + public void Dispose() { + client.Dispose(); + } + public AndroidJavaObject GetInstance () { return client; } diff --git a/Amazon/Scripts/Internal/Android/DTBAdSize.cs.meta b/Amazon/Scripts/Internal/Android/DTBAdSize.cs.meta index 0137b71..e2faed6 100644 --- a/Amazon/Scripts/Internal/Android/DTBAdSize.cs.meta +++ b/Amazon/Scripts/Internal/Android/DTBAdSize.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0707e98bd8f7c449fbaf05500bee828d +guid: 9bbbe93960b89b6438d564bfd823f31e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/Android/DTBCallback.cs.meta b/Amazon/Scripts/Internal/Android/DTBCallback.cs.meta index e8c6ff2..5916fa8 100644 --- a/Amazon/Scripts/Internal/Android/DTBCallback.cs.meta +++ b/Amazon/Scripts/Internal/Android/DTBCallback.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 97d96cb6052c247b88fb71963517d15f +guid: f2cd9fa644ad3814086bbdb888b07e52 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/Android/DTBFetchFactory.cs.meta b/Amazon/Scripts/Internal/Android/DTBFetchFactory.cs.meta index 9aa0979..c9967df 100644 --- a/Amazon/Scripts/Internal/Android/DTBFetchFactory.cs.meta +++ b/Amazon/Scripts/Internal/Android/DTBFetchFactory.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d8f17e173b3b34003b573efeaef83dce +guid: 2da86b5f7de549f408cd7ab478b815bf MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/Android/DTBFetchManager.cs b/Amazon/Scripts/Internal/Android/DTBFetchManager.cs index 36bd868..f1bf5c7 100644 --- a/Amazon/Scripts/Internal/Android/DTBFetchManager.cs +++ b/Amazon/Scripts/Internal/Android/DTBFetchManager.cs @@ -11,6 +11,10 @@ namespace AmazonAds.Android { dTBFetchManager = client; } + public void Dispose() { + dTBFetchManager.Dispose(); + } + public void dispense () { AndroidJavaObject dTBAdResponse = dTBFetchManager.Call ("dispense"); } diff --git a/Amazon/Scripts/Internal/Android/DTBFetchManager.cs.meta b/Amazon/Scripts/Internal/Android/DTBFetchManager.cs.meta index 96b7c9b..5aed60d 100644 --- a/Amazon/Scripts/Internal/Android/DTBFetchManager.cs.meta +++ b/Amazon/Scripts/Internal/Android/DTBFetchManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2bf648a3f472141fdbc550ad18e55ac1 +guid: 6228100cb30e98a469a061dc74986b1b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/Android/DTBSlotGroup.cs.meta b/Amazon/Scripts/Internal/Android/DTBSlotGroup.cs.meta index a5a07cc..ead264c 100644 --- a/Amazon/Scripts/Internal/Android/DTBSlotGroup.cs.meta +++ b/Amazon/Scripts/Internal/Android/DTBSlotGroup.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f997d4f0e62c14fcdb460c08b05ef913 +guid: bae541bcf584e3a429eb2478625aba9a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/IOS.meta b/Amazon/Scripts/Internal/IOS.meta index eea68d4..321c01a 100644 --- a/Amazon/Scripts/Internal/IOS.meta +++ b/Amazon/Scripts/Internal/IOS.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cf23c2530685c4a709003ad1faddfd1c +guid: 78340eb4238a9eb47b38ebebf20f97a1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Amazon/Scripts/Internal/IOS/DTBAdBannerDispatcher.cs.meta b/Amazon/Scripts/Internal/IOS/DTBAdBannerDispatcher.cs.meta index 4768117..56fe4b7 100644 --- a/Amazon/Scripts/Internal/IOS/DTBAdBannerDispatcher.cs.meta +++ b/Amazon/Scripts/Internal/IOS/DTBAdBannerDispatcher.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1b2d2d02538c84466afc24234497484c +guid: 1b160c1031c0c41c9940ad06e7e764d0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/IOS/DTBAdInterstitialDispatcher.cs.meta b/Amazon/Scripts/Internal/IOS/DTBAdInterstitialDispatcher.cs.meta index 27cbc4c..08b050b 100644 --- a/Amazon/Scripts/Internal/IOS/DTBAdInterstitialDispatcher.cs.meta +++ b/Amazon/Scripts/Internal/IOS/DTBAdInterstitialDispatcher.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c027d873469c4440fbfdd1b55353f520 +guid: 4fecb6b1807da47d5bb9abfcc7cf0069 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/IOS/DTBAdRequest.cs b/Amazon/Scripts/Internal/IOS/DTBAdRequest.cs index cbd17a7..0faae00 100644 --- a/Amazon/Scripts/Internal/IOS/DTBAdRequest.cs +++ b/Amazon/Scripts/Internal/IOS/DTBAdRequest.cs @@ -105,13 +105,7 @@ namespace AmazonAds.IOS { } public override void SetAutoRefreshAdMob (bool flag, bool isSmartBanner = false) { - isAutoRefreshAdMob = flag; - if(flag){ - CreateFetchManager(isSmartBanner); - StartFetchManager(); - } else { - StopFetchManager(); - } + Debug.LogError("The API has been deprecated"); } public override void SetRefreshFlag (bool flag) { diff --git a/Amazon/Scripts/Internal/IOS/DTBAdRequest.cs.meta b/Amazon/Scripts/Internal/IOS/DTBAdRequest.cs.meta index 64cd525..0a2a0aa 100644 --- a/Amazon/Scripts/Internal/IOS/DTBAdRequest.cs.meta +++ b/Amazon/Scripts/Internal/IOS/DTBAdRequest.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 028c059572c3540cb8f18d6eb4f6c4be +guid: ebf50a9b3c931b648bc9277418a4dbc5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/IOS/DTBAdSize.cs.meta b/Amazon/Scripts/Internal/IOS/DTBAdSize.cs.meta index 1a04a63..1f288cc 100644 --- a/Amazon/Scripts/Internal/IOS/DTBAdSize.cs.meta +++ b/Amazon/Scripts/Internal/IOS/DTBAdSize.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b34576138f1bd4ced980dee0fd2996b0 +guid: 67c47e784fa3fbc45ad25c4461a43688 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/IOS/DTBCallback.cs.meta b/Amazon/Scripts/Internal/IOS/DTBCallback.cs.meta index d8d784b..8236964 100644 --- a/Amazon/Scripts/Internal/IOS/DTBCallback.cs.meta +++ b/Amazon/Scripts/Internal/IOS/DTBCallback.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 53febdb10cdf24c24ab963454803ad53 +guid: 8b79a8d648aadcd4880893d68bbd1df4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/IOS/DTBFetchManager.cs.meta b/Amazon/Scripts/Internal/IOS/DTBFetchManager.cs.meta index fc4f76f..9e7e97e 100644 --- a/Amazon/Scripts/Internal/IOS/DTBFetchManager.cs.meta +++ b/Amazon/Scripts/Internal/IOS/DTBFetchManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7d527c1c887004853918e03dc2f5c5c8 +guid: e33ebaf4702974a869c73077eb9e667d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/IOS/DTBSlotGroup.cs.meta b/Amazon/Scripts/Internal/IOS/DTBSlotGroup.cs.meta index 3ff304b..e9a569d 100644 --- a/Amazon/Scripts/Internal/IOS/DTBSlotGroup.cs.meta +++ b/Amazon/Scripts/Internal/IOS/DTBSlotGroup.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 734ab7005315a4ab1a6e683e7e864e28 +guid: a19e18b833a07e14699ced94129f1886 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/IOS/Externs.cs b/Amazon/Scripts/Internal/IOS/Externs.cs index f483b01..79f6ec6 100644 --- a/Amazon/Scripts/Internal/IOS/Externs.cs +++ b/Amazon/Scripts/Internal/IOS/Externs.cs @@ -47,7 +47,6 @@ namespace AmazonAds.IOS public static void _addSlotGroup(IntPtr group) {} public static string _fetchMediationHints(IntPtr resp, bool isSmartBanner) { return null; } public static string _fetchAmznSlots(IntPtr resp) { return null; } - public static string _fetchMoPubKeywords(IntPtr resp) { return null; } public static void _setCMPFlavor(int cFlavor) {} public static void _setConsentStatus(int consentStatus) {} public static IntPtr _createArray() { return IntPtr.Zero; } @@ -162,8 +161,6 @@ namespace AmazonAds.IOS [DllImport("__Internal")] public static extern int _fetchAdHeight(IntPtr resp); [DllImport("__Internal")] - public static extern string _fetchMoPubKeywords(IntPtr resp); - [DllImport("__Internal")] public static extern void _setCMPFlavor(int cFlavor); [DllImport("__Internal")] public static extern void _setConsentStatus(int consentStatus); diff --git a/Amazon/Scripts/Internal/IOS/Externs.cs.meta b/Amazon/Scripts/Internal/IOS/Externs.cs.meta index 3561351..943622b 100644 --- a/Amazon/Scripts/Internal/IOS/Externs.cs.meta +++ b/Amazon/Scripts/Internal/IOS/Externs.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1708dd63a5c574f8db8866d86b2fb232 +guid: 7560a92bf670b4446a5eb8b200ab4ec5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/IOS/IOSAdInterstitial.cs.meta b/Amazon/Scripts/Internal/IOS/IOSAdInterstitial.cs.meta index b117149..c089c1f 100644 --- a/Amazon/Scripts/Internal/IOS/IOSAdInterstitial.cs.meta +++ b/Amazon/Scripts/Internal/IOS/IOSAdInterstitial.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0d4d502223b4a4092b39024b38722b89 +guid: 239d104edcd92469cbe77af18fd7649b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/IOS/IOSAdResponce.cs b/Amazon/Scripts/Internal/IOS/IOSAdResponce.cs deleted file mode 100644 index 914704f..0000000 --- a/Amazon/Scripts/Internal/IOS/IOSAdResponce.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace AmazonAds.IOS { - public class IOSAdResponceObsolete { - } -} diff --git a/Amazon/Scripts/Internal/IOS/IOSAdResponse.cs b/Amazon/Scripts/Internal/IOS/IOSAdResponse.cs index d627c43..4602164 100644 --- a/Amazon/Scripts/Internal/IOS/IOSAdResponse.cs +++ b/Amazon/Scripts/Internal/IOS/IOSAdResponse.cs @@ -22,10 +22,6 @@ namespace AmazonAds.IOS { return Externs._fetchAdWidth(resp); } - public override string GetMoPubKeywords () { - return Externs._fetchMoPubKeywords(resp); - } - public override IntPtr GetIosResponseObject() { return resp; @@ -88,5 +84,10 @@ namespace AmazonAds.IOS { internal override void SetAdLoader(AdRequest adRequest) { adLoader = adRequest; } + + public override string GetMoPubKeywords() + { + throw new NotImplementedException(); + } } } \ No newline at end of file diff --git a/Amazon/Scripts/Internal/IOS/IOSAdResponse.cs.meta b/Amazon/Scripts/Internal/IOS/IOSAdResponse.cs.meta index f1d95d5..2167783 100644 --- a/Amazon/Scripts/Internal/IOS/IOSAdResponse.cs.meta +++ b/Amazon/Scripts/Internal/IOS/IOSAdResponse.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9fdebaea51295482fb17caa1dfcb2fd9 +guid: 486f74d5ee3fc47c29510ae4417e3d8d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/IOS/IOSAdView.cs.meta b/Amazon/Scripts/Internal/IOS/IOSAdView.cs.meta index 4bfb326..5dd5c8a 100644 --- a/Amazon/Scripts/Internal/IOS/IOSAdView.cs.meta +++ b/Amazon/Scripts/Internal/IOS/IOSAdView.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a23b0b9ff70c443cbbb45c959a58503d +guid: ee954c4db1b07425a951092e9ea875cb MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/IOS/IOSPlatform.cs b/Amazon/Scripts/Internal/IOS/IOSPlatform.cs index 8618062..a409f99 100644 --- a/Amazon/Scripts/Internal/IOS/IOSPlatform.cs +++ b/Amazon/Scripts/Internal/IOS/IOSPlatform.cs @@ -52,6 +52,7 @@ namespace AmazonAds.IOS { Externs._addSlotGroup(ptr.GetInstance()); } + [Obsolete("This API has been deprecated", false)] public override void SetCMPFlavor(Amazon.CMPFlavor cFlavor) { int fla = 0; @@ -70,6 +71,7 @@ namespace AmazonAds.IOS { Externs._setCMPFlavor(fla); } + [Obsolete("APS no longer supports this API. For GDPR, we support TCFv2 strings. Implementation instructions can be found on the APS Portal under Resources > Privacy", false)] public override void SetConsentStatus(Amazon.ConsentStatus consentStatus) { int cons = 0; @@ -91,6 +93,7 @@ namespace AmazonAds.IOS { Externs._setConsentStatus(cons); } + [Obsolete("APS no longer supports this API. For GDPR, we support TCFv2 strings. Implementation instructions can be found on the APS Portal under Resources > Privacy", false)] public override void SetVendorList(List vendorList) { IntPtr dictionary = Externs._createArray(); diff --git a/Amazon/Scripts/Internal/IOS/IOSPlatform.cs.meta b/Amazon/Scripts/Internal/IOS/IOSPlatform.cs.meta index a907b99..0d0702f 100644 --- a/Amazon/Scripts/Internal/IOS/IOSPlatform.cs.meta +++ b/Amazon/Scripts/Internal/IOS/IOSPlatform.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac416f8316ced40589eeba7b04efc627 +guid: 3d45dcbd0fb08ea41a11f185a93dc226 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/MiniJSON.cs.meta b/Amazon/Scripts/Internal/MiniJSON.cs.meta index ac9e379..83ea002 100644 --- a/Amazon/Scripts/Internal/MiniJSON.cs.meta +++ b/Amazon/Scripts/Internal/MiniJSON.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4b235ee00c3e948deaa8d5af245c9318 +guid: 2d0ac6c6632785e44981f12072090ff6 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/PlatformApi.cs.meta b/Amazon/Scripts/Internal/PlatformApi.cs.meta index d4ffe97..382ba55 100644 --- a/Amazon/Scripts/Internal/PlatformApi.cs.meta +++ b/Amazon/Scripts/Internal/PlatformApi.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a7e4c885c2b514bab912a1d10b93b56b +guid: 51621a2cb798b7e4fb0c63ed614355f9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Internal/SlotGroup.cs.meta b/Amazon/Scripts/Internal/SlotGroup.cs.meta index 46e9ed3..74c3e92 100644 --- a/Amazon/Scripts/Internal/SlotGroup.cs.meta +++ b/Amazon/Scripts/Internal/SlotGroup.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d0721cd33e88d476385237c2bf17af32 +guid: feb152fb7c07ff145a60fe9ccdb1f37c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Mediations.meta b/Amazon/Scripts/Mediations.meta index 77042fe..cf3df09 100644 --- a/Amazon/Scripts/Mediations.meta +++ b/Amazon/Scripts/Mediations.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dc21c213b3887496a9b450a63d014a4b +guid: f6db0da0788fa4dc2830d633ef211025 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Amazon/Scripts/Mediations/AppLovinMediation.meta b/Amazon/Scripts/Mediations/AppLovinMediation.meta index b2fab5b..cbcc8a7 100644 --- a/Amazon/Scripts/Mediations/AppLovinMediation.meta +++ b/Amazon/Scripts/Mediations/AppLovinMediation.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 39980aa183b504d8a8897519535976bf +guid: 5d030096ad5c54ed282a61ebbe5b630e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Amazon/Scripts/Mediations/AppLovinMediation/Editor.meta b/Amazon/Scripts/Mediations/AppLovinMediation/Editor.meta index d8d55c5..73c8dd7 100644 --- a/Amazon/Scripts/Mediations/AppLovinMediation/Editor.meta +++ b/Amazon/Scripts/Mediations/AppLovinMediation/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eb50eb92fd8e241589b99bc4635578a1 +guid: 036570c23900d4fce95f9d1c54cd6417 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Amazon/Scripts/Mediations/AppLovinMediation/Editor/APSAppLovinPackageConfig.cs b/Amazon/Scripts/Mediations/AppLovinMediation/Editor/APSAppLovinPackageConfig.cs index 3c90618..7684fd2 100644 --- a/Amazon/Scripts/Mediations/AppLovinMediation/Editor/APSAppLovinPackageConfig.cs +++ b/Amazon/Scripts/Mediations/AppLovinMediation/Editor/APSAppLovinPackageConfig.cs @@ -1,6 +1,6 @@ -public class APSAppLovinPackageConfig : AmazonPackageConfig +public class APSAppLovinPackageConfig : AmazonPackageConfig { - public const string VERSION = "1.4.3"; + public const string VERSION = "1.9.0"; public override string Name { diff --git a/Amazon/Scripts/Mediations/AppLovinMediation/Editor/APSAppLovinPackageConfig.cs.meta b/Amazon/Scripts/Mediations/AppLovinMediation/Editor/APSAppLovinPackageConfig.cs.meta index 5516962..ad93ce1 100644 --- a/Amazon/Scripts/Mediations/AppLovinMediation/Editor/APSAppLovinPackageConfig.cs.meta +++ b/Amazon/Scripts/Mediations/AppLovinMediation/Editor/APSAppLovinPackageConfig.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 605f6ed8576974f2c9a821be69531aba +guid: 9a9ea2466931546f28de79882e1a5cfd MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Amazon/Scripts/Mediations/AppLovinMediation/Editor/Dependencies.xml b/Amazon/Scripts/Mediations/AppLovinMediation/Editor/Dependencies.xml index 88914bc..b3156b5 100644 --- a/Amazon/Scripts/Mediations/AppLovinMediation/Editor/Dependencies.xml +++ b/Amazon/Scripts/Mediations/AppLovinMediation/Editor/Dependencies.xml @@ -1,9 +1,9 @@ - + - + diff --git a/Amazon/Scripts/Mediations/AppLovinMediation/Editor/Dependencies.xml.meta b/Amazon/Scripts/Mediations/AppLovinMediation/Editor/Dependencies.xml.meta index 0d908f4..57db849 100644 --- a/Amazon/Scripts/Mediations/AppLovinMediation/Editor/Dependencies.xml.meta +++ b/Amazon/Scripts/Mediations/AppLovinMediation/Editor/Dependencies.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b7874141996c14ba4b9b32651bc21d2a +guid: ba572d3f9e0fb4d699d002b783516de6 labels: - al_max - al_max_export_path-MaxSdk/Mediation/AmazonAdMarketplace/Editor/Dependencies.xml