update 1.1.25

This commit is contained in:
2024-03-13 01:54:23 +08:00
parent c7873052f2
commit da2d233cee
186 changed files with 338 additions and 225 deletions

View File

@@ -101,6 +101,8 @@ char * at_get_string_message_for_unity(const char *msg, void(*callback)(const ch
return [NSNumber numberWithBool:[self subjectToGDPR]];
} else if ([selector isEqualToString:@"presentDataConsentDialog"]) {
[self presentDataConsentDialog];
} else if ([selector isEqualToString:@"showGDPRConsentDialog:"]) {
[self showGDPRConsentDialog:callback];
} else if ([selector isEqualToString:@"getUserLocation:"]) {
[self getUserLocation:callback];
} else if ([selector isEqualToString:@"setPurchaseFlag"]) {
@@ -162,6 +164,12 @@ char * at_get_string_message_for_unity(const char *msg, void(*callback)(const ch
}];
}
-(void) showGDPRConsentDialog:(void(*)(const char*))callback {
[[ATAPI sharedInstance] showGDPRConsentDialogInViewController:[UIApplication sharedApplication].delegate.window.rootViewController dismissalCallback:^{
if (callback != NULL) { callback(@"".UTF8String); }
}];
}
-(void) getUserLocation:(void(*)(const char*))callback {
[[ATAPI sharedInstance] getUserLocationWithCallback:^(ATUserLocation location) {
if (callback != NULL) { callback(@(location).stringValue.UTF8String); }
@@ -230,27 +238,28 @@ char * at_get_string_message_for_unity(const char *msg, void(*callback)(const ch
*
*/
-(void) setDataConsent:(NSString*)consentJsonString network:(NSNumber*)network {
NSLog(@"constenJsonString = %@, network = %@", consentJsonString, network);
NSDictionary *networks = @{@1:kATNetworkNameFacebook, @2:kATNetworkNameAdmob, @3:kATNetworkNameInmobi, @4:kATNetworkNameFlurry, @5:kATNetworkNameApplovin, @6:kATNetworkNameMintegral, @8:kATNetworkNameGDT, @9:kATNetworkNameChartboost, @10:kATNetworkNameTapjoy, @11:kATNetworkNameIronSource, @12:kATNetworkNameUnityAds, @13:kATNetworkNameVungle, @14:kATNetworkNameAdColony, @1:kATNetworkNameOneway, @18:kATNetworkNameMobPower, @20:kATNetworkNameYeahmobi, @21:kATNetworkNameAppnext, @22:kATNetworkNameBaidu};
if ([networks containsObjectForKey:network]) {
if (([consentJsonString isKindOfClass:[NSString class]] && [consentJsonString dataUsingEncoding:NSUTF8StringEncoding] != nil)) {
NSDictionary *consentDict = [NSJSONSerialization JSONObjectWithData:[consentJsonString dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingAllowFragments error:nil];
_consentInfo[networks[network]] = [consentDict containsObjectForKey:@"value"] ? consentDict[@"value"] : consentDict;
} else {
[_consentInfo removeObjectForKey:networks[network]];
}
NSLog(@"consentInfo = %@", _consentInfo);
if ([_consentInfo[kATNetworkNameMintegral] isKindOfClass:[NSDictionary class]]) {
NSMutableDictionary<NSNumber*, NSNumber*>* mintegralInfo = [NSMutableDictionary<NSNumber*, NSNumber*> dictionary];
[_consentInfo[kATNetworkNameMintegral] enumerateKeysAndObjectsUsingBlock:^(id _Nonnull key, id _Nonnull obj, BOOL * _Nonnull stop) {
if ([key respondsToSelector:@selector(integerValue)] && [obj respondsToSelector:@selector(integerValue)]) mintegralInfo[@([key integerValue])] = @([obj integerValue]);
}];
NSLog(@"consentInfo = %@, %@", [((NSDictionary*)_consentInfo[kATNetworkNameMintegral]).allKeys[0] class], [((NSDictionary*)_consentInfo[kATNetworkNameMintegral]).allValues[0] class]);
_consentInfo[kATNetworkNameMintegral] = mintegralInfo;
NSLog(@"consentInfo = %@, %@", [((NSDictionary*)_consentInfo[kATNetworkNameMintegral]).allKeys[0] class], [((NSDictionary*)_consentInfo[kATNetworkNameMintegral]).allValues[0] class]);
}
[[ATAPI sharedInstance] setNetworkConsentInfo:_consentInfo];
}
NSLog(@"API was deprecated, please use SetDataConsent(int consent)");
// NSLog(@"constenJsonString = %@, network = %@", consentJsonString, network);
// NSDictionary *networks = @{@1:kATNetworkNameFacebook, @2:kATNetworkNameAdmob, @3:kATNetworkNameInmobi, @4:kATNetworkNameFlurry, @5:kATNetworkNameApplovin, @6:kATNetworkNameMintegral, @8:kATNetworkNameGDT, @9:kATNetworkNameChartboost, @10:kATNetworkNameTapjoy, @11:kATNetworkNameIronSource, @12:kATNetworkNameUnityAds, @13:kATNetworkNameVungle, @14:kATNetworkNameAdColony, @1:kATNetworkNameOneway, @18:kATNetworkNameMobPower, @20:kATNetworkNameYeahmobi, @21:kATNetworkNameAppnext, @22:kATNetworkNameBaidu};
// if ([networks containsObjectForKey:network]) {
// if (([consentJsonString isKindOfClass:[NSString class]] && [consentJsonString dataUsingEncoding:NSUTF8StringEncoding] != nil)) {
// NSDictionary *consentDict = [NSJSONSerialization JSONObjectWithData:[consentJsonString dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingAllowFragments error:nil];
// _consentInfo[networks[network]] = [consentDict containsObjectForKey:@"value"] ? consentDict[@"value"] : consentDict;
// } else {
// [_consentInfo removeObjectForKey:networks[network]];
// }
// NSLog(@"consentInfo = %@", _consentInfo);
// if ([_consentInfo[kATNetworkNameMintegral] isKindOfClass:[NSDictionary class]]) {
// NSMutableDictionary<NSNumber*, NSNumber*>* mintegralInfo = [NSMutableDictionary<NSNumber*, NSNumber*> dictionary];
// [_consentInfo[kATNetworkNameMintegral] enumerateKeysAndObjectsUsingBlock:^(id _Nonnull key, id _Nonnull obj, BOOL * _Nonnull stop) {
// if ([key respondsToSelector:@selector(integerValue)] && [obj respondsToSelector:@selector(integerValue)]) mintegralInfo[@([key integerValue])] = @([obj integerValue]);
// }];
// NSLog(@"consentInfo = %@, %@", [((NSDictionary*)_consentInfo[kATNetworkNameMintegral]).allKeys[0] class], [((NSDictionary*)_consentInfo[kATNetworkNameMintegral]).allValues[0] class]);
// _consentInfo[kATNetworkNameMintegral] = mintegralInfo;
// NSLog(@"consentInfo = %@, %@", [((NSDictionary*)_consentInfo[kATNetworkNameMintegral]).allKeys[0] class], [((NSDictionary*)_consentInfo[kATNetworkNameMintegral]).allValues[0] class]);
// }
// [[ATAPI sharedInstance] setNetworkConsentInfo:_consentInfo];
// }
}
-(void) setExcludeBundleIdArray:(NSString*)bundleIds {