[cherry] [MAPSME-4593] [ios] Updated Facebook SDK to v4.23.

This commit is contained in:
Ilya Grechuhin 2017-05-30 18:10:30 +03:00
parent 338283c7fc
commit e3cb7908fc
19 changed files with 215 additions and 51 deletions

View file

@ -56,7 +56,7 @@
sourceApplication:(NSString *)sourceApplication
annotation:(id)annotation;
#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_9_3
#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_9_0
/**
Call this method from the [UIApplicationDelegate application:openURL:options:] method
of the AppDelegate for your app. It should be invoked for the proper processing of responses during interaction

View file

@ -44,5 +44,5 @@
#import <FBSDKCoreKit/FBSDKDeviceViewControllerBase.h>
#endif
#define FBSDK_VERSION_STRING @"4.21.0"
#define FBSDK_TARGET_PLATFORM_VERSION @"v2.8"
#define FBSDK_VERSION_STRING @"4.23.0"
#define FBSDK_TARGET_PLATFORM_VERSION @"v2.9"

View file

@ -110,7 +110,7 @@ typedef NS_ENUM(NSUInteger, FBSDKLoginButtonTooltipBehavior)
- Parameter result: The results of the login
- Parameter error: The error (if any) from the login
*/
- (void) loginButton:(FBSDKLoginButton *)loginButton
- (void)loginButton:(FBSDKLoginButton *)loginButton
didCompleteWithResult:(FBSDKLoginManagerLoginResult *)result
error:(NSError *)error;

View file

@ -31,22 +31,34 @@
If not specified, this field is automatically populated by information scraped from the contentURL,
typically the title of the page. This value may be discarded for specially handled links (ex: iTunes URLs).
- Returns: The description of the link
@deprecated `contentDescription` is deprecated from Graph API 2.9.
For more information, see https://developers.facebook.com/docs/apps/changelog#v2_9_deprecations.
*/
@property (nonatomic, copy) NSString *contentDescription;
@property (nonatomic, readonly) NSString *contentDescription
DEPRECATED_MSG_ATTRIBUTE("`contentDescription` is deprecated from Graph API 2.9");
/**
The title to display for this link.
This value may be discarded for specially handled links (ex: iTunes URLs).
- Returns: The link title
@deprecated `contentTitle` is deprecated from Graph API 2.9.
For more information, see https://developers.facebook.com/docs/apps/changelog#v2_9_deprecations
*/
@property (nonatomic, copy) NSString *contentTitle;
@property (nonatomic, readonly) NSString *contentTitle
DEPRECATED_MSG_ATTRIBUTE("`contentTitle` is deprecated from Graph API 2.9");
/**
The URL of a picture to attach to this content.
- Returns: The network URL of an image
@deprecated `imageURL` is deprecated from Graph API 2.9.
For more information, see https://developers.facebook.com/docs/apps/changelog#v2_9_deprecations
*/
@property (nonatomic, copy) NSURL *imageURL;
@property (nonatomic, readonly) NSURL *imageURL
DEPRECATED_MSG_ATTRIBUTE("`imageURL` is deprecated from Graph API 2.9");
/**
Some quote text of the link.

View file

@ -79,49 +79,16 @@ FB_CLASS_EXPORT FB_SUBCLASSING_RESTRICTED
expandable:(BOOL)expandable;
/**
Initialize this view with explicit parameters.
Initialize this view with a given native ad. Configuration is pulled from the native ad.
- Parameter viewController: View controller to present the AdChoices webview from.
- Parameter adChoicesIcon: Native ad AdChoices icon.
- Parameter adChoicesLinkURL: Native ad AdChoices link URL.
- Parameter attributes: Attributes to configure look and feel.
*/
- (instancetype)initWithViewController:(nullable UIViewController *)viewController
adChoicesIcon:(nullable FBAdImage *)adChoicesIcon
adChoicesLinkURL:(nullable NSURL *)adChoicesLinkURL
attributes:(nullable FBNativeAdViewAttributes *)attributes;
/**
Initialize this view with explicit parameters.
- Parameter viewController: View controller to present the AdChoices webview from.
- Parameter adChoicesIcon: Native ad AdChoices icon.
- Parameter adChoicesLinkURL: Native ad AdChoices link URL.
- Parameter attributes: Attributes to configure look and feel.
- Parameter nativeAd: The native ad to initialize with.
- Parameter expandable: Controls whether view defaults to expanded or not, see property documentation
*/
- (instancetype)initWithViewController:(nullable UIViewController *)viewController
adChoicesIcon:(nullable FBAdImage *)adChoicesIcon
adChoicesLinkURL:(nullable NSURL *)adChoicesLinkURL
attributes:(nullable FBNativeAdViewAttributes *)attributes
expandable:(BOOL)expandable;
/**
Initialize this view with explicit parameters.
- Parameter viewController: View controller to present the AdChoices webview from.
- Parameter adChoicesIcon: Native ad AdChoices icon.
- Parameter adChoicesLinkURL: Native ad AdChoices link URL.
- Parameter adChoicesText: Native ad AdChoices label.
- Parameter attributes: Attributes to configure look and feel.
- Parameter expandable: Controls whether view defaults to expanded or not, see property documentation
*/
- (instancetype)initWithViewController:(nullable UIViewController *)viewController
adChoicesIcon:(nullable FBAdImage *)adChoicesIcon
adChoicesLinkURL:(nullable NSURL *)adChoicesLinkURL
adChoicesText:(nullable NSString*)adChoicesText
attributes:(nullable FBNativeAdViewAttributes *)attributes
expandable:(BOOL)expandable NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithNativeAd:(FBNativeAd *)nativeAd
expandable:(BOOL)expandable
attributes:(nullable FBNativeAdViewAttributes *)attributes;
/**
Using the superview, this updates the frame of this view, positioning the icon in the top right corner by default.
*/

View file

@ -23,9 +23,10 @@
NS_ASSUME_NONNULL_BEGIN
/**
Audience Network error domain (returned in NSErrors generated by the SDK)
Audience Network error domains (returned in NSErrors generated by the SDK)
*/
FB_EXPORT NSString * const FBAudienceNetworkErrorDomain;
FB_EXPORT NSString * const FBAudienceNetworkMediaViewErrorDomain;
/**
Audience Network SDK logging levels
@ -61,12 +62,45 @@ typedef NS_ENUM(NSInteger, FBMediaViewRenderingMethod) {
FBMediaViewRenderingMethodSoftware
};
/**
Test Ad type to be injected when test mode is on
*/
typedef NS_ENUM(NSInteger, FBAdTestAdType) {
// No specific ad type to be set.
// This will return a random ad type when test mode is on.
FBAdTestAdType_Default,
// 16x9 image ad with app install CTA option
FBAdTestAdType_Img_16_9_App_Install,
// 16x9 image ad with link CTA option
FBAdTestAdType_Img_16_9_Link,
// 16x9 HD video 46 sec ad with app install CTA option
FBAdTestAdType_Vid_HD_16_9_46s_App_Install,
// 16x9 HD video 46 sec ad with link CTA option
FBAdTestAdType_Vid_HD_16_9_46s_Link,
// 16x9 HD video 15 sec ad with app install CTA option
FBAdTestAdType_Vid_HD_16_9_15s_App_Install,
// 16x9 HD video 15 sec ad with link CTA option
FBAdTestAdType_Vid_HD_16_9_15s_Link,
// 9x16 HD video 39 sec ad with app install CTA option
FBAdTestAdType_Vid_HD_9_16_39s_App_Install,
// 9x16 HD video 39 sec ad with link CTA option
FBAdTestAdType_Vid_HD_9_16_39s_Link,
// carousel ad with square image and app install CTA option
FBAdTestAdType_Carousel_Img_Square_App_Install,
// carousel ad with square image and link CTA option
FBAdTestAdType_Carousel_Img_Square_Link
};
/**
AdSettings contains global settings for all ad controls.
*/
FB_CLASS_EXPORT FB_SUBCLASSING_RESTRICTED
@interface FBAdSettings : NSObject
// When test mode is on, setting a non default value for testAdType will
// request the specified type of ad.
@property (class, nonatomic, assign) FBAdTestAdType testAdType;
/**
Returns test mode on/off.
*/

View file

@ -25,6 +25,7 @@
#import <FBAudienceNetwork/FBInstreamAdView.h>
#import <FBAudienceNetwork/FBInterstitialAd.h>
#import <FBAudienceNetwork/FBMediaView.h>
#import <FBAudienceNetwork/FBMediaViewVideoRenderer.h>
#import <FBAudienceNetwork/FBNativeAd.h>
#import <FBAudienceNetwork/FBNativeAdCollectionViewAdProvider.h>
#import <FBAudienceNetwork/FBNativeAdCollectionViewCellProvider.h>
@ -38,4 +39,4 @@
// NOTE: Any changes should also be made to the module.modulemap
// to ensure comptability with Swift apps using Cocoapods
#define FB_AD_SDK_VERSION @"4.21.0"
#define FB_AD_SDK_VERSION @"4.23.0"

View file

@ -19,6 +19,7 @@
#import <UIKit/UIKit.h>
#import <FBAudienceNetwork/FBAdDefines.h>
#import <FBAudienceNetwork/FBMediaViewVideoRenderer.h>
NS_ASSUME_NONNULL_BEGIN
@ -47,10 +48,15 @@ FB_CLASS_EXPORT
*/
@property (nonatomic, strong, nonnull) FBNativeAd *nativeAd;
/**
A custom FBMediaViewVideoRenderer instance, used to override the default user experience of video ads.
*/
@property (nonatomic, strong, nonnull) FBMediaViewVideoRenderer *videoRenderer;
/**
The current volume of the media view, ranging from 0.0 through 1.0.
*/
@property (nonatomic, assign, readonly) float volume;
@property (nonatomic, assign, readonly) float volume FB_DEPRECATED;
/**
Enables or disables autoplay for some types of media. Defaults to YES.

View file

@ -0,0 +1,140 @@
// Copyright 2004-present Facebook. All Rights Reserved.
//
// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
// copy, modify, and distribute this software in source code or binary form for use
// in connection with the web services and APIs provided by Facebook.
//
// As with any software that integrates with the Facebook platform, your use of
// this software is subject to the Facebook Developer Principles and Policies
// [http://developers.facebook.com/policy/]. This copyright notice shall be
// included in all copies or substantial portions of the software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#import <AVFoundation/AVFoundation.h>
#import <UIKit/UIKit.h>
#import <FBAudienceNetwork/FBAdDefines.h>
NS_ASSUME_NONNULL_BEGIN
/**
The FBMediaViewVideoRenderer class allows for customization of the user experience for video ads in FBMediaView. This class should be subclassed, and an instance of that subclass should be passed to the videoRenderer property of an FBMediaView instance.
*/
FB_CLASS_EXPORT
@interface FBMediaViewVideoRenderer : UIView
/**
The aspect ratio of the video content. Returns a positive CGFloat, or 0.0 if no ad is currently loaded.
*/
@property (nonatomic, assign, readonly) CGFloat aspectRatio;
/**
The current video playback time, as a CMTime value.
*/
@property (nonatomic, assign, readonly) CMTime currentTime;
/**
The duration of the video, as a CMTime value. Returns kCMTimeInvalid if no video is loaded.
*/
@property (nonatomic, assign, readonly) CMTime duration;
/**
The current volume of the video, ranging from 0.0 through 1.0.
*/
@property (nonatomic, assign) float volume;
/**
Starts or resumes video playback.
*/
- (void)playVideo;
/**
Pauses video playback.
*/
- (void)pauseVideo;
/**
Used to put the video into seek mode. Video playback halts, and one or more calls to seekVideoToTime: can be made before calling disengageVideoSeek.
*/
- (void)engageVideoSeek;
/**
Take the video out of seek mode.
*/
- (void)disengageVideoSeek;
/**
Seeks the video to a particular time location. Only works after calling `engageVideoSeek`.
- Parameter time: The requested time location, expressed as a CMTime value.
*/
- (void)seekVideoToTime:(CMTime)time;
/**
Requests the periodic invocation of a given block during playback to report changing time.
- Parameter interval: The time interval at which the block should be invoked during normal playback, according to progress of the player's current time.
- Parameter queue: A serial dispatch queue onto which block should be enqueued.
- Parameter block: The block to be invoked periodically.
*/
- (nullable id)addPeriodicTimeObserverForInterval:(CMTime)interval
queue:(dispatch_queue_t)queue
usingBlock:(void (^)(CMTime time))block;
/**
Cancels a previously registered periodic time observer.
*/
- (void)removeTimeObserver:(id)observer;
/**
Called when the video volume has changed.
*/
- (void)videoDidChangeVolume;
/**
Called when video content has loaded.
*/
- (void)videoDidLoad;
/**
Called when video playback was paused.
*/
- (void)videoDidPause;
/**
Called when video playback has begun or was resumed.
*/
- (void)videoDidPlay;
/**
Called when seek mode was engaged.
*/
- (void)videoDidEngageSeek;
/**
Called when a video seek was performed.
*/
- (void)videoDidSeek;
/**
Called when seek mode was disengaged.
*/
- (void)videoDidDisengageSeek;
/**
Called when video playback ends.
*/
- (void)videoDidEnd;
/**
Called when video playback encounters an error.
*/
- (void)videoDidFailWithError:(NSError *)error;
@end
NS_ASSUME_NONNULL_END

View file

@ -80,6 +80,10 @@ FB_CLASS_EXPORT FB_SUBCLASSING_RESTRICTED
Typed access to the ad cover image creative. See `FBAdImage` for details.
*/
@property (nonatomic, strong, readonly, nullable) FBAdImage *coverImage;
/**
Typed access to the body raw untruncated text, usually a longer description of the ad. Note, this method always returns untruncated text, as opposed to -(NSString *) body.
*/
@property (nonatomic, copy, readonly, nullable) NSString *rawBody;
/**
Typed access to the body text, usually a longer description of the ad.
*/

View file

@ -183,7 +183,7 @@ FB_CLASS_EXPORT FB_SUBCLASSING_RESTRICTED
- Parameter rewardedVideoAd: An FBRewardedVideoAd object sending the message.
*/
- (void)rewardedVideoAdServerSuccess:(FBRewardedVideoAd *)rewardedVideoAd;
- (void)rewardedVideoAdServerRewardDidSucceed:(FBRewardedVideoAd *)rewardedVideoAd;
/**
Sent if server call to publisher's reward endpoint did not return HTTP status code 200
@ -191,7 +191,7 @@ FB_CLASS_EXPORT FB_SUBCLASSING_RESTRICTED
- Parameter rewardedVideoAd: An FBRewardedVideoAd object sending the message.
*/
- (void)rewardedVideoAdServerFailed:(FBRewardedVideoAd *)rewardedVideoAd;
- (void)rewardedVideoAdServerRewardDidFail:(FBRewardedVideoAd *)rewardedVideoAd;
@end