Skip to content

Commit

Permalink
add SDK Ver 6.20.7
Browse files Browse the repository at this point in the history
  • Loading branch information
FluctMember committed Dec 9, 2022
1 parent 59873e1 commit 5432c81
Show file tree
Hide file tree
Showing 17 changed files with 53 additions and 158 deletions.
2 changes: 1 addition & 1 deletion FluctSDK-MediationAdapter.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Pod::Spec.new do |s|
s.name = "FluctSDK-MediationAdapter"
s.summary = "Mediation Adapter for FluctSDK ad Framework"
s.license = { :type => "Copyright", :text => "Copyright (c) fluct,Inc. All rights reserved." }
s.version = "6.20.6"
s.version = "6.20.7"
s.author = "fluct,Inc."
s.requires_arc = true
s.static_framework = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ typedef NS_ENUM(NSInteger, AdColonyVideoErrorExtendend) {
AdColonyVideoErrorExtendendExpired = -2
};

static const NSInteger timeoutSecond = 3;

@interface FSSRewardedVideoCustomEventAdColony () <FSSRewardedVideoAdColonyManagerDelegate>
@property (nonatomic, copy) NSString *zoneId;
@property (nonatomic) NSTimer *timeoutTimer;
@end

@implementation FSSRewardedVideoCustomEventAdColony
Expand Down Expand Up @@ -50,11 +47,6 @@ - (FSSRewardedVideoADNWStatus)loadStatus {

- (void)loadRewardedVideoWithDictionary:(NSDictionary *)dictionary {
self.adnwStatus = FSSRewardedVideoADNWStatusLoading;
self.timeoutTimer = [NSTimer scheduledTimerWithTimeInterval:timeoutSecond
target:self
selector:@selector(timeout)
userInfo:nil
repeats:NO];
[[FSSRewardedVideoAdColonyManager sharedInstance] loadRewardedVideoWithZoneId:self.zoneId
delegate:self];
}
Expand All @@ -68,33 +60,8 @@ - (NSString *)sdkVersion {
return [AdColony getSDKVersion];
}

- (void)timeout {
[self clearTimer];
if (self.adnwStatus == FSSRewardedVideoADNWStatusLoading) {
self.adnwStatus = FSSRewardedVideoADNWStatusNotDisplayable;
[self.delegate rewardedVideoDidFailToLoadForCustomEvent:self
fluctError:[NSError errorWithDomain:FSSVideoErrorSDKDomain
code:FSSVideoErrorTimeout
userInfo:nil]
adnetworkError:[NSError errorWithDomain:FSSVideoErrorSDKDomain
code:AdColonyVideoErrorExtendendTimeout
userInfo:@{NSLocalizedDescriptionKey : @"timeout."}]];
}
}

- (void)clearTimer {
[self.timeoutTimer invalidate];
self.timeoutTimer = nil;
}

- (void)dealloc {
[self clearTimer];
}

#pragma mark - FSSRewardedVideoAdColonyManagerDelegate
- (void)adColonyInterstitialDidLoad {
[self clearTimer];

if (self.adnwStatus == FSSRewardedVideoADNWStatusNotDisplayable) {
// already timeout. do nothing.
return;
Expand All @@ -105,8 +72,6 @@ - (void)adColonyInterstitialDidLoad {
}

- (void)adColonyInterstitialDidFailToLoad:(AdColonyAdRequestError *)error {
[self clearTimer];

if (self.adnwStatus == FSSRewardedVideoADNWStatusNotDisplayable) {
// already timeout. do nothing.
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@
#import "FSSUnityAdsManager.h"
#import <UnityAds/UnityAds.h>

static const NSInteger timeoutSecond = 30;

@interface FSSRewardedVideoCustomEventUnityAds () <FSSUnityAdsManagerDelegate, UnityAdsShowDelegate>
@property (nonatomic, copy) NSString *gameID;
@property (nonatomic, copy) NSString *placementID;
@property (nonatomic) NSTimer *timeoutTimer;
@property (nonatomic) FSSUnityAdsManager *unityAdsManager;
@property (nonatomic) id<FSSUnityAdsProtocol> unityAds;
@end
Expand Down Expand Up @@ -63,13 +60,6 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary

- (void)loadRewardedVideoWithDictionary:(NSDictionary *)dictionary {
self.adnwStatus = FSSRewardedVideoADNWStatusLoading;
// if target placement id could not complete load, call load failed
self.timeoutTimer = [NSTimer scheduledTimerWithTimeInterval:timeoutSecond
target:self
selector:@selector(timeout)
userInfo:nil
repeats:NO];

[self.unityAdsManager loadWithGameId:self.gameID
testMode:self.testMode
debugMode:self.debugMode
Expand All @@ -90,35 +80,12 @@ - (NSString *)sdkVersion {
return [UnityAds getVersion];
}

- (void)timeout {
[self clearTimer];
if (self.adnwStatus == FSSRewardedVideoADNWStatusLoading) {
self.adnwStatus = FSSRewardedVideoADNWStatusNotDisplayable;
NSError *fluctError = [NSError errorWithDomain:FSSVideoErrorSDKDomain
code:FSSVideoErrorTimeout
userInfo:nil];
[self.delegate rewardedVideoDidFailToLoadForCustomEvent:self
fluctError:fluctError
adnetworkError:fluctError];
}
}

- (void)clearTimer {
[self.timeoutTimer invalidate];
self.timeoutTimer = nil;
}

- (void)dealloc {
[self clearTimer];
}

#pragma mark FSSUnityAdsManagerDelegate

- (void)unityAdsFailedToInitializeWithFluctError:(NSError *)fluctError
adnetworkError:(NSError *)adnetworkError {
__weak __typeof(self) weakSelf = self;
dispatch_async(FSSWorkQueue(), ^{
[weakSelf clearTimer];
weakSelf.adnwStatus = FSSRewardedVideoADNWStatusNotDisplayable;
[weakSelf.delegate rewardedVideoDidFailToLoadForCustomEvent:weakSelf
fluctError:fluctError
Expand All @@ -131,7 +98,6 @@ - (void)unityAdsFailedToInitializeWithFluctError:(NSError *)fluctError
- (void)unityAdsAdLoaded:(NSString *)placementId {
__weak __typeof(self) weakSelf = self;
dispatch_async(FSSWorkQueue(), ^{
[weakSelf clearTimer];
weakSelf.adnwStatus = FSSRewardedVideoADNWStatusLoaded;
[weakSelf.delegate rewardedVideoDidLoadForCustomEvent:weakSelf];
});
Expand All @@ -142,7 +108,6 @@ - (void)unityAdsAdFailedToLoad:(NSString *)placementId
withMessage:(NSString *)message {
__weak __typeof(self) weakSelf = self;
dispatch_async(FSSWorkQueue(), ^{
[weakSelf clearTimer];
weakSelf.adnwStatus = FSSRewardedVideoADNWStatusNotDisplayable;
NSError *unityAdsError = [NSError errorWithDomain:FSSVideoErrorSDKDomain
code:error
Expand Down
35 changes: 0 additions & 35 deletions FluctSDK-MediationAdapter/maio/FSSRewardedVideoCustomEventMaio.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@
@interface FSSRewardedVideoCustomEventMaio ()

@property (nonatomic, copy) NSString *zoneID;
@property (nonatomic) NSTimer *timeoutTimer;
@property (nonatomic) BOOL isInitialNotificationForAdapter;
@end

static const NSInteger timeoutSecond = 3;

@implementation FSSRewardedVideoCustomEventMaio

- (instancetype)initWithDictionary:(NSDictionary *)dictionary
Expand All @@ -41,11 +38,6 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary

- (void)loadRewardedVideoWithDictionary:(NSDictionary *)dictionary {
self.adnwStatus = FSSRewardedVideoADNWStatusLoading;
self.timeoutTimer = [NSTimer scheduledTimerWithTimeInterval:timeoutSecond
target:self
selector:@selector(timeout)
userInfo:nil
repeats:NO];
[[FSSRewardedVideoMaioManager sharedInstance] loadRewardedVideoWithDictionary:dictionary
delegate:self
testMode:self.testMode];
Expand All @@ -64,37 +56,11 @@ - (NSString *)sdkVersion {
return [Maio sdkVersion];
}

- (void)timeout {
[self clearTimer];
if (self.isInitialNotificationForAdapter) {
self.isInitialNotificationForAdapter = NO;
self.adnwStatus = FSSRewardedVideoADNWStatusNotDisplayable;
[self.delegate rewardedVideoDidFailToLoadForCustomEvent:self
fluctError:[NSError errorWithDomain:FSSVideoErrorSDKDomain
code:FSSVideoErrorTimeout
userInfo:nil]
adnetworkError:[NSError errorWithDomain:FSSVideoErrorSDKDomain
code:MaioFailReasonExtendTimeout
userInfo:@{NSLocalizedDescriptionKey : @"timeout."}]];
}
}

- (void)clearTimer {
[self.timeoutTimer invalidate];
self.timeoutTimer = nil;
}

- (void)dealloc {
[self clearTimer];
}

#pragma mark FSSRewardedVideoMaioManagerDelegate
- (void)maioDidChangeCanShow:(NSString *)zoneId newValue:(BOOL)newValue {
__weak __typeof(self) weakSelf = self;

dispatch_async(FSSWorkQueue(), ^{
[weakSelf clearTimer];

if (self.isInitialNotificationForAdapter) {
weakSelf.isInitialNotificationForAdapter = NO;
weakSelf.adnwStatus = FSSRewardedVideoADNWStatusLoaded;
Expand Down Expand Up @@ -136,7 +102,6 @@ - (void)maioDidCloseAd:(NSString *)zoneId {
- (void)maioDidFail:(NSString *)zoneId reason:(MaioFailReason)reason {
__weak __typeof(self) weakSelf = self;
dispatch_async(FSSWorkQueue(), ^{
[self clearTimer];
weakSelf.adnwStatus = FSSRewardedVideoADNWStatusNotDisplayable;

NSError *adnwError = [self convertADNWErrorFromFailReason:reason];
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
</data>
<key>Info.plist</key>
<data>
C/b411gUJ9WW1t9rmys3wQcz/24=
vnYgWP56ReHpC62wPlJWlaV3zLk=
</data>
<key>Modules/module.modulemap</key>
<data>
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion FluctSDK.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Pod::Spec.new do |s|
s.name = "FluctSDK"
s.summary = "FluctSDK ad Framework"
s.license = { :type => "Copyright", :text => "Copyright (c) fluct,Inc. All rights reserved." }
s.version = "6.20.6"
s.version = "6.20.7"
s.author = "fluct,Inc."
s.requires_arc = true
s.homepage = "https://fluct.jp/"
Expand Down
2 changes: 1 addition & 1 deletion GoogleMobileAdsMediationFluct.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Pod::Spec.new do |s|
s.name = "GoogleMobileAdsMediationFluct"
s.summary = "fluct adapter used for mediation with the Google Mobile Ads SDK"
s.license = { :type => "Copyright", :text => "Copyright (c) fluct,Inc. All rights reserved." }
s.version = "6.20.6"
s.version = "6.20.7"
s.author = "fluct,Inc."
s.requires_arc = true
s.static_framework = true
Expand Down
2 changes: 1 addition & 1 deletion MaxMediationAdapterFluct.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Pod::Spec.new do |s|
s.name = "MaxMediationAdapterFluct"
s.summary = "fluct adapter used for mediation with the AppLovin MAX SDK"
s.license = { :type => "Copyright", :text => "Copyright (c) fluct,Inc. All rights reserved." }
s.version = "6.20.6"
s.version = "6.20.7"
s.author = "fluct,Inc."
s.requires_arc = true
s.static_framework = true
Expand Down
48 changes: 24 additions & 24 deletions SampleApp/Objective-C/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,38 +23,38 @@ PODS:
- BURelyFoundation_Global/NETWork (= 0.0.1.58)
- BURelyFoundation_Global/NETWork (0.0.1.58)
- FiveAd (2.4.20220630)
- FluctSDK (6.20.6)
- FluctSDK-MediationAdapter (6.20.6):
- FluctSDK-MediationAdapter/AdColony (= 6.20.6)
- FluctSDK-MediationAdapter/AppLovin (= 6.20.6)
- FluctSDK-MediationAdapter/Five (= 6.20.6)
- FluctSDK-MediationAdapter/maio (= 6.20.6)
- FluctSDK-MediationAdapter/nend (= 6.20.6)
- FluctSDK-MediationAdapter/Pangle (= 6.20.6)
- FluctSDK-MediationAdapter/Tapjoy (= 6.20.6)
- FluctSDK-MediationAdapter/UnityAds (= 6.20.6)
- FluctSDK-MediationAdapter/AdColony (6.20.6):
- FluctSDK (6.20.7)
- FluctSDK-MediationAdapter (6.20.7):
- FluctSDK-MediationAdapter/AdColony (= 6.20.7)
- FluctSDK-MediationAdapter/AppLovin (= 6.20.7)
- FluctSDK-MediationAdapter/Five (= 6.20.7)
- FluctSDK-MediationAdapter/maio (= 6.20.7)
- FluctSDK-MediationAdapter/nend (= 6.20.7)
- FluctSDK-MediationAdapter/Pangle (= 6.20.7)
- FluctSDK-MediationAdapter/Tapjoy (= 6.20.7)
- FluctSDK-MediationAdapter/UnityAds (= 6.20.7)
- FluctSDK-MediationAdapter/AdColony (6.20.7):
- AdColony (>= 4.9.0)
- FluctSDK (>= 6.14.0)
- FluctSDK-MediationAdapter/AppLovin (6.20.6):
- FluctSDK-MediationAdapter/AppLovin (6.20.7):
- AppLovinSDK (>= 11.1.1)
- FluctSDK (>= 6.14.0)
- FluctSDK-MediationAdapter/Five (6.20.6):
- FluctSDK-MediationAdapter/Five (6.20.7):
- FiveAd (>= 2.4.20220630)
- FluctSDK (>= 6.14.0)
- FluctSDK-MediationAdapter/maio (6.20.6):
- FluctSDK-MediationAdapter/maio (6.20.7):
- FluctSDK (>= 6.14.0)
- MaioSDK (>= 1.6.2)
- FluctSDK-MediationAdapter/nend (6.20.6):
- FluctSDK-MediationAdapter/nend (6.20.7):
- FluctSDK (>= 6.14.0)
- NendSDK_iOS (>= 7.0.4)
- FluctSDK-MediationAdapter/Pangle (6.20.6):
- FluctSDK-MediationAdapter/Pangle (6.20.7):
- Ads-Global (>= 4.5.2.7)
- FluctSDK (>= 6.14.0)
- FluctSDK-MediationAdapter/Tapjoy (6.20.6):
- FluctSDK-MediationAdapter/Tapjoy (6.20.7):
- FluctSDK (>= 6.14.0)
- TapjoySDK (>= 12.8.0)
- FluctSDK-MediationAdapter/UnityAds (6.20.6):
- FluctSDK-MediationAdapter/UnityAds (6.20.7):
- FluctSDK (>= 6.14.0)
- UnityAds (= 4.3.0)
- Google-Mobile-Ads-SDK (8.10.0):
Expand All @@ -73,7 +73,7 @@ PODS:
- GoogleUtilities/Network (~> 7.4)
- "GoogleUtilities/NSData+zlib (~> 7.4)"
- nanopb (~> 2.30908.0)
- GoogleMobileAdsMediationFluct (6.20.6):
- GoogleMobileAdsMediationFluct (6.20.7):
- FluctSDK (>= 6.12.1)
- Google-Mobile-Ads-SDK (>= 8.1.0)
- GoogleUserMessagingPlatform (2.0.0)
Expand All @@ -95,7 +95,7 @@ PODS:
- GoogleUtilities/Reachability (7.5.2):
- GoogleUtilities/Logger
- MaioSDK (1.6.2)
- MaxMediationAdapterFluct (6.20.6):
- MaxMediationAdapterFluct (6.20.7):
- AppLovinSDK (>= 11.4.2)
- FluctSDK (>= 6.19.0)
- nanopb (2.30908.0):
Expand Down Expand Up @@ -174,15 +174,15 @@ SPEC CHECKSUMS:
AppLovinSDK: 119a0b2a743f9d9c6002c58776b1013778a65084
BURelyFoundation_Global: 4d19085056d58dc06a102f2d41c140ab2fc47da5
FiveAd: b4c86cbb62a14212c3448fffb7563c08c9671e89
FluctSDK: 11f03f116e56bee3f8599f2756057fd396f91cea
FluctSDK-MediationAdapter: 860cf5fed2888309170cefd1e0109acc26b58a76
FluctSDK: bc537a7445461bcceaac6e0cf5e72f18633ba59d
FluctSDK-MediationAdapter: b3e2ca25c5f9a827fdcd8aa3a98892dbdf53f67b
Google-Mobile-Ads-SDK: 9c78323a7069cd42ddf1ad2fddbaec889b085091
GoogleAppMeasurement: 2be61ce546ad074dbe4dd545f222ac6033bb1d9e
GoogleMobileAdsMediationFluct: 8f249b0680ecdf7c0f1139362eb12f4c9025e39c
GoogleMobileAdsMediationFluct: d4dde775e749b7b173dbec1d0713edfb3468ea76
GoogleUserMessagingPlatform: ab890ce5f6620f293a21b6bdd82e416a2c73aeca
GoogleUtilities: 8de2a97a17e15b6b98e38e8770e2d129a57c0040
MaioSDK: 674022c6f61693de0601e110da2564ca121df37d
MaxMediationAdapterFluct: e79130c223f603eb955a3ebc98ca4b1b63817100
MaxMediationAdapterFluct: fe2a509fc7bcea3e56b586716466463cb05fd48f
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
NendSDK_iOS: 035fd2568f837caaaeeaf18817632106b9355f10
OneKit-Pangle: a1db5e9289faf278e7ef158923c993412f2cea03
Expand Down
Loading

0 comments on commit 5432c81

Please sign in to comment.