add SDK Ver 4.8.0

voyagegroup · Apr 11, 2018 · bac4820 · bac4820
1 parent 63dabfd
commit bac4820
Show file tree

Hide file tree

Showing 27 changed files with 103 additions and 25 deletions.
diff --git a/FluctSDK/FluctSDK.framework/FluctSDK b/FluctSDK/FluctSDK.framework/FluctSDK
diff --git a/FluctSDK/FluctSDK.framework/Headers/FSSAdRequestTargeting.h b/FluctSDK/FluctSDK.framework/Headers/FSSAdRequestTargeting.h
@@ -9,9 +9,21 @@
 #import <CoreLocation/CoreLocation.h>
 #import <Foundation/Foundation.h>
 
-@interface FSSAdRequestTargeting : NSObject
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSUInteger, FSSGender) {
+    FSSGenderUnknown = 0,
+    FSSGenderMale,
+    FSSGenderFemale
+};
 
-@property (nonatomic, copy) NSString *userID;
-@property (nonatomic, copy) CLLocation *location;
+@interface FSSAdRequestTargeting : NSObject
 
+@property (nonatomic, copy, nullable) NSString *userID;
+@property (nonatomic, copy, nullable) CLLocation *location;
+@property (nonatomic) FSSGender gender;
+@property (nonatomic, copy, nullable) NSDate *birthday;
+@property (nonatomic) NSInteger age;
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/FluctSDK/FluctSDK.framework/Headers/FSSRewardedVideoCustomEvent.h b/FluctSDK/FluctSDK.framework/Headers/FSSRewardedVideoCustomEvent.h
@@ -5,6 +5,7 @@
 //  Copyright © 2017年 fluct, Inc. All rights reserved.
 //
 
+#import "FSSAdRequestTargeting.h"
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
@@ -28,7 +29,8 @@ typedef NS_ENUM(NSInteger, FSSRewardedVideoADNWStatus) {
 - (instancetype)initWithDictionary:(NSDictionary *)dictionary
                           delegate:(id<FSSRewardedVideoCustomEventDelegate>)delegate
                           testMode:(BOOL)testMode
-                         debugMode:(BOOL)debugMode;
+                         debugMode:(BOOL)debugMode
+                         targeting:(FSSAdRequestTargeting *)targeting;
 
 - (void)loadRewardedVideoWithDictionary:(NSDictionary *)dictionary;
 - (FSSRewardedVideoADNWStatus)loadStatus;

diff --git a/FluctSDK/FluctSDK.framework/Resources/Info.plist b/FluctSDK/FluctSDK.framework/Resources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.4</string>
+	<string>4.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>

diff --git a/README.md b/README.md
@@ -16,6 +16,9 @@ pod "FluctSDK"
 FluctSDK-iOSの[Wiki](https://github.com/voyagegroup/FluctSDK-iOS/wiki)を参照してください
 
 # FluctSDK Release Note
+## v4.8.0 2018/04/11
+* 動画リワード広告配信のターゲティングにユーザー属性を利用する機能を追加
+
 ## v4.7.4 2018/03/29
 * UnityAdsの動画リワード広告配信時にiOS9系以下の端末で `NSInvalidArgumentException` が発生しクラッシュするバグの修正
 * `FSSNativeTableViewCell` 内の`FSSNativeView` が常にセルの `ContentView` と同じサイズになる挙動に変更

diff --git a/SampleApp/FluctSDK-AdnetworkSupport/AppLovin/FSSRewardedVideoCustomEventAppLovin.m b/SampleApp/FluctSDK-AdnetworkSupport/AppLovin/FSSRewardedVideoCustomEventAppLovin.m
@@ -28,8 +28,8 @@ + (ALIncentivizedInterstitialAd *)rewardedVideoWithSdk:(ALSdk *)sdk {
     return [[ALIncentivizedInterstitialAd alloc] initWithSdk:sdk];
 }
 
-- (instancetype)initWithDictionary:(NSDictionary *)dictionary delegate:(id<FSSRewardedVideoCustomEventDelegate>)delegate testMode:(BOOL)testMode debugMode:(BOOL)debugMode {
-    self = [super initWithDictionary:dictionary delegate:delegate testMode:testMode debugMode:debugMode];
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary delegate:(id<FSSRewardedVideoCustomEventDelegate>)delegate testMode:(BOOL)testMode debugMode:(BOOL)debugMode targeting:(FSSAdRequestTargeting *)targeting {
+    self = [super initWithDictionary:dictionary delegate:delegate testMode:testMode debugMode:debugMode targeting:nil];
     if (self) {
         static dispatch_once_t onceToken;
         ALSdk *applovinSDK = [FSSRewardedVideoCustomEventAppLovin sharedWithKey:dictionary[@"sdk_key"]];

diff --git a/SampleApp/FluctSDK-AdnetworkSupport/UnityAds/FSSRewardedVideoCustomEventUnityAds.m b/SampleApp/FluctSDK-AdnetworkSupport/UnityAds/FSSRewardedVideoCustomEventUnityAds.m
@@ -32,8 +32,8 @@ @interface FSSRewardedVideoCustomEventUnityAds () <FSSRewardedVideoUnityAdsManag
 
 @implementation FSSRewardedVideoCustomEventUnityAds
 
-- (instancetype)initWithDictionary:(NSDictionary *)dictionary delegate:(id<FSSRewardedVideoCustomEventDelegate>)delegate testMode:(BOOL)testMode debugMode:(BOOL)debugMode {
-    self = [super initWithDictionary:dictionary delegate:delegate testMode:testMode debugMode:debugMode];
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary delegate:(id<FSSRewardedVideoCustomEventDelegate>)delegate testMode:(BOOL)testMode debugMode:(BOOL)debugMode targeting:(FSSAdRequestTargeting *)targeting {
+    self = [super initWithDictionary:dictionary delegate:delegate testMode:testMode debugMode:debugMode targeting:nil];
     if (self != nil) {
         _isInitialNotificationForAdapter = YES;
     }

diff --git a/SampleApp/FluctSDK-AdnetworkSupport/maio/FSSRewardedVideoCustomEventMaio.m b/SampleApp/FluctSDK-AdnetworkSupport/maio/FSSRewardedVideoCustomEventMaio.m
@@ -18,9 +18,8 @@ @interface FSSRewardedVideoCustomEventMaio ()
 
 @implementation FSSRewardedVideoCustomEventMaio
 
-- (instancetype)initWithDictionary:(NSDictionary *)dictionary delegate:(id<FSSRewardedVideoCustomEventDelegate>)delegate testMode:(BOOL)testMode debugMode:(BOOL)debugMode {
-
-    self = [super initWithDictionary:dictionary delegate:delegate testMode:testMode debugMode:debugMode];
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary delegate:(id<FSSRewardedVideoCustomEventDelegate>)delegate testMode:(BOOL)testMode debugMode:(BOOL)debugMode targeting:(FSSAdRequestTargeting *)targeting {
+    self = [super initWithDictionary:dictionary delegate:delegate testMode:testMode debugMode:debugMode targeting:nil];
     if (!self) {
         return nil;
     }

diff --git a/SampleApp/FluctSDK-AdnetworkSupport/nend/FSSRewardedVideoCustomEventNend.m b/SampleApp/FluctSDK-AdnetworkSupport/nend/FSSRewardedVideoCustomEventNend.m
@@ -26,14 +26,17 @@ + (NADRewardedVideo *)initializeNendSDKWithSpotId:(NSString *)spotId apiKey:(NSS
     return [[NADRewardedVideo alloc] initWithSpotId:spotId apiKey:apiKey];
 }
 
-- (instancetype)initWithDictionary:(NSDictionary *)dictionary delegate:(id<FSSRewardedVideoCustomEventDelegate>)delegate testMode:(BOOL)testMode debugMode:(BOOL)debugMode {
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary delegate:(id<FSSRewardedVideoCustomEventDelegate>)delegate testMode:(BOOL)testMode debugMode:(BOOL)debugMode targeting:(FSSAdRequestTargeting *)targeting {
     if (![FSSRewardedVideoCustomEventNend shouldInitNendSDKWithSystemVersion:UIDevice.currentDevice.systemVersion]) {
         return nil;
     }
 
-    self = [super initWithDictionary:dictionary delegate:delegate testMode:testMode debugMode:debugMode];
+    self = [super initWithDictionary:dictionary delegate:delegate testMode:testMode debugMode:debugMode targeting:nil];
+
     _nendRewardedVideo = [FSSRewardedVideoCustomEventNend initializeNendSDKWithSpotId:dictionary[@"spot_id"] apiKey:dictionary[@"api_key"]];
     _nendRewardedVideo.delegate = self;
+    _nendRewardedVideo.userFeature = [FSSRewardedVideoCustomEventNend generateUserFeatureWithTargeting:targeting];
+
     return self;
 }
 
@@ -148,4 +151,33 @@ - (void)nadRewardVideoAdDidClickAd:(NADRewardedVideo *)nadRewardedVideoAd {
 
 - (void)nadRewardVideoAd:(NADRewardedVideo *)nadRewardedVideoAd didReward:(NADReward *)reward {
 }
+
++ (NADUserFeature *)generateUserFeatureWithTargeting:(FSSAdRequestTargeting *)targeting {
+    if (!targeting) {
+        return nil;
+    }
+
+    NADUserFeature *feature = [FSSRewardedVideoCustomEventNend userFeature];
+
+    if (targeting.gender == FSSGenderMale) {
+        feature.gender = NADGenderMale;
+    } else if (targeting.gender == NADGenderFemale) {
+        feature.gender = NADGenderFemale;
+    }
+
+    if (targeting.age) {
+        feature.age = targeting.age;
+    }
+
+    if (targeting.birthday) {
+        NSDateComponents *components = [[[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian] components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:targeting.birthday];
+        [feature setBirthdayWithYear:components.year month:components.month day:components.day];
+    }
+
+    return feature;
+}
+
++ (NADUserFeature *)userFeature {
+    return [NADUserFeature new];
+}
 @end
diff --git a/...workSupport/nend/NendAd.embeddedframework/NendAd.framework/Headers/NADInterstitialVideo.h b/...workSupport/nend/NendAd.embeddedframework/NendAd.framework/Headers/NADInterstitialVideo.h
@@ -27,6 +27,7 @@
 @interface NADInterstitialVideo : NADVideo
 
 @property (nonatomic, weak, readwrite) id<NADInterstitialVideoDelegate> delegate;
+@property (nonatomic, copy) UIColor *fallbackFullboardBackgroundColor;
 
 - (void)addFallbackFullboardWithSpotId:(NSString *)spotId apiKey:(NSString *)apiKey;
 

diff --git a/...FluctSDK-AdnetworkSupport/nend/NendAd.embeddedframework/NendAd.framework/Headers/NendAd.h b/...FluctSDK-AdnetworkSupport/nend/NendAd.embeddedframework/NendAd.framework/Headers/NendAd.h
@@ -26,4 +26,5 @@ FOUNDATION_EXPORT const unsigned char NendAdVersionString[];
 #import <NendAd/NADRewardedVideo.h>
 #import <NendAd/NADInterstitialVideo.h>
 #import <NendAd/NADReward.h>
-#import <NendAd/NADVideoError.h>
+#import <NendAd/NADVideoError.h>
+#import <NendAd/NADUserFeature.h>
diff --git a/...leApp/FluctSDK-AdnetworkSupport/nend/NendAd.embeddedframework/NendAd.framework/Info.plist b/...leApp/FluctSDK-AdnetworkSupport/nend/NendAd.embeddedframework/NendAd.framework/Info.plist
diff --git a/SampleApp/FluctSDK-AdnetworkSupport/nend/NendAd.embeddedframework/NendAd.framework/NendAd b/SampleApp/FluctSDK-AdnetworkSupport/nend/NendAd.embeddedframework/NendAd.framework/NendAd
diff --git a/...nend/NendAd.embeddedframework/NendAd.framework/Resources/NendAdResource.bundle/Assets.car b/...nend/NendAd.embeddedframework/NendAd.framework/Resources/NendAdResource.bundle/Assets.car
diff --git a/...nend/NendAd.embeddedframework/NendAd.framework/Resources/NendAdResource.bundle/Info.plist b/...nend/NendAd.embeddedframework/NendAd.framework/Resources/NendAdResource.bundle/Info.plist
diff --git a/...framework/NendAd.framework/Resources/NendAdResource.bundle/NADFullBoardViewController.nib b/...framework/NendAd.framework/Resources/NendAdResource.bundle/NADFullBoardViewController.nib
diff --git a/...AdnetworkSupport/nend/NendAd.embeddedframework/Resources/NendAdResource.bundle/Assets.car b/...AdnetworkSupport/nend/NendAd.embeddedframework/Resources/NendAdResource.bundle/Assets.car
diff --git a/...AdnetworkSupport/nend/NendAd.embeddedframework/Resources/NendAdResource.bundle/Info.plist b/...AdnetworkSupport/nend/NendAd.embeddedframework/Resources/NendAdResource.bundle/Info.plist
diff --git a/...d/NendAd.embeddedframework/Resources/NendAdResource.bundle/NADFullBoardViewController.nib b/...d/NendAd.embeddedframework/Resources/NendAdResource.bundle/NADFullBoardViewController.nib
diff --git a/SampleApp/Objective-C/SampleApp/FluctSDK/FluctSDK.framework/FluctSDK b/SampleApp/Objective-C/SampleApp/FluctSDK/FluctSDK.framework/FluctSDK
diff --git a/SampleApp/Objective-C/SampleApp/FluctSDK/FluctSDK.framework/Headers/FSSAdRequestTargeting.h b/SampleApp/Objective-C/SampleApp/FluctSDK/FluctSDK.framework/Headers/FSSAdRequestTargeting.h
@@ -9,9 +9,21 @@
 #import <CoreLocation/CoreLocation.h>
 #import <Foundation/Foundation.h>
 
-@interface FSSAdRequestTargeting : NSObject
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSUInteger, FSSGender) {
+    FSSGenderUnknown = 0,
+    FSSGenderMale,
+    FSSGenderFemale
+};
 
-@property (nonatomic, copy) NSString *userID;
-@property (nonatomic, copy) CLLocation *location;
+@interface FSSAdRequestTargeting : NSObject
 
+@property (nonatomic, copy, nullable) NSString *userID;
+@property (nonatomic, copy, nullable) CLLocation *location;
+@property (nonatomic) FSSGender gender;
+@property (nonatomic, copy, nullable) NSDate *birthday;
+@property (nonatomic) NSInteger age;
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/...p/Objective-C/SampleApp/FluctSDK/FluctSDK.framework/Headers/FSSRewardedVideoCustomEvent.h b/...p/Objective-C/SampleApp/FluctSDK/FluctSDK.framework/Headers/FSSRewardedVideoCustomEvent.h
@@ -5,6 +5,7 @@
 //  Copyright © 2017年 fluct, Inc. All rights reserved.
 //
 
+#import "FSSAdRequestTargeting.h"
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
@@ -28,7 +29,8 @@ typedef NS_ENUM(NSInteger, FSSRewardedVideoADNWStatus) {
 - (instancetype)initWithDictionary:(NSDictionary *)dictionary
                           delegate:(id<FSSRewardedVideoCustomEventDelegate>)delegate
                           testMode:(BOOL)testMode
-                         debugMode:(BOOL)debugMode;
+                         debugMode:(BOOL)debugMode
+                         targeting:(FSSAdRequestTargeting *)targeting;
 
 - (void)loadRewardedVideoWithDictionary:(NSDictionary *)dictionary;
 - (FSSRewardedVideoADNWStatus)loadStatus;

diff --git a/SampleApp/Objective-C/SampleApp/FluctSDK/FluctSDK.framework/Resources/Info.plist b/SampleApp/Objective-C/SampleApp/FluctSDK/FluctSDK.framework/Resources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.4</string>
+	<string>4.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>

diff --git a/SampleApp/Swift/SampleApp-Swift/FluctSDK/FluctSDK.framework/FluctSDK b/SampleApp/Swift/SampleApp-Swift/FluctSDK/FluctSDK.framework/FluctSDK
diff --git a/SampleApp/Swift/SampleApp-Swift/FluctSDK/FluctSDK.framework/Headers/FSSAdRequestTargeting.h b/SampleApp/Swift/SampleApp-Swift/FluctSDK/FluctSDK.framework/Headers/FSSAdRequestTargeting.h
@@ -9,9 +9,21 @@
 #import <CoreLocation/CoreLocation.h>
 #import <Foundation/Foundation.h>
 
-@interface FSSAdRequestTargeting : NSObject
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSUInteger, FSSGender) {
+    FSSGenderUnknown = 0,
+    FSSGenderMale,
+    FSSGenderFemale
+};
 
-@property (nonatomic, copy) NSString *userID;
-@property (nonatomic, copy) CLLocation *location;
+@interface FSSAdRequestTargeting : NSObject
 
+@property (nonatomic, copy, nullable) NSString *userID;
+@property (nonatomic, copy, nullable) CLLocation *location;
+@property (nonatomic) FSSGender gender;
+@property (nonatomic, copy, nullable) NSDate *birthday;
+@property (nonatomic) NSInteger age;
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/...p/Swift/SampleApp-Swift/FluctSDK/FluctSDK.framework/Headers/FSSRewardedVideoCustomEvent.h b/...p/Swift/SampleApp-Swift/FluctSDK/FluctSDK.framework/Headers/FSSRewardedVideoCustomEvent.h
@@ -5,6 +5,7 @@
 //  Copyright © 2017年 fluct, Inc. All rights reserved.
 //
 
+#import "FSSAdRequestTargeting.h"
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
@@ -28,7 +29,8 @@ typedef NS_ENUM(NSInteger, FSSRewardedVideoADNWStatus) {
 - (instancetype)initWithDictionary:(NSDictionary *)dictionary
                           delegate:(id<FSSRewardedVideoCustomEventDelegate>)delegate
                           testMode:(BOOL)testMode
-                         debugMode:(BOOL)debugMode;
+                         debugMode:(BOOL)debugMode
+                         targeting:(FSSAdRequestTargeting *)targeting;
 
 - (void)loadRewardedVideoWithDictionary:(NSDictionary *)dictionary;
 - (FSSRewardedVideoADNWStatus)loadStatus;

diff --git a/SampleApp/Swift/SampleApp-Swift/FluctSDK/FluctSDK.framework/Resources/Info.plist b/SampleApp/Swift/SampleApp-Swift/FluctSDK/FluctSDK.framework/Resources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.4</string>
+	<string>4.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>