From aea85e78b769b67143d1425de6d431b6143066e9 Mon Sep 17 00:00:00 2001
From: hank <hank.zhang@proficientcity.com>
Date: Mon, 04 Sep 2017 09:37:02 +0800
Subject: [PATCH] 添加V3.6.5
---
frameworks/WASdkIntf.framework/WASdkIntf | 0
frameworks/WASdkIntf.framework/Headers/WAIAd.h | 30 ++++++
frameworks/WASdkIntf.framework/Headers/WACore.h | 2
frameworks/WASdkIntf.framework/_CodeSignature/CodeResources | 62 +++++++++---
frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory | 0
WASdkIntf.podspec | 2
frameworks/WASdkIntf.framework/Headers/WAConstants.h | 3
frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 | 0
frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 4
frameworks/WASdkIntf.framework/Headers/WAAdProxy.h | 112 ++++++++++++++++++++++
frameworks/WASdkIntf.framework/Info.plist | 0
frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature | 0
frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h | 1
frameworks/WASdkIntf.framework/Headers/WACoreProxy.h | 39 ++++++-
14 files changed, 228 insertions(+), 27 deletions(-)
diff --git a/WASdkIntf.podspec b/WASdkIntf.podspec
index 48051fd..ccb8a0c 100644
--- a/WASdkIntf.podspec
+++ b/WASdkIntf.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkIntf'
-s.version = '3.6.4'
+s.version = '3.6.5'
s.summary = 'WASdkIntf framework in production environment.'
s.license = 'MIT'
s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
diff --git a/frameworks/WASdkIntf.framework/Headers/WAAdProxy.h b/frameworks/WASdkIntf.framework/Headers/WAAdProxy.h
new file mode 100644
index 0000000..91925a2
--- /dev/null
+++ b/frameworks/WASdkIntf.framework/Headers/WAAdProxy.h
@@ -0,0 +1,112 @@
+//
+// WAAdProxy.h
+// WASdkIntfUI
+//
+// Created by hank on 2017/8/15.
+// Copyright © 2017年 GHW-T-01. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+typedef NS_ENUM(NSInteger, WAAdCancelType) {
+ WAAdCancelTypePlayBefore = 0, // 播放前取消（播放前提示页面）
+ WAAdCancelTypePlaying, // 播放过程中取消
+ WAAdCancelTypePlayAfter, // 播放后取消（下载页面取消）
+};
+
+/** 广告激励视频代理 */
+@protocol WAAdRewardedVideoDelegate <NSObject>
+
+/*!
+ @abstract 显示视频前页面成功时回调
+ @param campaignId 推广活动Id
+ @param adSetId 广告组Id
+ @param rewarded 奖励物品
+ @param rewardedCount 奖励物品数量
+ @param extInfo CP扩展字段
+ */
+- (void) adPreDisplayRewardedVideoWithCampaignId:(NSString *)campaignId
+ adSetId:(NSString *)adSetId
+ rewarded:(NSString *)rewarded
+ rewardedCount:(NSInteger)rewardedCount
+ extInfo:(NSString *)extInfo;
+
+/*!
+ @abstract 点击叉按钮后回调
+ @param campaignId 推广活动Id
+ @param adSetId 广告组Id
+ @param process WAAdCancelTypePlayBefore 播放前取消，WAAdCancelTypePlaying 播放过程中取消, WAAdCancelTypeAfter 播放后取消（下载页面取消）
+ @param extInfo CP扩展字段
+ */
+- (void) adDidCancelRewardedVideoWithCampaignId:(NSString *)campaignId
+ adSetId:(NSString *)adSetId
+ process:(WAAdCancelType)process
+ extInfo:(NSString *)extInfo;
+
+/*!
+ @abstract 加载视频失败回调
+ @param campaignId 推广活动Id
+ @param adSetId 广告组Id
+ @param extInfo CP扩展字段
+ */
+- (void) adDidFailToLoadRewardedVideoWithCampaignId:(NSString *)campaignId
+ adSetId:(NSString *)adSetId
+ extInfo:(NSString *)extInfo;
+
+/*!
+ @abstract 播放视频结束回调
+ @param campaignId 推广活动Id
+ @param adSetId 广告组Id
+ @param rewarded 奖励物品
+ @param rewardedCount 奖励物品数量
+ @param extInfo CP扩展字段
+ */
+- (void) adDidDisplayRewardedVideoWithCampaignId:(NSString *)campaignId
+ adSetId:(NSString *)adSetId
+ rewarded:(NSString *)rewarded
+ rewardedCount:(NSInteger)rewardedCount
+ extInfo:(NSString *)extInfo;
+
+/*!
+ @abstract 播放完视频点击回调
+ @param campaignId 推广活动Id
+ @param adSetId 广告组Id
+ @param rewarded 奖励物品
+ @param rewardedCount 奖励物品数量
+ @param extInfo CP扩展字段
+ */
+- (void) adDidClickRewardedVideoWithCampaignId:(NSString *)campaignId
+ adSetId:(NSString *)adSetId
+ rewarded:(NSString *)rewarded
+ rewardedCount:(NSInteger)rewardedCount
+ extInfo:(NSString *)extInfo;
+
+@end
+
+/** 视频广告缓存完代理 */
+@protocol WAAdRewardedVideoCachedDelegate <NSObject>
+
+/*!
+ @abstract 视频广告缓存完成回调
+ @param cacheCount 可用广告数量
+ */
+- (void)adDidRewardedVideoCachedWithCacheCount:(NSInteger)cacheCount;
+
+@end
+
+@interface WAAdProxy : NSObject
+
+/** 加载广告 */
++ (void)loadAd;
+
+/** 设置视频广告缓存完回调 */
++ (void)setWAAdRewardedVideoCachedDelegate:(id<WAAdRewardedVideoCachedDelegate>)delegate;
+
+/** 检测可播放广告数量 */
++ (NSInteger) checkRewardedVideo;
+
+/** 显示广告 */
++ (void) displayRewardedVideoWithExtInfo:(NSString *)extInfo delegate:(id<WAAdRewardedVideoDelegate>)delegate;
+
+@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAConstants.h b/frameworks/WASdkIntf.framework/Headers/WAConstants.h
index cadf0e3..bf1d7a4 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAConstants.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAConstants.h
@@ -19,7 +19,8 @@
extern NSString *const WA_MODULE_APW;//应用墙模块
extern NSString *const WA_MODULE_CORE;//公共模块
extern NSString *const WA_MODULE_HUP;//热更新模块
-extern NSString *const WA_MODULE_PUSH;//热更新模块
+extern NSString *const WA_MODULE_PUSH;//消息推送模块
+extern NSString *const WA_MODULE_AD; //广告模块
extern NSString *const WA_PLATFORM_FACEBOOK;
extern NSString *const WA_PLATFORM_APPLE;
diff --git a/frameworks/WASdkIntf.framework/Headers/WACore.h b/frameworks/WASdkIntf.framework/Headers/WACore.h
index 9671bce..28f3f40 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACore.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACore.h
@@ -42,4 +42,6 @@
-(void)fetchDeferredAppLink:(void(^)(NSURL *url, NSError *error))handler;
-(void)addEventContentWithString:(NSString*)string;
-(void)eventLogWithPlatform:(NSString*)platform eventName:(NSString*)eventName parameters:(NSDictionary*)parameters color:(UIColor*)color;
+/** 检测设备是否越狱 */
+- (BOOL)isJailBreak;
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
index 38f0fc5..179deaa 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
@@ -179,29 +179,46 @@
+ (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions;
#pragma mark 消息通知
-// 注册通知
+/*!
+@abstract 注册通知
+*/
+ (void)application:(UIApplication *)application initPushWithDelegate:(id<UNUserNotificationCenterDelegate>)delegate;
-// 调用过用户注册通知方法之后执行
+/*!
+ @abstract 调用过用户注册通知方法之后执行
+ */
+ (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings;
-// 获取deviceToken
+/*!
+ @abstract 获取deviceToken
+ */
+ (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken;
-// 注册失败
+/*!
+ @abstract 注册失败
+ */
+ (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error;
#pragma mark IOS8 IOS9 Push Notification Receive
-// 接收本地通知
+/*!
+ @abstract 接收本地通知
+ */
+ (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification;
-// 接收远程通知
+
+/*!
+ @abstract 接收远程通知
+ */
+ (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler;
#pragma mark IOS10 Push Notification Receive
-//App处于前台接收通知时
+/*!
+ @abstractApp 处于前台接收通知时
+ */
+ (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler;
-// 通知的点击事件
+/*!
+ @abstract 通知的点击事件
+ */
+ (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)())completionHandler;
/*!
@@ -231,4 +248,10 @@
+ (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation;
+ (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options;
+
+/*!
+ @abstract 设备是否越狱
+ */
++ (BOOL)isJailBreak;
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIAd.h b/frameworks/WASdkIntf.framework/Headers/WAIAd.h
new file mode 100644
index 0000000..b91929b
--- /dev/null
+++ b/frameworks/WASdkIntf.framework/Headers/WAIAd.h
@@ -0,0 +1,30 @@
+//
+// WAIAd.h
+// WASdkIntfUI
+//
+// Created by hank on 2017/8/15.
+// Copyright © 2017年 GHW-T-01. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "WAAdProxy.h"
+
+@interface WAIAd : NSObject
+
+/** 加载广告 */
+- (void)loadAd;
+
+/** 设置视频广告缓存完回调 */
+- (void)setWAAdRewardedVideoCachedDelegate:(id<WAAdRewardedVideoCachedDelegate>)delegate;
+
+/** 检测可播放广告数量 */
+- (NSInteger) checkRewardedVideo;
+
+/** 显示广告 */
+- (void) displayRewardedVideoWithExtInfo:(NSString *)extInfo delegate:(id<WAAdRewardedVideoDelegate>)delegate;
+
+- (void)applicationDidBecomeActive:(UIApplication *)application;
+
+- (void)applicationDidEnterBackground:(UIApplication *)application;
+
+@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
index f51985e..2020699 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
@@ -25,4 +25,5 @@
@property(nonatomic,strong)NSNumber* isTestDevice;
@property(nonatomic,copy)NSString* userAgreementUrl;
@property(nonatomic,strong)NSNumber* uploadPurchaseLog;
+@property(nonatomic) NSInteger adVideoCacheCount;
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
index e4147b1..00ac3d2 100644
--- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
+++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
@@ -6,6 +6,8 @@
// Copyright © 2016年 GHW-T-01. All rights reserved.
//
+#import <WASdkIntf/WAIAd.h>
+#import <WASdkIntf/WAAdProxy.h>
#import <WASdkIntf/WAIPush.h>
#import <WASdkIntf/WAPushProxy.h>
#import <WASdkIntf/WAIApw.h>
@@ -61,4 +63,4 @@
// In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h>
-//time:2017/6/12 14:21 ver:3.6.4
+//time:2017/8/30 09:55 ver:3.6.5
diff --git a/frameworks/WASdkIntf.framework/Info.plist b/frameworks/WASdkIntf.framework/Info.plist
index 55a0e20..355de81 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 7410ffe..c19472f 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 beffd11..38cf20f 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 7e7f5bf..397ab49 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 e9fb681..83116bb 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
@@ -8,6 +8,10 @@
<data>
mPLGfDWmeBVPhSO3IfKMujJdbwk=
</data>
+ <key>Headers/WAAdProxy.h</key>
+ <data>
+ E/Y1UH88Rnba0EbkgYA248yV1cs=
+ </data>
<key>Headers/WAAppInviteContent.h</key>
<data>
5QV/wDPZDQr+xzY+qjR1sy6Z9UE=
@@ -42,15 +46,15 @@
</data>
<key>Headers/WAConstants.h</key>
<data>
- sk2EsQY4gsFB4ZldeI8jDgcp6Fw=
+ xu0hQ+vSvSWv+eBfyzNm2VlbMn8=
</data>
<key>Headers/WACore.h</key>
<data>
- h+WBWDVPZdn5bjm7oUa9I2T/mco=
+ MxsLP5xn29SjzKlXtv0Az6h1RgM=
</data>
<key>Headers/WACoreProxy.h</key>
<data>
- aFM10FeidrinjW2udJD40FV2GIc=
+ mNEyUC/hUmDYcfUnGmEyNLDsTAc=
</data>
<key>Headers/WAError.h</key>
<data>
@@ -91,6 +95,10 @@
<key>Headers/WAHupProxy.h</key>
<data>
Pf4DNml5wZ0d42R4tr0cUQ0GrE8=
+ </data>
+ <key>Headers/WAIAd.h</key>
+ <data>
+ p9HD4iPxlAVisnXG9xwLdMYdGTc=
</data>
<key>Headers/WAIApw.h</key>
<data>
@@ -134,7 +142,7 @@
</data>
<key>Headers/WAParamConfigObj.h</key>
<data>
- /qVewcf8qcCbDw2EC7cKUTMxyhc=
+ hMQawyXne4zoBqe9m+zDn+D4On8=
</data>
<key>Headers/WAPayChannel.h</key>
<data>
@@ -150,7 +158,7 @@
</data>
<key>Headers/WASdkIntf.h</key>
<data>
- 5eJBJmLCfONnuJGDl78DIkb9qac=
+ +aUfnBTmKNm11lBPfL+FXEF3wOE=
</data>
<key>Headers/WAShareLinkContent.h</key>
<data>
@@ -194,7 +202,7 @@
</data>
<key>Info.plist</key>
<data>
- y1/RvXTGWnZAgUZ9fx4vfeD3L3Q=
+ LkRKOBgcsJfYnwXRt0eS6nBci00=
</data>
<key>Modules/module.modulemap</key>
<data>
@@ -212,6 +220,17 @@
<key>hash2</key>
<data>
m1ZKtCAHKT51nMd/si4J73+xrlQrrmAbIcG85qKirBY=
+ </data>
+ </dict>
+ <key>Headers/WAAdProxy.h</key>
+ <dict>
+ <key>hash</key>
+ <data>
+ E/Y1UH88Rnba0EbkgYA248yV1cs=
+ </data>
+ <key>hash2</key>
+ <data>
+ HbFLofz2Ix9pBbvhrmMsH+QpwioDAD6vY2d8HyJU45g=
</data>
</dict>
<key>Headers/WAAppInviteContent.h</key>
@@ -306,33 +325,33 @@
<dict>
<key>hash</key>
<data>
- sk2EsQY4gsFB4ZldeI8jDgcp6Fw=
+ xu0hQ+vSvSWv+eBfyzNm2VlbMn8=
</data>
<key>hash2</key>
<data>
- zEdBGd94gHbnnqFgGCx3N4wHH3RmWuYr0hPPTTUkq34=
+ 8vwzyXI/EqzTaOimM3Ig4O016uLSR3oBsjqEwK8SEcc=
</data>
</dict>
<key>Headers/WACore.h</key>
<dict>
<key>hash</key>
<data>
- h+WBWDVPZdn5bjm7oUa9I2T/mco=
+ MxsLP5xn29SjzKlXtv0Az6h1RgM=
</data>
<key>hash2</key>
<data>
- pEWvBqGb7u0dtJCNfNY1dzecCSDxtAjkxPbG3w0mlRE=
+ 2dv/hgsSUNvMtIg6LMUIfgq152Sv+Jpq4IN/K2CBbXM=
</data>
</dict>
<key>Headers/WACoreProxy.h</key>
<dict>
<key>hash</key>
<data>
- aFM10FeidrinjW2udJD40FV2GIc=
+ mNEyUC/hUmDYcfUnGmEyNLDsTAc=
</data>
<key>hash2</key>
<data>
- 14xamuKKR0hfE4TTPc/toEL22ul8koAy+dxs6IeZHwI=
+ cssoirTvvSAfXUU/K9M5F82WZCqXZaUvTqmXEMBOAPE=
</data>
</dict>
<key>Headers/WAError.h</key>
@@ -443,6 +462,17 @@
<key>hash2</key>
<data>
qB7NoiFClA7wrn6ROmE1HRX4Ke/dfORVFGINdkCZzx4=
+ </data>
+ </dict>
+ <key>Headers/WAIAd.h</key>
+ <dict>
+ <key>hash</key>
+ <data>
+ p9HD4iPxlAVisnXG9xwLdMYdGTc=
+ </data>
+ <key>hash2</key>
+ <data>
+ xu6LAACAv466RZ/NVdhWJS1lYD+B4DgQqzWlE0twivg=
</data>
</dict>
<key>Headers/WAIApw.h</key>
@@ -559,11 +589,11 @@
<dict>
<key>hash</key>
<data>
- /qVewcf8qcCbDw2EC7cKUTMxyhc=
+ hMQawyXne4zoBqe9m+zDn+D4On8=
</data>
<key>hash2</key>
<data>
- DEZdgaPqi6/AD4By4kZVWsgcQgSK/dLOBQP0EVlBZXM=
+ p/rIK8k2UWdgHt9P/y/UPofDTnfBBEtQeXnU3DJumOM=
</data>
</dict>
<key>Headers/WAPayChannel.h</key>
@@ -603,11 +633,11 @@
<dict>
<key>hash</key>
<data>
- 5eJBJmLCfONnuJGDl78DIkb9qac=
+ +aUfnBTmKNm11lBPfL+FXEF3wOE=
</data>
<key>hash2</key>
<data>
- aAwyOpmrSIltHsN6oHMGl4LWNI5+LDrMrqSifFN0b5c=
+ Km+RPYxrKYt5unNnVjGd4ehPcij4UTdrmm7zc2w5eM0=
</data>
</dict>
<key>Headers/WAShareLinkContent.h</key>
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
index 0587514..a10a1d8 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
Binary files differ
--
Gitblit v1.8.0