From dbf5355a73461560459217cbc56e74fc8b801879 Mon Sep 17 00:00:00 2001
From: lpw
Date: Mon, 24 Jun 2024 17:04:02 +0800
Subject: [PATCH] 提交4.0.0
---
frameworks/WASdkIntf.framework/WASdkIntf | 0
frameworks/WASdkIntf.framework/_CodeSignature/CodeResources | 62 +++++++++---
WASdkIntf.podspec | 2
frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory | 0
frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 4
frameworks/WASdkIntf.framework/Info.plist | 0
frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature | 0
frameworks/WASdkIntf.framework/Headers/WAIAdmob.h | 63 ++++++++++++
frameworks/WASdkIntf.framework/Headers/WALoginResult.h | 2
frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h | 3
frameworks/WASdkIntf.framework/Headers/WAConstants.h | 1
frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 | 0
frameworks/WASdkIntf.framework/Headers/WAAdMobProxy.h | 120 ++++++++++++++++++++++++
WASdkIntf/4.0.0/WASdkIntf.podspec | 23 ++++
frameworks/WASdkIntf.framework/Headers/WABindingResult.h | 2
15 files changed, 262 insertions(+), 20 deletions(-)
diff --git a/WASdkIntf.podspec b/WASdkIntf.podspec
index 500339d..fedc4d5 100644
--- a/WASdkIntf.podspec
+++ b/WASdkIntf.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkIntf'
-s.version = '3.18.1'
+s.version = '4.0.0'
s.summary = 'WASdkIntf framework in production environment.'
s.license = 'MIT'
s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
diff --git a/WASdkIntf/4.0.0/WASdkIntf.podspec b/WASdkIntf/4.0.0/WASdkIntf.podspec
new file mode 100644
index 0000000..fedc4d5
--- /dev/null
+++ b/WASdkIntf/4.0.0/WASdkIntf.podspec
@@ -0,0 +1,23 @@
+#
+# Be sure to run `pod spec lint WASdkIntf.podspec' to ensure this is a
+# valid spec and to remove all comments including this before submitting the spec.
+#
+# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html
+# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
+#
+
+Pod::Spec.new do |s|
+
+s.name = 'WASdkIntf'
+s.version = '4.0.0'
+s.summary = 'WASdkIntf framework in production environment.'
+s.license = 'MIT'
+s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
+s.homepage = 'http://repo.wingsdk.cn:8082/summary/WASdkIntf.git'
+s.source = { :git => "http://admin@repo.wingsdk.cn:8082/r/WASdkIntf.git" , :tag => s.version}
+s.platform = :ios
+s.ios.deployment_target = "7.0"
+s.vendored_frameworks = 'frameworks/WASdkIntf.framework'
+s.resources = ['config/*.plist']
+s.requires_arc = true
+end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAAdMobProxy.h b/frameworks/WASdkIntf.framework/Headers/WAAdMobProxy.h
new file mode 100644
index 0000000..ada517c
--- /dev/null
+++ b/frameworks/WASdkIntf.framework/Headers/WAAdMobProxy.h
@@ -0,0 +1,120 @@
+//
+// WAAdMobProxy.h
+// WASdkIntf
+//
+// Created by lpw on 2024/5/27.
+// Copyright © 2024 GHW-T-01. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+
+@protocol GADFullScreenContentDelegate;
+
+/// Protocol for ads that present full screen content.
+@protocol GADFullScreenPresentingAd <NSObject>
+
+/// Delegate object that receives full screen content messages.
+@property(nonatomic, weak, nullable) id<GADFullScreenContentDelegate> fullScreenContentDelegate;
+
+@end
+
+/// Delegate methods for receiving notifications about presentation and dismissal of full screen
+/// content. Full screen content covers your application's content. The delegate may want to pause
+/// animations or time sensitive interactions. Full screen content may be presented in the following
+/// cases:
+/// 1. A full screen ad is presented.
+/// 2. An ad interaction opens full screen content.
+@protocol GADFullScreenContentDelegate <NSObject>
+
+@optional
+
+/// Tells the delegate that an impression has been recorded for the ad.
+- (void)adDidRecordImpression:(nonnull id<GADFullScreenPresentingAd>)ad;
+
+/// Tells the delegate that a click has been recorded for the ad.
+- (void)adDidRecordClick:(nonnull id<GADFullScreenPresentingAd>)ad;
+
+/// Tells the delegate that the ad failed to present full screen content.
+- (void)ad:(nonnull id<GADFullScreenPresentingAd>)ad
+ didFailToPresentFullScreenContentWithError:(nonnull NSError *)error;
+
+/// Tells the delegate that the ad will present full screen content.
+- (void)adWillPresentFullScreenContent:(nonnull id<GADFullScreenPresentingAd>)ad;
+
+/// Tells the delegate that the ad will dismiss full screen content.
+- (void)adWillDismissFullScreenContent:(nonnull id<GADFullScreenPresentingAd>)ad;
+
+/// Tells the delegate that the ad dismissed full screen content.
+- (void)adDidDismissFullScreenContent:(nonnull id<GADFullScreenPresentingAd>)ad;
+
+/// Tells the delegate that the user earned a reward.
+- (void)userDidEarnReward:(nonnull NSMutableDictionary*)rewardDic;
+
+
+#pragma mark - Unavailable
+
+/// Unsupported. Delegates should implement adWillPresentFullScreenContent: instead.
+- (void)adDidPresentFullScreenContent:(nonnull id<GADFullScreenPresentingAd>)ad NS_UNAVAILABLE;
+
+@end
+
+
+@interface WAAdMobProxy : NSObject
+
+// 广告测试模式，会强制使用测试广告id
++ (void)setTestMode:(BOOL)isDebugMode;
+
+
+/**
+ 横幅广告
+ @param viewController 用于显示广告的视图控制器。
+ @param containerView 将包含横幅广告的视图。广告视图将作为此视图的子视图添加。
+ */
++ (void)bindBannerAdWithViewController:(UIViewController *)viewController containerView:(UIView *)containerView;
+
+
+// 插页广告
++ (BOOL)checkInterstitialAdReady;
++ (void)showInterstitialAdWithViewController:(UIViewController *)viewController withDelegate:( id<GADFullScreenContentDelegate>)delegate;
+
+
+//开屏广告
++ (BOOL)checkAppOpenAdReady;
++ (void)showAppOpenAdWithViewController:(UIViewController *)viewController withDelegate:( id<GADFullScreenContentDelegate>)delegate;
+
+
+/**
+ 显示激励广告。
+
+ 此方法在给定的视图控制器上显示激励广告，并处理广告的回调。
+
+ @param viewController 用于显示广告的视图控制器。
+ @param adName 广告名称或广告单元 ID。
+ @param extInfo 额外信息，可以用于调试或跟踪广告。
+ @param delegate 广告展示和关闭时的回调。
+ */
++ (void)showRewardedAdWithViewController:(UIViewController *)viewController adName:(NSString *)adName extInfo:(NSString *)extInfo delegate:( id<GADFullScreenContentDelegate>)delegate;
+
+
+
+
+//admob的ump隐私
+
++ (BOOL)checkUmpOptions;
++ (void)showUmpOptionsWithViewController:(UIViewController *)viewController consentGatheringComplete:(void (^)(NSError *_Nullable error))completionHandler;
+
+
+
+
+
+
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/frameworks/WASdkIntf.framework/Headers/WABindingResult.h b/frameworks/WASdkIntf.framework/Headers/WABindingResult.h
index f39e549..321fac9 100644
--- a/frameworks/WASdkIntf.framework/Headers/WABindingResult.h
+++ b/frameworks/WASdkIntf.framework/Headers/WABindingResult.h
@@ -33,7 +33,7 @@
/**!
- @abstract 3.18.1添加，标记facebook登录是为受限登录
+ @abstract 4.0.0添加，标记facebook登录是为受限登录
*/
@property BOOL fbLimit;
diff --git a/frameworks/WASdkIntf.framework/Headers/WAConstants.h b/frameworks/WASdkIntf.framework/Headers/WAConstants.h
index 27ccf6f..43e6b74 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAConstants.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAConstants.h
@@ -22,6 +22,7 @@
extern NSString *const WA_MODULE_PUSH;//消息推送模块
extern NSString *const WA_MODULE_AD; //广告模块
extern NSString *const WA_MODULE_CSC;//客服系统
+extern NSString *const WA_MODULE_ADMOB;//admob广告系统
extern NSString *const WA_PLATFORM_FACEBOOK;
extern NSString *const WA_PLATFORM_APPLE;
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIAdmob.h b/frameworks/WASdkIntf.framework/Headers/WAIAdmob.h
new file mode 100644
index 0000000..9cb0a35
--- /dev/null
+++ b/frameworks/WASdkIntf.framework/Headers/WAIAdmob.h
@@ -0,0 +1,63 @@
+//
+// WAIAdmob.h
+// WASdkIntf
+//
+// Created by lpw on 2024/5/28.
+// Copyright © 2024 GHW-T-01. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <WASdkIntf/WAAdMobProxy.h>
+NS_ASSUME_NONNULL_BEGIN
+
+@interface WAIAdmob : NSObject
+// 广告测试模式，会强制使用测试广告id
+- (void)setTestMode:(BOOL)isDebugMode;
+
+
+
+// 横幅广告
+- (BOOL)checkBannerAdReady;
+/**
+ @param viewController 用于显示广告的视图控制器。
+ @param containerView 将包含横幅广告的视图。广告视图将作为此视图的子视图添加。
+ */
+- (void)bindBannerAdWithViewController:(UIViewController *)viewController containerView:(UIView *)containerView ;
+
+
+// 插页广告
+- (BOOL)checkInterstitialAdReady;
+- (void)showInterstitialAdWithViewController:(UIViewController *)viewController withDelegate:( id<GADFullScreenContentDelegate>)delegate;
+
+
+//开屏广告
+- (BOOL)checkAppOpenAdReady;
+- (void)showAppOpenAdWithViewController:(UIViewController *)viewController withDelegate:( id<GADFullScreenContentDelegate>)delegate;
+
+
+//激励广告
+- (BOOL)checkRewardedAdReady;
+/**
+ 显示激励广告。
+
+ 此方法在给定的视图控制器上显示激励广告，并处理广告的回调。
+
+ @param viewController 用于显示广告的视图控制器。
+ @param adName 广告名称或广告单元 ID。
+ @param extInfo 额外信息，可以用于调试或跟踪广告。
+ @param callback 广告展示和关闭时的回调。
+ */
+- (void)showRewardedAdWithViewController:(UIViewController *)viewController adName:(NSString *)adName extInfo:(NSString *)extInfo delegate:( id<GADFullScreenContentDelegate>)delegate;
+
+
+
+
+//admob的ump隐私
+
+- (BOOL)checkUmpOptions;
+- (void)showUmpOptionsWithViewController:(UIViewController *)viewController consentGatheringComplete: (void (^)(NSError *_Nullable error))completionHandler;
+
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/frameworks/WASdkIntf.framework/Headers/WALoginResult.h b/frameworks/WASdkIntf.framework/Headers/WALoginResult.h
index 4658cd6..9f65ea1 100644
--- a/frameworks/WASdkIntf.framework/Headers/WALoginResult.h
+++ b/frameworks/WASdkIntf.framework/Headers/WALoginResult.h
@@ -127,7 +127,7 @@
/**!
- @abstract 3.18.1添加，标记facebook登录是为受限登录
+ @abstract 4.0.0添加，标记facebook登录是为受限登录
*/
@property BOOL fbLimit;
diff --git a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
index fd66d9d..f4bf382 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
@@ -61,4 +61,7 @@
@property(nonatomic,copy)NSString * mobile_country;// 优先展示国家
+@property(nonatomic)NSInteger isOpenfbLimitLogin; // facebook限制性登录开发( 0 关闭 1开启，默认关闭, 不返回，或0，默认关闭)
+@property(nonatomic)NSInteger isOpenEventSend; // 是否已配置累充金额,若配置了此参数,则返回已配置的金额
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
index 0f5d2a6..5b74f57 100644
--- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
+++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
@@ -62,6 +62,8 @@
#import <WASdkIntf/WASdkIntf.h>
#import <WASdkIntf/WADeleteRequestModel.h>
#import <WASdkIntf/WADeleteResult.h>
+#import <WASdkIntf/WAIAdmob.h>
+#import <WASdkIntf/WAAdMobProxy.h>
//! Project version number for WASdkIntf.
FOUNDATION_EXPORT double WASdkIntfVersionNumber;
@@ -71,4 +73,4 @@
// In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h>
-//time:2024/04/10 12:29 ver:3.18.0
+//time:2024/06/24 12:29 ver:4.0.0
diff --git a/frameworks/WASdkIntf.framework/Info.plist b/frameworks/WASdkIntf.framework/Info.plist
index 134e9d4..de6a193 100644
--- a/frameworks/WASdkIntf.framework/Info.plist
+++ b/frameworks/WASdkIntf.framework/Info.plist
Binary files differ
diff --git a/frameworks/WASdkIntf.framework/WASdkIntf b/frameworks/WASdkIntf.framework/WASdkIntf
index 1076501..d2e46d3 100644
--- a/frameworks/WASdkIntf.framework/WASdkIntf
+++ b/frameworks/WASdkIntf.framework/WASdkIntf
Binary files differ
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory b/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory
index cd32884..8178021 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory
Binary files differ
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 b/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1
index 21b82b3..e0b0a5f 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1
Binary files differ
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources b/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
index a92de11..79cafa3 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
@@ -8,6 +8,10 @@
<data>
ZztFcb2t0NfZqUDo3T3/JOK86Eg=
</data>
+ <key>Headers/WAAdMobProxy.h</key>
+ <data>
+ I1qbB+3qL8erJiN2t8A6vm+M8hQ=
+ </data>
<key>Headers/WAAdProxy.h</key>
<data>
ndfcpdb1t8TlMNC/vGSQrmHBjC0=
@@ -30,7 +34,7 @@
</data>
<key>Headers/WABindingResult.h</key>
<data>
- nVjmd2HAG37NrzJnKxZOWyjg7iE=
+ SBFkOS5kHQzCm+M3lfR4D8QnXq4=
</data>
<key>Headers/WACertificationInfo.h</key>
<data>
@@ -54,7 +58,7 @@
</data>
<key>Headers/WAConstants.h</key>
<data>
- DbnY+JLNMZ0BF2B9mTMoTqI9HrI=
+ 68hyemiBLYtvITRc0H9iR2FhOrw=
</data>
<key>Headers/WACore.h</key>
<data>
@@ -120,6 +124,10 @@
<data>
p9HD4iPxlAVisnXG9xwLdMYdGTc=
</data>
+ <key>Headers/WAIAdmob.h</key>
+ <data>
+ x3WaTC/BfAEVWKciM3N2AofS+M4=
+ </data>
<key>Headers/WAIApw.h</key>
<data>
msm+3jD6C0mflQBEZ4CZgAsu244=
@@ -162,11 +170,11 @@
</data>
<key>Headers/WALoginResult.h</key>
<data>
- vduygqNS+KdWnPgcJsUW/dbuU3U=
+ BeNzsQtq6fq0RIAqgIwtg7WbaGc=
</data>
<key>Headers/WAParamConfigObj.h</key>
<data>
- TMwjl7hllinDbTcYiXoL7b8wAuk=
+ YDTOBZ2J+2Vne4Fy2hgXEpbROrY=
</data>
<key>Headers/WAPayChannel.h</key>
<data>
@@ -182,7 +190,7 @@
</data>
<key>Headers/WASdkIntf.h</key>
<data>
- R2INYXds8F7sk3TMwcBo154OJWg=
+ eoUjeBKJsaEUazB3EUM/hYm6Fl0=
</data>
<key>Headers/WAShareLinkContent.h</key>
<data>
@@ -230,7 +238,7 @@
</data>
<key>Info.plist</key>
<data>
- kDmtIQJZgdSfx0deFlekIljwjOI=
+ 2evLNI0t3DMPfFfYLRwGU33AB9M=
</data>
<key>Modules/module.modulemap</key>
<data>
@@ -248,6 +256,17 @@
<key>hash2</key>
<data>
p28+1dklzjjZRJ+x4BJioof3Z28yp+zkYsDFAXxUjIo=
+ </data>
+ </dict>
+ <key>Headers/WAAdMobProxy.h</key>
+ <dict>
+ <key>hash</key>
+ <data>
+ I1qbB+3qL8erJiN2t8A6vm+M8hQ=
+ </data>
+ <key>hash2</key>
+ <data>
+ fZQn9xxmx/cwzYuUNTzsXSkCl7ehq0oBhHVEWsncnoc=
</data>
</dict>
<key>Headers/WAAdProxy.h</key>
@@ -309,11 +328,11 @@
<dict>
<key>hash</key>
<data>
- nVjmd2HAG37NrzJnKxZOWyjg7iE=
+ SBFkOS5kHQzCm+M3lfR4D8QnXq4=
</data>
<key>hash2</key>
<data>
- O4GUuumC1ZAaHvLuBEQXZxBIM6hSesNjfxp076Xm20Y=
+ +oKbc4mHoN62rd7W6rjX2kdlzCHYe3VETeA8crhwm8g=
</data>
</dict>
<key>Headers/WACertificationInfo.h</key>
@@ -375,11 +394,11 @@
<dict>
<key>hash</key>
<data>
- DbnY+JLNMZ0BF2B9mTMoTqI9HrI=
+ 68hyemiBLYtvITRc0H9iR2FhOrw=
</data>
<key>hash2</key>
<data>
- fqQGntpehnajRKdFwBpBAO8qMoUm7fPhCTadIFdGRg4=
+ gCixD1Tk1i8sB9HyJP3KILiE7ywFaaX+0DtA+omOXEs=
</data>
</dict>
<key>Headers/WACore.h</key>
@@ -558,6 +577,17 @@
xu6LAACAv466RZ/NVdhWJS1lYD+B4DgQqzWlE0twivg=
</data>
</dict>
+ <key>Headers/WAIAdmob.h</key>
+ <dict>
+ <key>hash</key>
+ <data>
+ x3WaTC/BfAEVWKciM3N2AofS+M4=
+ </data>
+ <key>hash2</key>
+ <data>
+ ALKMV82GnPv6GBMmbw8/pdqoIb2C5xcnzMZAsmDHwTQ=
+ </data>
+ </dict>
<key>Headers/WAIApw.h</key>
<dict>
<key>hash</key>
@@ -672,22 +702,22 @@
<dict>
<key>hash</key>
<data>
- vduygqNS+KdWnPgcJsUW/dbuU3U=
+ BeNzsQtq6fq0RIAqgIwtg7WbaGc=
</data>
<key>hash2</key>
<data>
- tXMhuQxqPxFJn+RUwDKc0zI6G0krD/hclZkK+q+n/RU=
+ Acv4Au9u3G76Z6pharcKezR+6tFblFhBI1DWDteWITo=
</data>
</dict>
<key>Headers/WAParamConfigObj.h</key>
<dict>
<key>hash</key>
<data>
- TMwjl7hllinDbTcYiXoL7b8wAuk=
+ YDTOBZ2J+2Vne4Fy2hgXEpbROrY=
</data>
<key>hash2</key>
<data>
- 9ptxkEza9c9lkGpoqceQ0AfKrHACC5CVujOUQOB0iaI=
+ eGKiynBfGPRjWGc9+iHlPG7DcybdnNpukSNd577MHxI=
</data>
</dict>
<key>Headers/WAPayChannel.h</key>
@@ -727,11 +757,11 @@
<dict>
<key>hash</key>
<data>
- R2INYXds8F7sk3TMwcBo154OJWg=
+ eoUjeBKJsaEUazB3EUM/hYm6Fl0=
</data>
<key>hash2</key>
<data>
- Txi/qj7nDkV/l251srnI1gPPyNRuRJiDhEztWsVtbKE=
+ 2QUdljXaxijJDYG0x1Y2OdMlxBrT0/sW3qzelymk1bQ=
</data>
</dict>
<key>Headers/WAShareLinkContent.h</key>
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
index c2f9da3..9a5cf6a 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
Binary files differ
--
Gitblit v1.8.0