From 2e02224fb74f7bbcaef8d166416fcabca14647bc Mon Sep 17 00:00:00 2001
From: hank <hank.zhang@proficientcity.com>
Date: Fri, 03 Mar 2017 12:11:12 +0800
Subject: [PATCH] 添加V1.1.2
---
frameworks/WASdkIntf.framework/Headers/WAUserProxy.h | 22 +++++++---
WASdkIntf_CN.podspec | 2
frameworks/WASdkIntf.framework/WASdkIntf | 0
frameworks/WASdkIntf.framework/Headers/WAIUser.h | 4 ++
frameworks/WASdkIntf.framework/Headers/WAITrack.h | 5 ++
frameworks/WASdkIntf.framework/Headers/WAPayProxy.h | 7 +--
frameworks/WASdkIntf.framework/Headers/WASocialProxy.h | 7 +--
frameworks/WASdkIntf.framework/_CodeSignature/CodeResources | 50 ++++++++++++------------
frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory | 0
frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 | 0
frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 2
frameworks/WASdkIntf.framework/Info.plist | 0
frameworks/WASdkIntf.framework/Headers/WATrackProxy.h | 3 -
frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature | 0
frameworks/WASdkIntf.framework/Headers/WACoreProxy.h | 6 +-
15 files changed, 59 insertions(+), 49 deletions(-)
diff --git a/WASdkIntf_CN.podspec b/WASdkIntf_CN.podspec
index 35969c0..bd3d4c8 100644
--- a/WASdkIntf_CN.podspec
+++ b/WASdkIntf_CN.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkIntf_CN'
-s.version = '1.1.1'
+s.version = '1.1.2'
s.summary = 'WASdkIntf framework in production environment.'
s.license = 'MIT'
s.author = { "Hank" => "hank.zhang@gamehollywood.com" }
diff --git a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
index d95a40e..105c89e 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
@@ -81,7 +81,7 @@
+(NSString*)getUserId;
/*!
@abstract 设置serverId
- @param serverId
+ @param serverId 服务器id
*/
+(void)setServerId:(NSString *)serverId;
/*!
@@ -91,7 +91,7 @@
+(NSString*)getServerId;
/*!
@abstract 设置level
- @param level
+ @param level 等级
*/
+(void)setLevel:(int)level;
/*!
@@ -100,7 +100,7 @@
+(int)getLevel;
/*!
@abstract 设置gameUserId
- @param gameUserId
+ @param gameUserId 游戏userId
*/
+(void)setGameUserId:(NSString*)gameUserId;
/*!
diff --git a/frameworks/WASdkIntf.framework/Headers/WAITrack.h b/frameworks/WASdkIntf.framework/Headers/WAITrack.h
index 6515486..7a47c69 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAITrack.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAITrack.h
@@ -11,10 +11,12 @@
@interface WAITrack : NSObject
@property(strong,nonatomic)NSMutableDictionary *params;
@property(nonatomic)double value;
+@property(copy,nonatomic)NSDecimalNumber* numValue;
@property(copy,nonatomic)NSString* eventName;
-(void)initTracker;
-(void)trackWithEventName:(NSString *const)eventName valueToSum:(double)value params:(NSDictionary*)params;
+-(void)trackWithEventName:(NSString *const)eventName numValueToSum:(NSDecimalNumber*)numValue params:(NSDictionary*)params;
-(void)autoTriggerAfterPayment:(BOOL)isAuto;
-(BOOL)getAutoTriggerAfterPayment;
-(NSString*)getCollectionInfo;
@@ -55,8 +57,9 @@
-(void)purchase;
/**
* 在线时长
+ * @param type 0->开启,1->关闭
*/
--(void)heartbeat;
+-(void)session:(int)type;
/**
* 等级或分数
*/
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIUser.h b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
index 2eb93dc..5854d76 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAIUser.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
@@ -30,6 +30,10 @@
-(void)applicationDidBecomeActive:(UIApplication *)application;
+-(void)applicationWillEnterForeground:(UIApplication *)application;
+
+-(void)applicationDidEnterBackground:(UIApplication *)application;
+
-(BOOL)application:(UIApplication *)application
openURL:(NSURL *)url
sourceApplication:(NSString *)sourceApplication
diff --git a/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h b/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h
index 10afad1..d767bc4 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h
@@ -19,13 +19,11 @@
/*!
@abstract 查询成功
@param Inventory 是一个数组，保存着WAIapProduct类型的实例
- @param platform 支付平台
*/
-(void)queryInventoryDidCompleteWithResult:(NSArray<WAIapProduct *>*)Inventory;
/*!
@abstract 查询失败
@param error 错误
- @param platform 支付平台
*/
-(void)queryInventoryDidFailWithError:(NSError*)error;
@end
@@ -55,19 +53,18 @@
@interface WAPayProxy : NSObject
/*!
@abstract 应用内支付初始化
- @param platform 支付平台
*/
+(void)init4Iap;
/*!
@abstract 查询商品列表调用方法
- @param platform 支付平台
+ @param delegate 委托
*/
+(void)queryInventoryWithDelegate:(id<WAInventoryDelegate>)delegate;
/*!
@abstract 支付某个商品
@param productId 商品id
- @param platform 支付平台
@param extInfo 扩展信息
+ @param delegate 委托
*/
+(void)payWithProductId:(NSString*)productId extInfo:(NSString*)extInfo delegate:(id<WAPaymentDelegate>)delegate;
/*!
diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
index b048cd2..7c70166 100644
--- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
+++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
@@ -58,4 +58,4 @@
// In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h>
-//time:2017/1/3 17:15 ver:1.1.1
+//time:2017/1/19 10:08 ver:3.6.1
diff --git a/frameworks/WASdkIntf.framework/Headers/WASocialProxy.h b/frameworks/WASdkIntf.framework/Headers/WASocialProxy.h
index 961b56c..d29cb89 100644
--- a/frameworks/WASdkIntf.framework/Headers/WASocialProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WASocialProxy.h
@@ -172,9 +172,8 @@
/*!
@abstract 打开group
@param platform 平台
- @param groupUri
+ @param groupUri 组Uri
@param extInfo 扩展信息
- @param block 回调
*/
+(void)openGroupPageWithPlatform:(NSString *const)platform groupUri:(NSString *const)groupUri extInfo:(NSString*)extInfo;
@@ -220,7 +219,7 @@
@param requestType 请求类型
@param title 标题
@param message 信息
- @param objectId
+ @param objectId 对象id
@param receiptIds 接受者id
@param delegate 委托
*/
@@ -230,7 +229,7 @@
@abstract 下面的三个方法是关于奖励机制的,邀请奖励,自定义奖励事件
@discussion 此方法用来提交Facebook邀请信息
@param platform 平台
- @param result 这是发完邀请请求成功在WAGameRequestDialogDelegate的方法:[- (void)gameRequestDialog:(WAGameRequestDialog *)gameRequestDialog platform:(NSString *const)platform didCompleteWithResults:(NSDictionary *)results]的results
+ @param results 这是发完邀请请求成功在WAGameRequestDialogDelegate的方法:[- (void)gameRequestDialog:(WAGameRequestDialog *)gameRequestDialog platform:(NSString *const)platform didCompleteWithResults:(NSDictionary *)results]的results
@param handler 回调block 当code为200时成功
*/
+(void)createInviteInfoWithPlatform:(NSString *const)platform results:(NSDictionary*)results handler:(void (^)(NSUInteger code,NSString* msg, NSError* error)) handler;
diff --git a/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h b/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
index d4772e1..2498043 100644
--- a/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
@@ -61,7 +61,6 @@
extern NSString *const WAEventPayment;
extern NSString *const WAEventInitiatedPurchase;
extern NSString *const WAEventPurchase;
-extern NSString *const WAEventHeartBeat;
extern NSString *const WAEventLevelAchieved;
extern NSString *const WAEventAddToCart;
extern NSString *const WAEventAddToWishlist;
@@ -110,7 +109,7 @@
extern NSString *const WAEventParameterNameStartTime;
extern NSString *const WAEventParameterNameNowTime;
-
+extern NSString *const WAEventParameterNameSessionType;
extern NSString *const WAEventParameterNameTransactionId;
extern NSString *const WAEventParameterNamePaymentType;
extern NSString *const WAEventParameterNameCurrencyAmount;
diff --git a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
index cb86ff3..b8822bc 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
@@ -21,7 +21,7 @@
@required
/*!
@abstract 登录成功
- @param results 登录结果
+ @param result 登录结果
*/
-(void)loginDidCompleteWithResults:(WALoginResult*)result;
/*!
@@ -164,15 +164,13 @@
/*!
@discussion 切换账号接口
@param platform 切换平台
- @param error 错误
- @param result 登录结果
+ @param completeBlock 回调结果：包括error(错误)和result(登录结果)
*/
+(void)switchAccountWithPlatform:(NSString *const)platform completeBlock:(void(^)(NSError* error,WALoginResult* result))completeBlock;
/*!
@discussion 创建账号接口
- @param error 错误
- @param result 创建结果
+ @param completeBlock 回调结果：包括error(错误)和result(创建结果)
*/
+(void)createNewAccountWithCompleteBlock:(void(^)(NSError* error,WALoginResult* result))completeBlock;
@@ -211,9 +209,19 @@
+ (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions;
/*!
- @discussion 处理UIApplicationDelegate的方法[+ (void)applicationDidBecomeActive:(UIApplication *)application]传递过来的参数。
+ @discussion 处理UIApplicationDelegate的方法[- (void)applicationDidBecomeActive:(UIApplication *)application]传递过来的参数。
*/
-+ (void)applicationDidBecomeActive:(UIApplication *)application;
++(void)applicationDidBecomeActive:(UIApplication *)application;
+
+/*!
+ @discussion 处理UIApplicationDelegate的方法[- (void)applicationWillEnterForeground:(UIApplication *)application]传递过来的参数。
+ */
++(void)applicationWillEnterForeground:(UIApplication *)application;
+
+/*!
+ @discussion 处理UIApplicationDelegate的方法[- (void)applicationDidEnterBackground:(UIApplication *)application]传递过来的参数。
+ */
++(void)applicationDidEnterBackground:(UIApplication *)application;
/*!
@discussion 处理UIApplicationDelegate的方法[-(BOOL)application:(UIApplication *)application
diff --git a/frameworks/WASdkIntf.framework/Info.plist b/frameworks/WASdkIntf.framework/Info.plist
index cf0d591..9aa1b8f 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 846e464..d0901dc 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 45b08cf..0c82c14 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 9350a85..8433a30 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 f0c5c1b..715753a 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
@@ -50,7 +50,7 @@
</data>
<key>Headers/WACoreProxy.h</key>
<data>
- px794bHQqEJJMY6PXNxOxTCPW5w=
+ Kl5Pr28Td7eTaWXs3E18Z0Tyvp8=
</data>
<key>Headers/WAError.h</key>
<data>
@@ -110,11 +110,11 @@
</data>
<key>Headers/WAITrack.h</key>
<data>
- 8X+ypjtELiRZcowbwt7V8ME1wxc=
+ 1s0nE8LmO9AojoyJDzQtAGbcuwo=
</data>
<key>Headers/WAIUser.h</key>
<data>
- F0snTUA6UbV37Tj4FMgW4Unv/Ok=
+ OUlUcqnbqbcoIP+9iSJP5n8tMkk=
</data>
<key>Headers/WAIapProduct.h</key>
<data>
@@ -134,11 +134,11 @@
</data>
<key>Headers/WAPayProxy.h</key>
<data>
- JemYp6qebO6rgl/7hRXY19VoMOA=
+ KynhztMZcNR/wi2nS7+PFa8UlqI=
</data>
<key>Headers/WASdkIntf.h</key>
<data>
- cruS+4Mmr445RNf0mW43Jv7qDWw=
+ 5ZOk94SO/DGzTqN/9s50j8EBBoI=
</data>
<key>Headers/WAShareLinkContent.h</key>
<data>
@@ -166,11 +166,11 @@
</data>
<key>Headers/WASocialProxy.h</key>
<data>
- QWW2cXdMoIDLsRiLlFQta9xt5ao=
+ KSYZvOEQMkNWKaiBe9OzhyhAVZY=
</data>
<key>Headers/WATrackProxy.h</key>
<data>
- xtjyoWtQW0y21/d21yvbK/bk9Fg=
+ VwTR7n9vq1CB6kX+/Qa4EM0NBtU=
</data>
<key>Headers/WAUpdateInfo.h</key>
<data>
@@ -178,11 +178,11 @@
</data>
<key>Headers/WAUserProxy.h</key>
<data>
- J5Rjvsvb4FPqX3yd2ATbxNy6axo=
+ XY1KtjYDwtvlliHDGMTAkk1aES0=
</data>
<key>Info.plist</key>
<data>
- qtdbkV82k1FPV6ei3f06E2kqnl8=
+ sPNtQ3aaNjgoF9DoNlHk95OSY+4=
</data>
<key>Modules/module.modulemap</key>
<data>
@@ -316,11 +316,11 @@
<dict>
<key>hash</key>
<data>
- px794bHQqEJJMY6PXNxOxTCPW5w=
+ Kl5Pr28Td7eTaWXs3E18Z0Tyvp8=
</data>
<key>hash2</key>
<data>
- Y5nl8ohpCu0/tiGVW8e4Ncnjo7frNAn1tV5usZzcQYQ=
+ HSoKcNSMJsT+QHvSq2opjomT3nBBhHqYI9URhTwtS9A=
</data>
</dict>
<key>Headers/WAError.h</key>
@@ -481,22 +481,22 @@
<dict>
<key>hash</key>
<data>
- 8X+ypjtELiRZcowbwt7V8ME1wxc=
+ 1s0nE8LmO9AojoyJDzQtAGbcuwo=
</data>
<key>hash2</key>
<data>
- dXLbeR2oJJ46RTiLpDbDUE4Y1FWZfuUcUhcP42jiNK0=
+ AZCuH/oIx99b9hdg+RmaSlFM7uOW7e+gYIpdPsgbJ8U=
</data>
</dict>
<key>Headers/WAIUser.h</key>
<dict>
<key>hash</key>
<data>
- F0snTUA6UbV37Tj4FMgW4Unv/Ok=
+ OUlUcqnbqbcoIP+9iSJP5n8tMkk=
</data>
<key>hash2</key>
<data>
- bSVYhMra7CjmC6bJbvM6Cc6yc6IpWkgQstRFKjCkCyo=
+ qHAmk43lE/PLy6gZrQ2K/bKsmNpCGAYc9ax969K8mwQ=
</data>
</dict>
<key>Headers/WAIapProduct.h</key>
@@ -547,22 +547,22 @@
<dict>
<key>hash</key>
<data>
- JemYp6qebO6rgl/7hRXY19VoMOA=
+ KynhztMZcNR/wi2nS7+PFa8UlqI=
</data>
<key>hash2</key>
<data>
- 6b7E0sJId4dmuTbc2aEct0tb4Mt78hHv2DuK7EhBd6s=
+ vph3lJumAH9HYbIhzXK4qcoVtLfRh/yQ7LZWRasJRw0=
</data>
</dict>
<key>Headers/WASdkIntf.h</key>
<dict>
<key>hash</key>
<data>
- cruS+4Mmr445RNf0mW43Jv7qDWw=
+ 5ZOk94SO/DGzTqN/9s50j8EBBoI=
</data>
<key>hash2</key>
<data>
- ll4SXYdPG5Gro5uKX3qxUiGzIbXpAmT5ZJMdqiFp2iE=
+ q7Djk8tyXpViqDv5XBTnltf9+rlDjRyiCQbBiIclydI=
</data>
</dict>
<key>Headers/WAShareLinkContent.h</key>
@@ -635,22 +635,22 @@
<dict>
<key>hash</key>
<data>
- QWW2cXdMoIDLsRiLlFQta9xt5ao=
+ KSYZvOEQMkNWKaiBe9OzhyhAVZY=
</data>
<key>hash2</key>
<data>
- Rlpep3GI+tj8wBGgp8182uKYfabpLwEgKwjA2nQE2cQ=
+ /VH6sPSL41dkqVNr2yD14MUUId+KvxM17D4qTOgqveE=
</data>
</dict>
<key>Headers/WATrackProxy.h</key>
<dict>
<key>hash</key>
<data>
- xtjyoWtQW0y21/d21yvbK/bk9Fg=
+ VwTR7n9vq1CB6kX+/Qa4EM0NBtU=
</data>
<key>hash2</key>
<data>
- ieI28t2YNBFFVR6r5lXtW1hHzgci3AKscgTMhX67INQ=
+ 2dp/PLtLb5T43QQtOHhR/3CsAOU6dfucHCgca5dZVdU=
</data>
</dict>
<key>Headers/WAUpdateInfo.h</key>
@@ -668,11 +668,11 @@
<dict>
<key>hash</key>
<data>
- J5Rjvsvb4FPqX3yd2ATbxNy6axo=
+ XY1KtjYDwtvlliHDGMTAkk1aES0=
</data>
<key>hash2</key>
<data>
- 2Se046PBW6J0iCeis6ND8U31y0Islh5l3PW7RnCTTG0=
+ 23TPuK970hTzp4x25x1T7WGVhB23tZK9Ilmo9230rV8=
</data>
</dict>
<key>Modules/module.modulemap</key>
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
index e16ac2d..e5f7e76 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
Binary files differ
--
Gitblit v1.8.0