From 34827efe3c9b9cb70012df59b57e20948076da0c Mon Sep 17 00:00:00 2001
From: hank <hank.zhang@proficientcity.com>
Date: Thu, 30 Aug 2018 09:11:01 +0800
Subject: [PATCH] 添加V3.7.0
---
frameworks/WASdkIntf.framework/WASdkIntf | 0
frameworks/WASdkIntf.framework/Headers/WAITrack.h | 27 +++++++++++++
frameworks/WASdkIntf.framework/Headers/WACore.h | 3 +
WASdkIntf.podspec | 2
frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 2
frameworks/WASdkIntf.framework/Headers/WATrackProxy.h | 23 +++++++++--
frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h | 3 +
frameworks/WASdkIntf.framework/Headers/WACoreProxy.h | 16 +++++++
8 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/WASdkIntf.podspec b/WASdkIntf.podspec
index 4978565..34b0f01 100644
--- a/WASdkIntf.podspec
+++ b/WASdkIntf.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkIntf'
-s.version = '3.6.9'
+s.version = '3.7.0'
s.summary = 'WASdkIntf framework in production environment.'
s.license = 'MIT'
s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
diff --git a/frameworks/WASdkIntf.framework/Headers/WACore.h b/frameworks/WASdkIntf.framework/Headers/WACore.h
index 304beec..eedaccc 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACore.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACore.h
@@ -43,6 +43,9 @@
-(NSString*)getSdkVer;
-(NSString*)getSdkId;
-(NSString*)getSessionId;
+-(NSString *)getPrivacyUrl;
+-(NSString *)getPrivacyUpdateTime;
+-(void)showPrivacyUI:(void(^)(BOOL isClose))handler;
-(NSString*)getDeepLinkWithUrl:(NSURL*)url;
-(WAParamConfigObj*)getParamConfig;
-(void)fetchDeferredAppLink:(void(^)(NSURL *url, NSError *error))handler;
diff --git a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
index 27bf720..509d3c2 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
@@ -170,6 +170,18 @@
*/
+(NSString*)getSessionId;
/*!
+ @abstract 隐私政策URL地址
+ */
++(NSString *)getPrivacyUrl;
+/*!
+ @abstract 隐私政策更新时间
+ */
++(NSString *)getPrivacyUpdateTime;
+/*!
+ @abstract 隐私政策内容界面
+ */
++(void)showPrivacyUI:(void(^)())privacyUIClosedHandler;
+/*!
@abstract 下面两个方法是关于Facebook deeplink, CP不用关注
*/
-(NSString*)getDeepLinkWithUrl:(NSURL*)url;
@@ -264,7 +276,9 @@
*/
+ (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;
++ (BOOL)application:(UIApplication *)application openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options;
+
++ (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler;
/*!
@abstract 设备是否越狱
diff --git a/frameworks/WASdkIntf.framework/Headers/WAITrack.h b/frameworks/WASdkIntf.framework/Headers/WAITrack.h
index 7a47c69..43cd914 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAITrack.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAITrack.h
@@ -7,6 +7,7 @@
//
#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
@interface WAITrack : NSObject
@property(strong,nonatomic)NSMutableDictionary *params;
@@ -133,8 +134,34 @@
*/
-(void)userImport;
/**
+ * 获取登录方式之前
+ */
+-(void)initiatedLoginWay;
+/**
+ * 获取登录方式之后
+ */
+-(void)postLoginWay;
+/**
+ * 进行登录之前
+ */
+-(void)initiatedPlatformLogin;
+/**
+ * 进行第三方渠道登录之后
+ */
+-(void)postThirdPartyLogin;
+/**
+ * 进行WING平台登录之后
+ */
+-(void)postWingLogin;
+/**
* 自定义事件
*/
-(void)custom;
+- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler;
+
+- (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;
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
index e1e4ff7..70f4edd 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
@@ -28,4 +28,7 @@
@property(nonatomic) NSInteger adVideoCacheCount;
@property(nonatomic) NSInteger enableBindAccount; // 绑定: 0-关闭, 1-打开
@property(nonatomic) NSInteger enableUnBindAccount; // 解绑: 0-关闭,1-打开
+@property(nonatomic,copy)NSString* privacyUrl; // 用户协议url
+@property(nonatomic,copy)NSString* privacyUpdateTime; // 用户协议更新时间
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
index ab345c6..a6488bc 100644
--- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
+++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
@@ -65,4 +65,4 @@
// In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h>
-//time:2018/06/21 10:24 ver:3.6.9
+//time:2018/08/27 14:39 ver:3.7.0
diff --git a/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h b/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
index d7cfbc5..5bee837 100644
--- a/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
@@ -19,11 +19,11 @@
}WAParameterType;
//支付类型
-typedef enum WAEnumPaymentType{
- WAEnumPaymentTypeGoogle,
- WAEnumPaymentTypeApple,
- WAEnumPaymentTypeFree
-}WAEnumPaymentType;
+//typedef enum WAEnumPaymentType{
+// WAEnumPaymentTypeGoogle,
+// WAEnumPaymentTypeApple,
+// WAEnumPaymentTypeFree
+//}WAEnumPaymentType;
//性别
typedef enum WAEnumGender{
@@ -81,6 +81,12 @@
extern NSString *const WAEventSession;
extern NSString *const WAEventAFTrackingInit;
+
+extern NSString *const WAEventInitiatedLoginWay; // 获取登录方式之前
+extern NSString *const WAEventPostLoginWay; // 获取登录方式之后
+extern NSString *const WAEventInitiatedPlatformLogin; // 进行登录之前
+extern NSString *const WAEventPostThirdPartyLogin; // 进行第三方渠道登录之后
+extern NSString *const WAEventPostWingLogin; // 进行WING平台登录之后
extern NSString *const WAEventParameterNameRegistrationMethod;
@@ -169,6 +175,13 @@
extern NSString *const WAEventParameterNameCurrentAmount;//当前货币数量
extern NSString *const WAEventParameterNameAmount;//变更货币数
+// 获取登录方式之后
+extern NSString *const WAEventParameterNameLoginWayCount; // 登录方式个数
+
+// 进行登录之前、进行第三方渠道登录之后、进行WING平台登录之后
+extern NSString *const WAEventParameterNamePlatformName; // 登录渠道名称
+extern NSString *const WAEventParameterNameLoginStatus; // 登录状态
+
//支付类型
extern NSString *const WAValueForPaymentTypeApple;
extern NSString *const WAValueForPaymentTypeGoogle;
diff --git a/frameworks/WASdkIntf.framework/WASdkIntf b/frameworks/WASdkIntf.framework/WASdkIntf
index 05cebcc..24fdd5b 100644
--- a/frameworks/WASdkIntf.framework/WASdkIntf
+++ b/frameworks/WASdkIntf.framework/WASdkIntf
Binary files differ
--
Gitblit v1.8.0