From 02be5892b45a9ebbeb74e6697e712be999d5d0f8 Mon Sep 17 00:00:00 2001 From: hank <hank.zhang@proficientcity.com> Date: Tue, 22 Jan 2019 11:01:53 +0800 Subject: [PATCH] 添加V3.8.0 --- frameworks/Chartboost.framework/Versions/A/Chartboost | 0 config/wa_sdk_impl_config_chartboost.xml | 2 +- frameworks/WACbImpl.framework/WACbImpl | 0 frameworks/WACbImpl.framework/Info.plist | 0 frameworks/Chartboost.framework/Versions/A/Headers/ChartboostDelegate.h | 16 ++++++++++++++++ WACbImpl.podspec | 6 +++--- frameworks/Chartboost.framework/Versions/A/Headers/Chartboost.h | 17 ++++++++++++----- frameworks/WACbImpl.framework/Headers/WACbImpl.h | 2 +- frameworks/Chartboost.framework/Versions/A/Headers/CBInPlay.h | 2 +- 9 files changed, 34 insertions(+), 11 deletions(-) diff --git a/WACbImpl.podspec b/WACbImpl.podspec index 58632e9..c91c0cc 100644 --- a/WACbImpl.podspec +++ b/WACbImpl.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.name = 'WACbImpl' -s.version = '3.7.0' +s.version = '3.8.0' s.summary = 'WACbImpl framework in production environment.' s.license = 'MIT' s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" } @@ -21,6 +21,6 @@ s.resources = ['config/*.xml'] s.frameworks = 'Webkit' s.requires_arc = true -s.dependency 'WASdkIntf', '~> 3.7.0' #此处添加私有库依赖 -s.dependency 'WASdkImpl', '~> 3.7.0' +s.dependency 'WASdkIntf', '~> 3.8.0' #此处添加私有库依赖 +s.dependency 'WASdkImpl', '~> 3.8.0' end diff --git a/config/wa_sdk_impl_config_chartboost.xml b/config/wa_sdk_impl_config_chartboost.xml index b306f5d..da6005a 100644 --- a/config/wa_sdk_impl_config_chartboost.xml +++ b/config/wa_sdk_impl_config_chartboost.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <config> - <version val="CB3.7.0"/> + <version val="CB3.8.0"/> <comps> <!-- 数据收集模块 --> <comp module="TRA" plaf="CHARTBOOST" mandatory="YES" value="WACBTrack" desc="CHARTBOOST数据统计"/> diff --git a/frameworks/Chartboost.framework/Versions/A/Chartboost b/frameworks/Chartboost.framework/Versions/A/Chartboost index e275829..b285890 100644 --- a/frameworks/Chartboost.framework/Versions/A/Chartboost +++ b/frameworks/Chartboost.framework/Versions/A/Chartboost Binary files differ diff --git a/frameworks/Chartboost.framework/Versions/A/Headers/CBInPlay.h b/frameworks/Chartboost.framework/Versions/A/Headers/CBInPlay.h index 4b9c5e1..591c64b 100644 --- a/frameworks/Chartboost.framework/Versions/A/Headers/CBInPlay.h +++ b/frameworks/Chartboost.framework/Versions/A/Headers/CBInPlay.h @@ -1,7 +1,7 @@ /* * CBInPlay.h * Chartboost - * 7.2.0 + * 7.3.0 * * Copyright 2018 Chartboost. All rights reserved. */ diff --git a/frameworks/Chartboost.framework/Versions/A/Headers/Chartboost.h b/frameworks/Chartboost.framework/Versions/A/Headers/Chartboost.h index e9c3861..8f2705d 100644 --- a/frameworks/Chartboost.framework/Versions/A/Headers/Chartboost.h +++ b/frameworks/Chartboost.framework/Versions/A/Headers/Chartboost.h @@ -397,15 +397,22 @@ /*! @abstract - Set to restrict Chartboost's ability to collect personal data from the device. When this is set to YES. IDFA and ip address will not - be collected by the SDK or the server. Use this to communicate an EEU Data Subject's preference regarding data collection. + Set to restrict Chartboost's ability to collect personal data from the device. See CBPIDataUseConsent declaration for details Note: This method should be called before starting the Chartboost SDK with startWithAppId:appSignature:delegate. - @param restrict: Whether to restrict data collection or not - @discussion Default value is NOT + @param consent: set the consent level + @discussion Default value is Unknown */ -+ (void)restrictDataCollection:(BOOL)shouldRestrict; ++ (void)setPIDataUseConsent:(CBPIDataUseConsent)consent; + +/*! + @abstract + Get the current consent setting + */ ++ (CBPIDataUseConsent)getPIDataUseConsent; #pragma mark - Deprecated ++ (void)restrictDataCollection:(BOOL)shouldRestrict __attribute__((deprecated("Use setPIDataUseConsent:(CBPIDataUseConsent)consent instead"))); + + (BOOL)hasMoreApps:(CBLocation)location __attribute__((deprecated("This method is deprecated will always return false"))); + (void)showMoreApps:(CBLocation)location __attribute__((deprecated("This method is deprecated and is a no-op"))); + (void)showMoreApps:(UIViewController *)viewController diff --git a/frameworks/Chartboost.framework/Versions/A/Headers/ChartboostDelegate.h b/frameworks/Chartboost.framework/Versions/A/Headers/ChartboostDelegate.h index 59faf14..38dd87b 100644 --- a/frameworks/Chartboost.framework/Versions/A/Headers/ChartboostDelegate.h +++ b/frameworks/Chartboost.framework/Versions/A/Headers/ChartboostDelegate.h @@ -163,6 +163,22 @@ CBStatusBarBehaviorRespect }; + +/*! + @typedef NS_ENUM (NSUInteger, CBPIDataUseConsent) + + @abstract + GDPR compliance settings: + */ +typedef NS_ENUM(NSInteger, CBPIDataUseConsent) { + /*! Publisher hasn't implemented functionality or the user has the option to not answer. */ + Unknown = -1, + /*! User does not consent to targeting (Contextual ads). */ + NoBehavioral = 0, + /*! User consents (Behavioral and Contextual Ads). */ + YesBehavioral = 1 +}; + /*! @typedef CBLocation diff --git a/frameworks/WACbImpl.framework/Headers/WACbImpl.h b/frameworks/WACbImpl.framework/Headers/WACbImpl.h index 559147e..ab6007d 100644 --- a/frameworks/WACbImpl.framework/Headers/WACbImpl.h +++ b/frameworks/WACbImpl.framework/Headers/WACbImpl.h @@ -16,4 +16,4 @@ // In this header, you should import all the public headers of your framework using statements like #import <WACbImpl/PublicHeader.h> -//time:2018/08/27 15:45 ver:3.7.0 +//time:2019/01/15 12:30 ver:3.8.0 diff --git a/frameworks/WACbImpl.framework/Info.plist b/frameworks/WACbImpl.framework/Info.plist index cc61458..b2754db 100644 --- a/frameworks/WACbImpl.framework/Info.plist +++ b/frameworks/WACbImpl.framework/Info.plist Binary files differ diff --git a/frameworks/WACbImpl.framework/WACbImpl b/frameworks/WACbImpl.framework/WACbImpl index 8184abd..f7c3c71 100644 --- a/frameworks/WACbImpl.framework/WACbImpl +++ b/frameworks/WACbImpl.framework/WACbImpl Binary files differ -- Gitblit v1.8.0