update: Amazon Unity SDK -> 1.9.0
							parent
							
								
									abab35c2a5
								
							
						
					
					
						commit
						2d23dda7e0
					
				|  | @ -1,6 +1,6 @@ | ||||||
| { | { | ||||||
|     "name": "Amazon", |     "name": "Amazon", | ||||||
|     "rootNamespace": "", |     "rootNamespace": "AmazonAds", | ||||||
|     "references": [ |     "references": [ | ||||||
|         "MaxSdk", |         "MaxSdk", | ||||||
|         "MaxSdk.Scripts" |         "MaxSdk.Scripts" | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: fd97fc7641615462abc63e027208b9a2 | guid: 24337d8fd6824de408fd642c0e3146b9 | ||||||
| folderAsset: yes | folderAsset: yes | ||||||
| DefaultImporter: | DefaultImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|  |  | ||||||
|  | @ -11,6 +11,7 @@ Pod::Spec.new do |s| | ||||||
|    |    | ||||||
|   s.dependency 'AmazonPublisherServicesSDK' |   s.dependency 'AmazonPublisherServicesSDK' | ||||||
|   s.pod_target_xcconfig = { |   s.pod_target_xcconfig = { | ||||||
|  |     'ENABLE_BITCODE' => 'NO', | ||||||
|     'OTHER_CPLUSPLUSFLAGS' => '-fcxx-modules', |     'OTHER_CPLUSPLUSFLAGS' => '-fcxx-modules', | ||||||
|   } |   } | ||||||
| end | end | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: ce7a667caa6f64752b219fe8edd61617 | guid: ef1aca82fadf5594c9294472e9a39a60 | ||||||
| DefaultImporter: | DefaultImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   userData:  |   userData:  | ||||||
|  |  | ||||||
|  | @ -162,10 +162,6 @@ void _addSlotGroup(DTBSlotGroup* slot){ | ||||||
|     [[AmazonManager sharedManager] addSlotGroup:slot]; |     [[AmazonManager sharedManager] addSlotGroup:slot]; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| const char* _fetchMoPubKeywords(DTBAdResponse* response){ |  | ||||||
|     return amazonStringCopy([[AmazonManager sharedManager] fetchMoPubKeywords:response]); |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| const char* _fetchAmznSlots(DTBAdResponse* response){ | const char* _fetchAmznSlots(DTBAdResponse* response){ | ||||||
|     return amazonStringCopy([[AmazonManager sharedManager] fetchAmznSlots:response]); |     return amazonStringCopy([[AmazonManager sharedManager] fetchAmznSlots:response]); | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: bc75c2542fbb6469798f0dc4baf0100e | guid: 9d97bf664a8fcf944992cbb98d7bc72c | ||||||
| PluginImporter: | PluginImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -46,7 +46,6 @@ | ||||||
| -(DTBSlotGroup*)createSlotGroup:(NSString*)slotGroupName; | -(DTBSlotGroup*)createSlotGroup:(NSString*)slotGroupName; | ||||||
| -(void)addSlot:(DTBSlotGroup*)slot size:(DTBAdSize*)size; | -(void)addSlot:(DTBSlotGroup*)slot size:(DTBAdSize*)size; | ||||||
| -(void)addSlotGroup:(DTBSlotGroup*)group; | -(void)addSlotGroup:(DTBSlotGroup*)group; | ||||||
| -(NSString*)fetchMoPubKeywords:(DTBAdResponse*)response; |  | ||||||
| -(NSString*)fetchAmznSlots:(DTBAdResponse*)response; | -(NSString*)fetchAmznSlots:(DTBAdResponse*)response; | ||||||
| -(int)fetchAdWidth:(DTBAdResponse*)response; | -(int)fetchAdWidth:(DTBAdResponse*)response; | ||||||
| -(int)fetchAdHeight:(DTBAdResponse*)response; | -(int)fetchAdHeight:(DTBAdResponse*)response; | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 9d0a8448aa0c147e8a0225de1609f269 | guid: 2e1cac3d96762d449875050ca121f4da | ||||||
| PluginImporter: | PluginImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,7 @@ | ||||||
| #import "AmazonManager.h" | #import "AmazonManager.h" | ||||||
| 
 | 
 | ||||||
|  | static NSString * const SKADNETWORK_PARAM = @"skadn_params"; | ||||||
|  | 
 | ||||||
| @implementation AmazonManager | @implementation AmazonManager | ||||||
| 
 | 
 | ||||||
| #pragma mark NSObject | #pragma mark NSObject | ||||||
|  | @ -182,9 +184,6 @@ | ||||||
|     [DTBAds.sharedInstance addSlotGroup:group]; |     [DTBAds.sharedInstance addSlotGroup:group]; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| -(NSString*)fetchMoPubKeywords:(DTBAdResponse*)response { |  | ||||||
|     return [response keywordsForMopub]; |  | ||||||
| } |  | ||||||
| 
 | 
 | ||||||
| -(NSString*)fetchAmznSlots:(DTBAdResponse *)response { | -(NSString*)fetchAmznSlots:(DTBAdResponse *)response { | ||||||
|     return [response amznSlots]; |     return [response amznSlots]; | ||||||
|  | @ -209,6 +208,27 @@ | ||||||
|     [dateFormatter setDateFormat:@"dd-MM-yyyy"]; |     [dateFormatter setDateFormat:@"dd-MM-yyyy"]; | ||||||
|     NSString *stringDate = [dateFormatter stringFromDate:myDate]; |     NSString *stringDate = [dateFormatter stringFromDate:myDate]; | ||||||
|     [mHint setValue:stringDate forKey:@"load_start"]; |     [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]; |     NSData * jsonData = [NSJSONSerialization  dataWithJSONObject:mHint options:0 error:&err]; | ||||||
|     NSString * mediationHints = [[NSString alloc] initWithData:jsonData   encoding:NSUTF8StringEncoding]; |     NSString * mediationHints = [[NSString alloc] initWithData:jsonData   encoding:NSUTF8StringEncoding]; | ||||||
|     return mediationHints; |     return mediationHints; | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 65a7bcd4e95cc47c88cd2b6280e00c17 | guid: 3eda61770afc43b42aa9ec92fea59924 | ||||||
| PluginImporter: | PluginImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 4ab68d8321afe4cca8177a404f816891 | guid: eccfcb2b937138c48b44c7208b81ff98 | ||||||
| PluginImporter: | PluginImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: ab36449d445ac4544afe77c7c0539ec0 | guid: 459e879fe800355479f460f15ae3f34a | ||||||
| PluginImporter: | PluginImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: a58dbc723902c4dd6a148f77e0845a3c | guid: 48b2839701f014a86bce37c62ac4c698 | ||||||
| PluginImporter: | PluginImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 64f2586d9fb3549848bbd34f6f8085d2 | guid: ddf46b748d5ca4bd1b52a59e051346a5 | ||||||
| PluginImporter: | PluginImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: ec64dc94f39894ffba7e39a14f3b2102 | guid: 23a35b63b9ca64f63ac1e624f7ec73d4 | ||||||
| PluginImporter: | PluginImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 4f43b5dc42cf54011b96f66d261f2619 | guid: f6abf5beb5efe42ad88f270ed8f412e1 | ||||||
| PluginImporter: | PluginImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -387,7 +387,7 @@ RectTransform: | ||||||
|   m_Children: |   m_Children: | ||||||
|   - {fileID: 491590228} |   - {fileID: 491590228} | ||||||
|   m_Father: {fileID: 640056004} |   m_Father: {fileID: 640056004} | ||||||
|   m_RootOrder: 2 |   m_RootOrder: 3 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|   m_AnchorMax: {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_LocalScale: {x: 0, y: 0, z: 0} | ||||||
|   m_Children: |   m_Children: | ||||||
|   - {fileID: 1889519549} |   - {fileID: 1889519549} | ||||||
|  |   - {fileID: 1477954961} | ||||||
|   - {fileID: 820223061} |   - {fileID: 820223061} | ||||||
|   - {fileID: 620422002} |   - {fileID: 620422002} | ||||||
|   - {fileID: 735603278} |   - {fileID: 735603278} | ||||||
|   - {fileID: 739627434} |   - {fileID: 739627434} | ||||||
|   - {fileID: 1477954961} |   - {fileID: 929227399} | ||||||
|   m_Father: {fileID: 0} |   m_Father: {fileID: 0} | ||||||
|   m_RootOrder: 2 |   m_RootOrder: 2 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|  | @ -621,7 +622,7 @@ RectTransform: | ||||||
|   m_Children: |   m_Children: | ||||||
|   - {fileID: 1079672022} |   - {fileID: 1079672022} | ||||||
|   m_Father: {fileID: 640056004} |   m_Father: {fileID: 640056004} | ||||||
|   m_RootOrder: 3 |   m_RootOrder: 4 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|   m_AnchorMax: {x: 0.5, y: 0.5} |   m_AnchorMax: {x: 0.5, y: 0.5} | ||||||
|  | @ -751,7 +752,7 @@ RectTransform: | ||||||
|   m_Children: |   m_Children: | ||||||
|   - {fileID: 1682398784} |   - {fileID: 1682398784} | ||||||
|   m_Father: {fileID: 640056004} |   m_Father: {fileID: 640056004} | ||||||
|   m_RootOrder: 4 |   m_RootOrder: 5 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|   m_AnchorMax: {x: 0.5, y: 0.5} |   m_AnchorMax: {x: 0.5, y: 0.5} | ||||||
|  | @ -849,6 +850,84 @@ CanvasRenderer: | ||||||
|   m_PrefabAsset: {fileID: 0} |   m_PrefabAsset: {fileID: 0} | ||||||
|   m_GameObject: {fileID: 739627433} |   m_GameObject: {fileID: 739627433} | ||||||
|   m_CullTransparentMesh: 0 |   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 | --- !u!1 &820223060 | ||||||
| GameObject: | GameObject: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  | @ -881,7 +960,7 @@ RectTransform: | ||||||
|   m_Children: |   m_Children: | ||||||
|   - {fileID: 1290993690} |   - {fileID: 1290993690} | ||||||
|   m_Father: {fileID: 640056004} |   m_Father: {fileID: 640056004} | ||||||
|   m_RootOrder: 1 |   m_RootOrder: 2 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|   m_AnchorMax: {x: 0.5, y: 0.5} |   m_AnchorMax: {x: 0.5, y: 0.5} | ||||||
|  | @ -979,6 +1058,136 @@ CanvasRenderer: | ||||||
|   m_PrefabAsset: {fileID: 0} |   m_PrefabAsset: {fileID: 0} | ||||||
|   m_GameObject: {fileID: 820223060} |   m_GameObject: {fileID: 820223060} | ||||||
|   m_CullTransparentMesh: 0 |   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 | --- !u!1 &946867260 | ||||||
| GameObject: | GameObject: | ||||||
|   m_ObjectHideFlags: 0 |   m_ObjectHideFlags: 0 | ||||||
|  | @ -1360,7 +1569,7 @@ RectTransform: | ||||||
|   m_Children: |   m_Children: | ||||||
|   - {fileID: 499681495} |   - {fileID: 499681495} | ||||||
|   m_Father: {fileID: 640056004} |   m_Father: {fileID: 640056004} | ||||||
|   m_RootOrder: 5 |   m_RootOrder: 1 | ||||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||||
|   m_AnchorMin: {x: 0.5, y: 0.5} |   m_AnchorMin: {x: 0.5, y: 0.5} | ||||||
|   m_AnchorMax: {x: 0.5, y: 0.5} |   m_AnchorMax: {x: 0.5, y: 0.5} | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: fb8e1477d33cb4076b8aa247ae7dd237 | guid: 2024bb7799cb45c489867a78c4ef889c | ||||||
| DefaultImporter: | DefaultImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   userData:  |   userData:  | ||||||
|  |  | ||||||
|  | @ -3,6 +3,7 @@ using System; | ||||||
| using AmazonAds; | using AmazonAds; | ||||||
| using UnityEngine; | using UnityEngine; | ||||||
| using System.Collections.Generic; | using System.Collections.Generic; | ||||||
|  | using UnityEngine.SceneManagement; | ||||||
| 
 | 
 | ||||||
| public class AmazonMaxDemo : MonoBehaviour { | public class AmazonMaxDemo : MonoBehaviour { | ||||||
| 
 | 
 | ||||||
|  | @ -47,6 +48,7 @@ public class AmazonMaxDemo : MonoBehaviour { | ||||||
|         Amazon.EnableTesting(true); |         Amazon.EnableTesting(true); | ||||||
|         Amazon.EnableLogging(true); |         Amazon.EnableLogging(true); | ||||||
|         Amazon.UseGeoLocation(true); |         Amazon.UseGeoLocation(true); | ||||||
|  |         Amazon.IsLocationEnabled(); | ||||||
|         Amazon.SetMRAIDPolicy(Amazon.MRAIDPolicy.CUSTOM); |         Amazon.SetMRAIDPolicy(Amazon.MRAIDPolicy.CUSTOM); | ||||||
|         Amazon.SetAdNetworkInfo(new AdNetworkInfo(DTBAdNetwork.MAX)); |         Amazon.SetAdNetworkInfo(new AdNetworkInfo(DTBAdNetwork.MAX)); | ||||||
|         Amazon.SetMRAIDSupportedVersions(new string[] { "1.0", "2.0", "3.0" });  |         Amazon.SetMRAIDSupportedVersions(new string[] { "1.0", "2.0", "3.0" });  | ||||||
|  | @ -121,17 +123,18 @@ public class AmazonMaxDemo : MonoBehaviour { | ||||||
|         const int width = 320; |         const int width = 320; | ||||||
|         const int height = 50; |         const int height = 50; | ||||||
| 
 | 
 | ||||||
|         if (bannerAdRequest != null) bannerAdRequest.DestroyFetchManager(); |  | ||||||
|         bannerAdRequest = new APSBannerAdRequest(width, height, amazonBannerSlotId); |         bannerAdRequest = new APSBannerAdRequest(width, height, amazonBannerSlotId); | ||||||
|         bannerAdRequest.onFailedWithError += (adError) => |         bannerAdRequest.onFailedWithError += (adError) => | ||||||
|         { |         { | ||||||
|             MaxSdk.SetBannerLocalExtraParameter(maxBannerAdId, "amazon_ad_error", adError.GetAdError()); |             MaxSdk.SetBannerLocalExtraParameter(maxBannerAdId, "amazon_ad_error", adError.GetAdError()); | ||||||
|             CreateMaxBannerAd(); |             CreateMaxBannerAd(); | ||||||
|  |             bannerAdRequest.Dispose(); | ||||||
|         }; |         }; | ||||||
|         bannerAdRequest.onSuccess += (adResponse) => |         bannerAdRequest.onSuccess += (adResponse) => | ||||||
|         { |         { | ||||||
|             MaxSdk.SetBannerLocalExtraParameter(maxBannerAdId, "amazon_ad_response", adResponse.GetResponse()); |             MaxSdk.SetBannerLocalExtraParameter(maxBannerAdId, "amazon_ad_response", adResponse.GetResponse()); | ||||||
|             CreateMaxBannerAd(); |             CreateMaxBannerAd(); | ||||||
|  |             bannerAdRequest.Dispose(); | ||||||
|         }; |         }; | ||||||
|         bannerAdRequest.LoadAd(); |         bannerAdRequest.LoadAd(); | ||||||
|     } |     } | ||||||
|  | @ -294,4 +297,10 @@ public class AmazonMaxDemo : MonoBehaviour { | ||||||
|     { |     { | ||||||
|         Debug.Log("OnRewardedAdRevenuePaidEvent"); |         Debug.Log("OnRewardedAdRevenuePaidEvent"); | ||||||
|     } |     } | ||||||
|  | 
 | ||||||
|  |     public void goBack()  | ||||||
|  |     { | ||||||
|  |         MaxSdk.DestroyBanner(maxBannerAdId); | ||||||
|  |         SceneManager.LoadScene(0); | ||||||
|  |     } | ||||||
| } | } | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 34ed58385e8924837ad87a1f2966e16b | guid: 312c0b7796265224ca6bd13197a7d5d6 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -45,14 +45,18 @@ namespace AmazonAds { | ||||||
|             api.SetMRAIDPolicy (policy); |             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){ |         public static void SetCMPFlavor(Amazon.CMPFlavor cFlavor){ | ||||||
|             api.SetCMPFlavor(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){ |         public static void SetConsentStatus(Amazon.ConsentStatus consentStatus){ | ||||||
|             api.SetConsentStatus(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<int> vendorList){ |         public static void SetVendorList(List<int> vendorList){ | ||||||
|             api.SetVendorList(vendorList); |             api.SetVendorList(vendorList); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: d5987cccc71fa4c51877e7c22d2d5f56 | guid: 8b51dd1c8083d0a43b10a2507d7c4077 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,8 +1,8 @@ | ||||||
| using System; | using System; | ||||||
| 
 | 
 | ||||||
| public static class AmazonConstants | 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 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"; |     public const string titleAboutDialog = "About Amazon SDK"; | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: a4c36066dbdad415b978c38a01a2b675 | guid: b7f4b6635633144c4a35f2a254c0cca2 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 8c45974962ec542baad78d4c30cd0056 | guid: 822aefd58f1740341957f448c17e0527 | ||||||
| folderAsset: yes | folderAsset: yes | ||||||
| DefaultImporter: | DefaultImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: d4da15e7be3dc455d97abce962533892 | guid: ed7d5de51284c48cb8938e48e74c1b48 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ using System.Collections; | ||||||
| using System.Runtime.InteropServices; | using System.Runtime.InteropServices; | ||||||
| using UnityEngine; | using UnityEngine; | ||||||
| namespace AmazonAds { | namespace AmazonAds { | ||||||
|     public abstract class IAdRequest { |     public abstract class IAdRequest : IDisposable { | ||||||
|         protected int refreshTime = 60; |         protected int refreshTime = 60; | ||||||
|         protected string autoRefreshID = "0"; //FetchManageerUniqueID |         protected string autoRefreshID = "0"; //FetchManageerUniqueID | ||||||
|         protected bool isAutoRefreshAdMob = false; |         protected bool isAutoRefreshAdMob = false; | ||||||
|  | @ -38,6 +38,9 @@ namespace AmazonAds { | ||||||
|         public abstract void StartFetchManager(); |         public abstract void StartFetchManager(); | ||||||
|         public abstract void SetRefreshFlag(bool flag); |         public abstract void SetRefreshFlag(bool flag); | ||||||
| 
 | 
 | ||||||
|  |         public void Dispose() { | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|         protected static class Schedule { |         protected static class Schedule { | ||||||
|             private class Runner : MonoBehaviour { } |             private class Runner : MonoBehaviour { } | ||||||
|             private static Runner _backer; |             private static Runner _backer; | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: ba13283bbee174961b809f3b9e502094 | guid: 7168c7b8916657b40b6a8e4f32705497 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 33e37a43420f84a408938af12117ff08 | guid: ac582b3e4345e494ca3609440fc4fe2b | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -7,5 +7,7 @@ using UnityEngine; | ||||||
| namespace AmazonAds { | namespace AmazonAds { | ||||||
|     public abstract class IAdView { |     public abstract class IAdView { | ||||||
|         public abstract void FetchAd (AdResponse adResponse); |         public abstract void FetchAd (AdResponse adResponse); | ||||||
|  |         public void Dispose() { | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: adeba99c4a0f04b54b8af9623665e2d5 | guid: 48d4f5afa2a1440c29ea78d8f33885dc | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: dec92b206e59e400c8706ec073e326d1 | guid: 9145340011b3e427dbfe964d0bf59f55 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 2b1f29380367c47c6a1c112ddc47ad84 | guid: 53a2d09f4898f244c84722134fc51501 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 60916135eefd74087bcd8ca80bd94ddc | guid: 43367e8560d848a4da8a31062731720b | ||||||
| folderAsset: yes | folderAsset: yes | ||||||
| DefaultImporter: | DefaultImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|  |  | ||||||
|  | @ -1,3 +1,7 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 59f42bdf21710439a90f93e01e1f8984 | guid: 2bfb493dbc0ec40a29dde187397eb936 | ||||||
| timeCreated: 1700190285 | AssemblyDefinitionImporter: | ||||||
|  |   externalObjects: {} | ||||||
|  |   userData:  | ||||||
|  |   assetBundleName:  | ||||||
|  |   assetBundleVariant:  | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 431a6434bfc0a47e8a2c936e434c3d3b | guid: 59ff8b0c895196d4bbec7aad4098ab3d | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -14,6 +14,8 @@ public class AmazonBuildScript | ||||||
|         string[] scenes = EditorBuildSettings.scenes.Where(s => s.enabled).Select(s => s.path).ToArray(); |         string[] scenes = EditorBuildSettings.scenes.Where(s => s.enabled).Select(s => s.path).ToArray(); | ||||||
|         EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.iOS, BuildTarget.iOS); |         EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.iOS, BuildTarget.iOS); | ||||||
|         string outputFileName = GetArg("-output", DEFAULT_IOS_BUILD_DIR); |         string outputFileName = GetArg("-output", DEFAULT_IOS_BUILD_DIR); | ||||||
|  |         PlayerSettings.iOS.appleDeveloperTeamID = "P78AXXW29G"; | ||||||
|  |         PlayerSettings.iOS.appleEnableAutomaticSigning = true; | ||||||
|         BuildPipeline.BuildPlayer(scenes, outputFileName, BuildTarget.iOS, BuildOptions.Development); |         BuildPipeline.BuildPlayer(scenes, outputFileName, BuildTarget.iOS, BuildOptions.Development); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: c1378b372e98d4b56a16725bf370ae6c | guid: e80f7a57e62ab4edabfda12a4e7b34fe | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: aae61b43441904bbcbf7f24ff05e20d2 | guid: fb7213131ee033443bc8caa6cf8201aa | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: dcee96832dc4141299f36d8b10b10467 | guid: 768de77ca8c7ccc47b233b0b09a42d9c | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,16 +1,16 @@ | ||||||
| <?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||||
| <dependencies> | <dependencies> | ||||||
|   <androidPackages> |   <androidPackages> | ||||||
|  |     <androidPackage spec="com.iabtcf:iabtcf-decoder:2.0.10"/> | ||||||
|     <androidPackage spec="androidx.appcompat:appcompat:1.1.0"/> |     <androidPackage spec="androidx.appcompat:appcompat:1.1.0"/> | ||||||
|     <androidPackage spec="com.google.android.gms:play-services-ads-lite:20.0.0" /> |     <androidPackage spec="com.amazon.android:aps-sdk:9.9.+@aar"> | ||||||
|     <androidPackage spec="com.amazon.android:aps-sdk:9.5.4@aar"> |  | ||||||
|       <repositories> |       <repositories> | ||||||
|         <repository>https://aws.oss.sonatype.org/content/repositories/releases/</repository> |         <repository>https://aws.oss.sonatype.org/content/repositories/releases/</repository> | ||||||
|       </repositories> |       </repositories> | ||||||
|     </androidPackage> |     </androidPackage> | ||||||
|   </androidPackages> |   </androidPackages> | ||||||
|   <iosPods> |   <iosPods> | ||||||
|     <iosPod name="Amazon-SDK-Plugin" minTargetSdk="12.5" path="Packages/com.guru.unity.max/Amazon/Plugins/iOS" /> |     <iosPod name="Amazon-SDK-Plugin" minTargetSdk="12.5" path="Assets/Amazon/Plugins/iOS"/> | ||||||
|     <iosPod name="AmazonPublisherServicesSDK" version="~> 4.5.0" /> |     <iosPod name="AmazonPublisherServicesSDK" version="~> 4.7"/> | ||||||
|   </iosPods> |   </iosPods> | ||||||
| </dependencies> | </dependencies> | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: c9bc3db2384e74f03ae6d3b496e9fdc9 | guid: 54e062f8003d00e469680f856f94a517 | ||||||
| TextScriptImporter: | TextScriptImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   userData:  |   userData:  | ||||||
|  |  | ||||||
|  | @ -6,48 +6,24 @@ using UnityEditor.iOS.Xcode; | ||||||
| using UnityEngine; | using UnityEngine; | ||||||
| namespace AmazonInternal.Editor.Postbuild { | namespace AmazonInternal.Editor.Postbuild { | ||||||
|     public static class AmazonPostBuildiOS { |     public static class AmazonPostBuildiOS { | ||||||
|         [PostProcessBuild( 45 )] |         [PostProcessBuildAttribute(1)] | ||||||
|         public static void OnPostprocessBuild(BuildTarget buildTarget, string path) |         public static void OnPostprocessBuild(BuildTarget buildTarget, string path) { | ||||||
|         { |  | ||||||
|             if (buildTarget != BuildTarget.iOS) |             if (buildTarget != BuildTarget.iOS) | ||||||
|                 return; |                 return; | ||||||
|              |              | ||||||
|  |             string projPath = path + "/Unity-iPhone.xcodeproj/project.pbxproj"; | ||||||
|             string pbxProjectPath = PBXProject.GetPBXProjectPath(path); |             string pbxProjectPath = PBXProject.GetPBXProjectPath(path); | ||||||
|             PBXProject project = new PBXProject(); |             PBXProject pbxProject = new PBXProject(); | ||||||
| 
 | 
 | ||||||
|             project.ReadFromFile(pbxProjectPath); |             pbxProject.ReadFromFile(pbxProjectPath); | ||||||
| 
 | 
 | ||||||
| #if UNITY_2019_3_OR_NEWER |             string[] targetGuids = new string[2] { | ||||||
|             string targetGuid = project.GetUnityFrameworkTargetGuid(); |                 pbxProject.GetUnityMainTargetGuid(), | ||||||
| #else |                 pbxProject.GetUnityFrameworkTargetGuid() | ||||||
|             string targetGuid = project.TargetGuidByName(PBXProject.GetUnityTargetName()); |             }; | ||||||
| #endif |             pbxProject.SetBuildProperty(targetGuids, "ENABLE_BITCODE", "NO"); | ||||||
|             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); |             pbxProject.WriteToFile(pbxProjectPath); | ||||||
| 
 |  | ||||||
| #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 |  | ||||||
|         }         |         }         | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: f7474cff9dfc144e89f4e7696b4b8d9c | guid: ddd7aae4d9bd0644485bb967a9d9d838 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,4 +1,4 @@ | ||||||
| using System; | using System; | ||||||
| using System.Collections; | using System.Collections; | ||||||
| using System.Collections.Generic; | using System.Collections.Generic; | ||||||
| using System.IO; | 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 () { |     public static void About () { | ||||||
|         AmazonAboutDialog.ShowDialog (); |         AmazonAboutDialog.ShowDialog (); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| //    [MenuItem ("Amazon/Documentation...", false, 1)] |     [MenuItem ("Amazon/Documentation...", false, 1)] | ||||||
|     public static void Documentation () { |     public static void Documentation () { | ||||||
|         Application.OpenURL (AmazonConstants.docUrl); |         Application.OpenURL (AmazonConstants.docUrl); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| //    [MenuItem ("Amazon/Manage SDKs...", false, 4)] |     [MenuItem ("Amazon/Manage SDKs...", false, 4)] | ||||||
|     public static void SdkManagerProd () { |     public static void SdkManagerProd () { | ||||||
|         AmazonSDKManager.ShowSDKManager (); |         AmazonSDKManager.ShowSDKManager (); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 9436cb85e61464fbb8e7434090ec1af2 | guid: 970ae7f36073f3f4fb04767c1223a840 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: e64d0b097e7e04e59b22cd2d61ff42a5 | guid: d58a19dba1752614fb20bbe8420899e5 | ||||||
| folderAsset: yes | folderAsset: yes | ||||||
| DefaultImporter: | DefaultImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 8b00fb31f302f4b26a43151fd12cffbc | guid: ebb19576a0bf36a4faa016a9fb7a88ee | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: fe3a64de565fa4daa9ac26c80cdb1f6e | guid: c6db4e2f03cecbf4c83eb7416ebbd623 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: e4a38f41a15b0444380ccd4a74a12ac2 | guid: 84c1ddf10f083ef4ab7614bd9a8edd62 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 3eac84282b79049f0bbadc32296d7b29 | guid: 2dba0aed518058e42959ba3e629b0bb6 | ||||||
| folderAsset: yes | folderAsset: yes | ||||||
| DefaultImporter: | DefaultImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: d06f90422ce794d848656240f4d00aae | guid: 6d2b55178eeb0496e9d81c6a3ddb8d3d | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -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<string, string> CCPAPrivacy { private get;  set; } | ||||||
|  | 
 | ||||||
|  |         public Dictionary<string, string> GetAdMobInterstitialRequestExtras () | ||||||
|  |         { | ||||||
|  |             Dictionary<String, String> AdMobRequestExtras = createExtras (); | ||||||
|  |             if (SlotUUID == null) | ||||||
|  |             { | ||||||
|  |                 return AdMobRequestExtras; | ||||||
|  |             } | ||||||
|  | 
 | ||||||
|  | #if UNITY_ANDROID | ||||||
|  |             AndroidJavaObject bundle = dtbAdUtil.CallStatic<AndroidJavaObject>("createAdMobInterstitialVideoRequestBundle", SlotUUID); | ||||||
|  |             AdMobRequestExtras.Add (ADMOB_SLOTUUID_KEY, bundle.Call<String>("getString", ADMOB_SLOTUUID_KEY)); | ||||||
|  |             AdMobRequestExtras.Add (ADMOB_REQUEST_ID_KEY, bundle.Call<String>("getString", ADMOB_REQUEST_ID_KEY)); | ||||||
|  |             AdMobRequestExtras.Add (APS_ADAPTER_VERSION, bundle.Call<String>("getString", APS_ADAPTER_VERSION));        | ||||||
|  | #else | ||||||
|  |             AdMobRequestExtras.Add (ADMOB_SLOTUUID_KEY, SlotUUID); | ||||||
|  | #endif | ||||||
|  |             return AdMobRequestExtras; | ||||||
|  | 
 | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|  |         public Dictionary<string, string> GetAdMobBannerRequestExtras () | ||||||
|  |         { | ||||||
|  |             Dictionary<String, String> AdMobRequestExtras = createExtras(); | ||||||
|  |             if (SlotUUID == null || BannerAdWidth  == 0 || BannerAdHeight == 0) | ||||||
|  |             { | ||||||
|  |                 return AdMobRequestExtras; | ||||||
|  |             } | ||||||
|  | 
 | ||||||
|  | #if UNITY_ANDROID | ||||||
|  |             AndroidJavaObject bundle = dtbAdUtil.CallStatic<AndroidJavaObject> ("createAdMobBannerRequestBundle", SlotUUID, BannerAdWidth, BannerAdHeight); | ||||||
|  |             AdMobRequestExtras.Add (ADMOB_SLOTUUID_KEY, bundle.Call<String>("getString", ADMOB_SLOTUUID_KEY)); | ||||||
|  |             AdMobRequestExtras.Add (ADMOB_HEIGHT_KEY, bundle.Call<int>("getInt", ADMOB_HEIGHT_KEY).ToString()); | ||||||
|  |             AdMobRequestExtras.Add (ADMOB_WIDTH_KEY, bundle.Call<int>("getInt", ADMOB_WIDTH_KEY).ToString()); | ||||||
|  |             AdMobRequestExtras.Add (ADMOB_REQUEST_ID_KEY, bundle.Call<String>("getString", ADMOB_REQUEST_ID_KEY)); | ||||||
|  |             AdMobRequestExtras.Add (APS_ADAPTER_VERSION, bundle.Call<String>("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<String, String> createExtras() | ||||||
|  |         { | ||||||
|  |             Dictionary<String, String> extrasMap = new Dictionary<string, string>(); | ||||||
|  |             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<string, string>(); | ||||||
|  |             } | ||||||
|  | 
 | ||||||
|  |             internal string SlotUUID { get; private set; } | ||||||
|  |             internal int AdHeight { get; private set; } | ||||||
|  |             internal int AdWidth { get; private set; } | ||||||
|  |             internal Dictionary<string, string> 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<string, string> CCPAPrivacy) | ||||||
|  |             { | ||||||
|  |                 this.CCPAPrivacy = CCPAPrivacy; | ||||||
|  |                 return this; | ||||||
|  |             } | ||||||
|  | 
 | ||||||
|  |             public APSAdRequestExtra Build() | ||||||
|  |             { | ||||||
|  |                 return new APSAdRequestExtra(this); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | 
 | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 9111bf37862934342b4a39f926faa2b7 | guid: 75f392fb260fb45329f6b11ae4a21e9b | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  | @ -1,23 +1,22 @@ | ||||||
| namespace AmazonAds { | using System; | ||||||
|  | using UnityEngine; | ||||||
|  | 
 | ||||||
|  | namespace AmazonAds { | ||||||
|     public class APSBannerAdRequest : AdRequest { |     public class APSBannerAdRequest : AdRequest { | ||||||
| 
 | 
 | ||||||
|         public APSBannerAdRequest () : base() {  |         public APSBannerAdRequest () : base() {  | ||||||
|              Amazon.OnApplicationPause += OnApplicationPause; |  | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         public APSBannerAdRequest (string slotGroupName) : base() { |         public APSBannerAdRequest (string slotGroupName) : base() { | ||||||
|             Amazon.OnApplicationPause += OnApplicationPause; |  | ||||||
|             client.SetSlotGroup (slotGroupName); |             client.SetSlotGroup (slotGroupName); | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         public APSBannerAdRequest (int width, int height, string uid) : base() { |         public APSBannerAdRequest (int width, int height, string uid) : base() { | ||||||
|             Amazon.OnApplicationPause += OnApplicationPause; |  | ||||||
|             AdSize size = new AdSize (width, height, uid); |             AdSize size = new AdSize (width, height, uid); | ||||||
|             client.SetSizes (size.GetInstance ()); |             client.SetSizes (size.GetInstance ()); | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         public APSBannerAdRequest (AdSize size) { |         public APSBannerAdRequest (AdSize size) { | ||||||
|             Amazon.OnApplicationPause += OnApplicationPause; |  | ||||||
|             client.SetSizes (size.GetInstance ()); |             client.SetSizes (size.GetInstance ()); | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  | @ -42,47 +41,47 @@ | ||||||
|             client.SetSlotGroup (slotGroupName); |             client.SetSlotGroup (slotGroupName); | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |         [Obsolete("This API has been deprecated", false)] | ||||||
|         public void SetAutoRefreshAdMob (bool flag, bool isSmartBanner = 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) { |         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 () { |         public void DisposeAd () { | ||||||
|             client.DisposeAd (); |             Debug.LogError("This API has been deprecated"); | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |         [Obsolete("This API has been deprecated", false)] | ||||||
|         public void IsAutoRefreshAdMob () { |         public void IsAutoRefreshAdMob () { | ||||||
|             client.IsAutoRefreshAdMob (); |             Debug.LogError("This API has been deprecated"); | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |         [Obsolete("This API has been deprecated", false)] | ||||||
|         public void IsAutoRefreshMoPub () { |         public void IsAutoRefreshMoPub () { | ||||||
|             client.IsAutoRefreshMoPub (); |             Debug.LogError("This API has been deprecated"); | ||||||
|         } |         } | ||||||
|         public string AutoRefreshID () { |         public string AutoRefreshID () { | ||||||
|             return client.AutoRefreshID (); |             return client.AutoRefreshID (); | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |         [Obsolete("This API has been deprecated", false)] | ||||||
|         public void CreateFetchManager (bool isSmartBanner = 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 () { |         public void DestroyFetchManager () { | ||||||
|             client.DestroyFetchManager (); |             Debug.LogError("The API has been deprecated"); | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |         [Obsolete("This API has been deprecated", false)] | ||||||
|         public void OnApplicationPause (bool isPaused) { |         public void OnApplicationPause (bool isPaused) { | ||||||
|             if (isPaused) { |             Debug.LogError("This API has been deprecated"); | ||||||
|                 if( client.IsAutoRefreshAdMob() ){ |  | ||||||
|                     client.StopFetchManager(); |  | ||||||
|                 } |  | ||||||
|             } else { |  | ||||||
|                 if( client.IsAutoRefreshAdMob() ){ |  | ||||||
|                     client.StartFetchManager(); |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 62abdd252c1aa49beb917ca0a7b4d3b3 | guid: 93f096fe94c739c42bd555fff7f57571 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: a60589c70736841a6b26fa39087d8e98 | guid: 5e132029d7bab2d4684faf398279497b | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -5,33 +5,99 @@ namespace AmazonAds { | ||||||
|     public class APSMediationUtils |     public class APSMediationUtils | ||||||
|     { |     { | ||||||
|         public static string APS_IRON_SOURCE_NETWORK_KEY = "APS"; |         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(); |             return GetNetworkData(amazonSlotId, adResponse, APS_INTERSTITIAL_KEY); | ||||||
|             ironSourceInputData.bidInfo = bidInfo; |  | ||||||
|             ironSourceInputData.pricePointEncoded = pricePoint; |  | ||||||
|             ironSourceInputData.uuid = amazonSlotId; |  | ||||||
| 
 | 
 | ||||||
|             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; |             public string bidInfo; | ||||||
|  | 
 | ||||||
|  | #endif | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|  |         public class APSIronSourceNetworkBannerInputData | ||||||
|  |         { | ||||||
|  | #if UNITY_ANDROID | ||||||
|  |             public string bidInfo; | ||||||
|  | 
 | ||||||
|  | #endif | ||||||
|             public string pricePointEncoded; |             public string pricePointEncoded; | ||||||
|             public string uuid; |             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() |         private APSMediationUtils() | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: a9a84a300e9084005845d7561b5941de | guid: 6462f49a627cd4380aecc9aff2a008ae | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: f887445d62a094bdcaeba6843c76de52 | guid: 0116cf1c62b814514ac6cca1ac619af8 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 56cbe6c6e32004910b2c76cefbf4e0c6 | guid: 3215ade8b363a427891857ff10c3981f | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: b6b4a1dc9a6eb4aac89ddfeb50a829a5 | guid: a03e9d205385f4937b8627db76ac71a4 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -3,7 +3,6 @@ using System; | ||||||
| namespace AmazonAds { | namespace AmazonAds { | ||||||
|     public enum DTBAdNetwork {  |     public enum DTBAdNetwork {  | ||||||
|         GOOGLE_AD_MANAGER, |         GOOGLE_AD_MANAGER, | ||||||
|         MOPUB_AD_SERVER, |  | ||||||
|         ADMOB, |         ADMOB, | ||||||
|         AD_GENERATION, |         AD_GENERATION, | ||||||
|         IRON_SOURCE, |         IRON_SOURCE, | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 86929efe844004ce4a245fed201d6f9b | guid: 06e9bcca68bcd4c268eaf4d0dbd27002 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -16,6 +16,12 @@ namespace AmazonAds { | ||||||
| #endif | #endif | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |         public void Dispose() { | ||||||
|  |             #if UNITY_ANDROID | ||||||
|  |             client.Dispose(); | ||||||
|  |             #endif | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|         public AdRequest (IAdRequest adRequest) { |         public AdRequest (IAdRequest adRequest) { | ||||||
|             client = adRequest; |             client = adRequest; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 470ce0a8c403f4531ac94b5ebe2ea5f4 | guid: b9e5b4e4e1cabfc4c85b094dd97956b5 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,4 +0,0 @@ | ||||||
| namespace AmazonAds { |  | ||||||
|     public abstract class AdResponseObsolete { |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  | @ -1,11 +0,0 @@ | ||||||
| fileFormatVersion: 2 |  | ||||||
| guid: 07d84938416874bbb97e941098b24279 |  | ||||||
| MonoImporter: |  | ||||||
|   externalObjects: {} |  | ||||||
|   serializedVersion: 2 |  | ||||||
|   defaultReferences: [] |  | ||||||
|   executionOrder: 0 |  | ||||||
|   icon: {instanceID: 0} |  | ||||||
|   userData:  |  | ||||||
|   assetBundleName:  |  | ||||||
|   assetBundleVariant:  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 80115d4cd111a4902804a0557a637367 | guid: ddb5dd3e28b574a74b676b9a456bdb41 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 6669e9284e4b5497fb351ae7bcb28436 | guid: 3fe91a7e44a1a364e8bfaa45f0af5a48 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -15,6 +15,12 @@ namespace AmazonAds { | ||||||
|             #endif |             #endif | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |         public void Dispose() { | ||||||
|  |             #if UNITY_ANDROID | ||||||
|  |             adView.Dispose(); | ||||||
|  |             #endif | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|         public void fetchAd (AdResponse adResponse) { |         public void fetchAd (AdResponse adResponse) { | ||||||
|             adView.FetchAd(adResponse); |             adView.FetchAd(adResponse); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: ae0729fd51c4548638665a625582c64e | guid: 3c1cdb4ad102d47eab59e8df1f917c4d | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: c289908250a174f72824418c6968e5f6 | guid: 732f6afbd1c571441bdc86f6f48e847e | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 8472e80d0d208414880cdcf4c8b6889f | guid: dd98afcb8352e134ab09ab54c5c8b844 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 7b3522bb34b494fbfac3a4d58f6de400 | guid: 56389f93bf97fcd4e97d5360316491c1 | ||||||
| folderAsset: yes | folderAsset: yes | ||||||
| DefaultImporter: | DefaultImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|  |  | ||||||
|  | @ -83,7 +83,7 @@ namespace AmazonAds.Android { | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         public bool IsLocationEnabled () { |         public bool IsLocationEnabled () { | ||||||
|             return adRegistration.CallStatic<bool> ("іsLocationEnabled"); |             return adRegistration.CallStatic<bool> ("isLocationEnabled"); | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         public String GetVersion () { |         public String GetVersion () { | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 211753c343932487aaf8fa3e3f23a237 | guid: b8e246fc101d65e4e8ee19eb598fcbf8 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -8,15 +8,24 @@ namespace AmazonAds.Android { | ||||||
|         private AndroidJavaObject dtbAdInterstitial = null; |         private AndroidJavaObject dtbAdInterstitial = null; | ||||||
|         private static readonly AndroidJavaClass SDKUtilitiesClass = new AndroidJavaClass(AmazonConstants.sdkUtilitiesClass); |         private static readonly AndroidJavaClass SDKUtilitiesClass = new AndroidJavaClass(AmazonConstants.sdkUtilitiesClass); | ||||||
| 
 | 
 | ||||||
|  |         UnityEngine.AndroidJavaClass playerClass; | ||||||
|  |         UnityEngine.AndroidJavaObject currentActivityObject; | ||||||
|  | 
 | ||||||
|         public AndroidAdInterstitial (APSAdDelegate delegates) { |         public AndroidAdInterstitial (APSAdDelegate delegates) { | ||||||
|             UnityEngine.AndroidJavaClass playerClass = new UnityEngine.AndroidJavaClass(AmazonConstants.unityPlayerClass); |             playerClass = new UnityEngine.AndroidJavaClass(AmazonConstants.unityPlayerClass); | ||||||
|             UnityEngine.AndroidJavaObject currentActivityObject = playerClass.GetStatic<UnityEngine.AndroidJavaObject> ("currentActivity"); |             currentActivityObject = playerClass.GetStatic<UnityEngine.AndroidJavaObject> ("currentActivity"); | ||||||
| 
 | 
 | ||||||
|             DTBAdInterstitialListener adInterstitialListener = new DTBAdInterstitialListener(); |             DTBAdInterstitialListener adInterstitialListener = new DTBAdInterstitialListener(); | ||||||
|             adInterstitialListener.adDelegate = delegates; |             adInterstitialListener.adDelegate = delegates; | ||||||
|             dtbAdInterstitial = new AndroidJavaObject(AmazonConstants.dtbAdInterstitialClass, currentActivityObject, adInterstitialListener); |             dtbAdInterstitial = new AndroidJavaObject(AmazonConstants.dtbAdInterstitialClass, currentActivityObject, adInterstitialListener); | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |         public void Dispose() { | ||||||
|  |             playerClass.Dispose(); | ||||||
|  |             currentActivityObject.Dispose(); | ||||||
|  |             dtbAdInterstitial.Dispose(); | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|         public override void FetchAd (AdResponse adResponse) { |         public override void FetchAd (AdResponse adResponse) { | ||||||
|             if (dtbAdInterstitial != null) { |             if (dtbAdInterstitial != null) { | ||||||
|                 AndroidJavaObject response = adResponse.GetAndroidResponseObject(); |                 AndroidJavaObject response = adResponse.GetAndroidResponseObject(); | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: ec1e99cd2191f4570bda447b3e0b031b | guid: d75f31e61413f4531ad341980cb0056d | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,4 +0,0 @@ | ||||||
| namespace AmazonAds.Android { |  | ||||||
|     public class AndroidAdResponceObsolete { |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  | @ -1,11 +0,0 @@ | ||||||
| fileFormatVersion: 2 |  | ||||||
| guid: b59d5cd7e7903495f8d952a28060400d |  | ||||||
| MonoImporter: |  | ||||||
|   externalObjects: {} |  | ||||||
|   serializedVersion: 2 |  | ||||||
|   defaultReferences: [] |  | ||||||
|   executionOrder: 0 |  | ||||||
|   icon: {instanceID: 0} |  | ||||||
|   userData:  |  | ||||||
|   assetBundleName:  |  | ||||||
|   assetBundleVariant:  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: ea64b8dd761b64dc48d3963f41d7c964 | guid: 225ce61c153884d2498752934b9e5e02 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -7,16 +7,24 @@ namespace AmazonAds.Android { | ||||||
|     public class AndroidAdView : IAdView { |     public class AndroidAdView : IAdView { | ||||||
|         private AndroidJavaObject dtbAdView = null; |         private AndroidJavaObject dtbAdView = null; | ||||||
|         private static readonly AndroidJavaClass SDKUtilitiesClass = new AndroidJavaClass(AmazonConstants.sdkUtilitiesClass); |         private static readonly AndroidJavaClass SDKUtilitiesClass = new AndroidJavaClass(AmazonConstants.sdkUtilitiesClass); | ||||||
|  |         UnityEngine.AndroidJavaClass playerClass; | ||||||
|  |         UnityEngine.AndroidJavaObject currentActivityObject; | ||||||
| 
 | 
 | ||||||
|         public AndroidAdView (APSAdDelegate delegates) { |         public AndroidAdView (APSAdDelegate delegates) { | ||||||
|             UnityEngine.AndroidJavaClass playerClass = new UnityEngine.AndroidJavaClass(AmazonConstants.unityPlayerClass); |             playerClass = new UnityEngine.AndroidJavaClass(AmazonConstants.unityPlayerClass); | ||||||
|             UnityEngine.AndroidJavaObject currentActivityObject = playerClass.GetStatic<UnityEngine.AndroidJavaObject> ("currentActivity"); |             currentActivityObject = playerClass.GetStatic<UnityEngine.AndroidJavaObject> ("currentActivity"); | ||||||
| 
 | 
 | ||||||
|             DTBAdBannerListener adBannerListener = new DTBAdBannerListener(); |             DTBAdBannerListener adBannerListener = new DTBAdBannerListener(); | ||||||
|             adBannerListener.adDelegate = delegates; |             adBannerListener.adDelegate = delegates; | ||||||
|             dtbAdView = new AndroidJavaObject(AmazonConstants.dtbAdViewClass, currentActivityObject, adBannerListener); |             dtbAdView = new AndroidJavaObject(AmazonConstants.dtbAdViewClass, currentActivityObject, adBannerListener); | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |         public void Dispose() { | ||||||
|  |             playerClass.Dispose(); | ||||||
|  |             currentActivityObject.Dispose(); | ||||||
|  |             dtbAdView.Dispose(); | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|         public override void FetchAd (AdResponse adResponse) { |         public override void FetchAd (AdResponse adResponse) { | ||||||
|             if (dtbAdView != null) { |             if (dtbAdView != null) { | ||||||
|                 AndroidJavaObject response = adResponse.GetAndroidResponseObject(); |                 AndroidJavaObject response = adResponse.GetAndroidResponseObject(); | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: d65a0f0dd42564508aa82269ce06336f | guid: 915f068be076545579598f0e166613b1 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -49,16 +49,19 @@ namespace AmazonAds.Android { | ||||||
|             adRegistration.EnableLogging (flag); |             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) |         public override void SetCMPFlavor(Amazon.CMPFlavor cFlavor) | ||||||
|         { |         { | ||||||
|             adRegistration.SetCMPFlavor(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) |         public override void SetConsentStatus(Amazon.ConsentStatus consentStatus) | ||||||
|         { |         { | ||||||
|             adRegistration.SetConsentStatus(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<int> vendorList) |         public override void SetVendorList(List<int> vendorList) | ||||||
|         { |         { | ||||||
|             adRegistration.SetVendorList(vendorList); |             adRegistration.SetVendorList(vendorList); | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 5b2de7cfcde534331acecd109d027803 | guid: c21cb058ae626f248833fdab8d85aa44 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 38ecf85701e30431f9c29008f398e51b | guid: 96eb7e2874b874e7e9f4045bb0ea4db9 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: a7709955494bd4212a25ccc336841875 | guid: 453e75923c4e54a16b77e815a3df9e76 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -9,12 +9,21 @@ namespace AmazonAds.Android { | ||||||
|         private IInterstitialAdSize _interstitialAdSize = null; |         private IInterstitialAdSize _interstitialAdSize = null; | ||||||
|         private IVideo _videoAdSize = null; |         private IVideo _videoAdSize = null; | ||||||
| 
 | 
 | ||||||
|  |         UnityEngine.AndroidJavaClass playerClass; | ||||||
|  |         UnityEngine.AndroidJavaObject currentActivityObject; | ||||||
|  | 
 | ||||||
|         public DTBAdRequest () { |         public DTBAdRequest () { | ||||||
|             UnityEngine.AndroidJavaClass playerClass = new UnityEngine.AndroidJavaClass ("com.unity3d.player.UnityPlayer"); |             playerClass = new UnityEngine.AndroidJavaClass ("com.unity3d.player.UnityPlayer"); | ||||||
|             UnityEngine.AndroidJavaObject currentActivityObject = playerClass.GetStatic<UnityEngine.AndroidJavaObject> ("currentActivity"); |             currentActivityObject = playerClass.GetStatic<UnityEngine.AndroidJavaObject> ("currentActivity"); | ||||||
|             dTBAdRequest = new AndroidJavaObject ("com.amazon.device.ads.DTBAdRequest", currentActivityObject); |             dTBAdRequest = new AndroidJavaObject ("com.amazon.device.ads.DTBAdRequest", currentActivityObject); | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |         public void Dispose() { | ||||||
|  |             playerClass.Dispose(); | ||||||
|  |             currentActivityObject.Dispose(); | ||||||
|  |             dTBAdRequest.Dispose(); | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|         public DTBAdRequest (AndroidJavaObject dtbRequest) {  |         public DTBAdRequest (AndroidJavaObject dtbRequest) {  | ||||||
|             dTBAdRequest = dtbRequest; |             dTBAdRequest = dtbRequest; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 02bd534875030442a8c3a9f1bedc6967 | guid: e75f3eee6b627e647979f4f3680abc47 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -8,6 +8,7 @@ namespace AmazonAds.Android { | ||||||
|     public DTBAdSize (int width, int height, String slotUUID) { |     public DTBAdSize (int width, int height, String slotUUID) { | ||||||
|       client = new AndroidJavaObject ("com.amazon.device.ads.DTBAdSize", width, height, slotUUID); |       client = new AndroidJavaObject ("com.amazon.device.ads.DTBAdSize", width, height, slotUUID); | ||||||
|     } |     } | ||||||
|  | 
 | ||||||
|     public int GetWidth () { |     public int GetWidth () { | ||||||
|       return client.Call<int> ("getWidth"); |       return client.Call<int> ("getWidth"); | ||||||
|     } |     } | ||||||
|  | @ -41,6 +42,10 @@ namespace AmazonAds.Android { | ||||||
|         client = new AndroidJavaObject ("com.amazon.device.ads.DTBAdSize$DTBVideo", playerWidth, playerHeight, slotUUID); |         client = new AndroidJavaObject ("com.amazon.device.ads.DTBAdSize$DTBVideo", playerWidth, playerHeight, slotUUID); | ||||||
|       } |       } | ||||||
| 
 | 
 | ||||||
|  |       public void Dispose() { | ||||||
|  |         client.Dispose(); | ||||||
|  |       } | ||||||
|  | 
 | ||||||
|       public AndroidJavaObject GetInstance () { |       public AndroidJavaObject GetInstance () { | ||||||
|         return client; |         return client; | ||||||
|       } |       } | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 0707e98bd8f7c449fbaf05500bee828d | guid: 9bbbe93960b89b6438d564bfd823f31e | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 97d96cb6052c247b88fb71963517d15f | guid: f2cd9fa644ad3814086bbdb888b07e52 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: d8f17e173b3b34003b573efeaef83dce | guid: 2da86b5f7de549f408cd7ab478b815bf | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -11,6 +11,10 @@ namespace AmazonAds.Android { | ||||||
|             dTBFetchManager = client; |             dTBFetchManager = client; | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |         public void Dispose() { | ||||||
|  |             dTBFetchManager.Dispose(); | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|         public void dispense () { |         public void dispense () { | ||||||
|             AndroidJavaObject dTBAdResponse = dTBFetchManager.Call<AndroidJavaObject> ("dispense"); |             AndroidJavaObject dTBAdResponse = dTBFetchManager.Call<AndroidJavaObject> ("dispense"); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 2bf648a3f472141fdbc550ad18e55ac1 | guid: 6228100cb30e98a469a061dc74986b1b | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: f997d4f0e62c14fcdb460c08b05ef913 | guid: bae541bcf584e3a429eb2478625aba9a | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: cf23c2530685c4a709003ad1faddfd1c | guid: 78340eb4238a9eb47b38ebebf20f97a1 | ||||||
| folderAsset: yes | folderAsset: yes | ||||||
| DefaultImporter: | DefaultImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: 1b2d2d02538c84466afc24234497484c | guid: 1b160c1031c0c41c9940ad06e7e764d0 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| fileFormatVersion: 2 | fileFormatVersion: 2 | ||||||
| guid: c027d873469c4440fbfdd1b55353f520 | guid: 4fecb6b1807da47d5bb9abfcc7cf0069 | ||||||
| MonoImporter: | MonoImporter: | ||||||
|   externalObjects: {} |   externalObjects: {} | ||||||
|   serializedVersion: 2 |   serializedVersion: 2 | ||||||
|  |  | ||||||
Some files were not shown because too many files have changed in this diff Show More
		Loading…
	
		Reference in New Issue