[M] sync n3

This commit is contained in:
2024-12-09 16:54:19 +08:00
parent c90bbe86e7
commit 05331e6286
845 changed files with 6138 additions and 1307 deletions

View File

@@ -8,7 +8,7 @@
#import "MAUnityAdManager.h"
#define VERSION @"6.6.1"
#define VERSION @"7.0.0"
#define NSSTRING(_X) ( (_X != NULL) ? [NSString stringWithCString: _X encoding: NSStringEncodingConversionAllowLossy].al_stringByTrimmingWhitespace : nil)
@interface NSString (ALUtils)
@@ -28,7 +28,6 @@ extern "C"
static NSString *const KeySdkKey = @"SdkKey";
UIView* UnityGetGLView();
NSString *getSdkKeyFromAppLovinSettingsPlist();
static ALSdkInitializationConfigurationBuilder *_initConfigurationBuilder;
static ALSdk *_sdk;
@@ -42,16 +41,6 @@ extern "C"
// Helper method to log errors
void logUninitializedAccessError(const char *callingMethod);
ALSdkInitializationConfigurationBuilder *getInitConfigurationBuilder()
{
if ( !_initConfigurationBuilder )
{
_initConfigurationBuilder = [ALSdkInitializationConfiguration builderWithSdkKey: getSdkKeyFromAppLovinSettingsPlist()];
}
return _initConfigurationBuilder;
}
ALSdk *getSdk()
{
if ( !_sdk )
@@ -72,6 +61,17 @@ extern "C"
return _adManager;
}
ALSdkInitializationConfigurationBuilder *getInitConfigurationBuilder()
{
if ( !_initConfigurationBuilder )
{
NSString *sdkKey = [getSdk().settings.extraParameters al_stringForKey: KeySdkKey];
_initConfigurationBuilder = [ALSdkInitializationConfiguration builderWithSdkKey: sdkKey];
}
return _initConfigurationBuilder;
}
int getConsentStatusValue(NSNumber *consentStatus)
{
if ( consentStatus )
@@ -117,14 +117,6 @@ extern "C"
return array;
}
NSString *getSdkKeyFromAppLovinSettingsPlist()
{
NSString *settingsPlistResourceURL = [NSBundle.mainBundle pathForResource: @"AppLovin-Settings" ofType: @"plist"];
NSDictionary<NSString *, id> *sdkSettingsFromPlist = settingsPlistResourceURL ? [[NSDictionary alloc] initWithContentsOfFile: settingsPlistResourceURL] : @{};
return [sdkSettingsFromPlist al_stringForKey: KeySdkKey];
}
MASegmentCollection *getSegmentCollection(const char *collectionJson)
{
MASegmentCollectionBuilder *segmentCollectionBuilder = [MASegmentCollection builder];
@@ -289,21 +281,6 @@ extern "C"
return [ALPrivacySettings isUserConsentSet];
}
void _MaxSetIsAgeRestrictedUser(bool isAgeRestrictedUser)
{
[ALPrivacySettings setIsAgeRestrictedUser: isAgeRestrictedUser];
}
bool _MaxIsAgeRestrictedUser()
{
return [ALPrivacySettings isAgeRestrictedUser];
}
bool _MaxIsAgeRestrictedUserSet()
{
return [ALPrivacySettings isAgeRestrictedUserSet];
}
void _MaxSetDoNotSell(bool doNotSell)
{
[ALPrivacySettings setDoNotSell: doNotSell];