From 1417b84e95fb533d5b7677ebb7a5fa34c2013084 Mon Sep 17 00:00:00 2001 From: hank <hank.zhang@proficientcity.com> Date: Wed, 14 Jun 2017 14:33:02 +0800 Subject: [PATCH] 添加V3.6.4 --- frameworks/WASdkIntf.framework/Headers/WAIapProduct.h | 8 ++-- frameworks/WASdkIntf.framework/Headers/WAIUser.h | 2 + frameworks/WASdkIntf.framework/WASdkIntf | 0 frameworks/WASdkIntf.framework/Headers/WAPayProxy.h | 2 + frameworks/WASdkIntf.framework/_CodeSignature/CodeResources | 56 ++++++++++++++-------------- frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory | 0 WASdkIntf.podspec | 2 frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 2 frameworks/WASdkIntf.framework/Info.plist | 0 frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature | 0 frameworks/WASdkIntf.framework/Headers/WALoginResult.h | 22 +++++++++++ frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h | 2 + frameworks/WASdkIntf.framework/Headers/WAIPay.h | 1 frameworks/WASdkIntf.framework/Headers/WAConstants.h | 2 + frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 | 0 frameworks/WASdkIntf.framework/Headers/WACoreProxy.h | 1 16 files changed, 66 insertions(+), 34 deletions(-) diff --git a/WASdkIntf.podspec b/WASdkIntf.podspec index e7cd3b8..48051fd 100644 --- a/WASdkIntf.podspec +++ b/WASdkIntf.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.name = 'WASdkIntf' -s.version = '3.6.3' +s.version = '3.6.4' s.summary = 'WASdkIntf framework in production environment.' s.license = 'MIT' s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" } diff --git a/frameworks/WASdkIntf.framework/Headers/WAConstants.h b/frameworks/WASdkIntf.framework/Headers/WAConstants.h index da0d2c4..cadf0e3 100644 --- a/frameworks/WASdkIntf.framework/Headers/WAConstants.h +++ b/frameworks/WASdkIntf.framework/Headers/WAConstants.h @@ -33,6 +33,8 @@ extern NSString *const WA_PLATFORM_HUP; extern NSString *const WA_PLATFORM_APW; extern NSString *const WA_PLATFORM_PUSH; +extern NSString *const WA_PLATFORM_TWITTER; +extern NSString *const WA_PLATFORM_INSTAGRAM; extern NSString *const WA_CONSTANT_GUEST; diff --git a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h index 3172994..38f0fc5 100644 --- a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h +++ b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h @@ -230,4 +230,5 @@ */ + (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/WAIPay.h b/frameworks/WASdkIntf.framework/Headers/WAIPay.h index 424d63d..f5af691 100644 --- a/frameworks/WASdkIntf.framework/Headers/WAIPay.h +++ b/frameworks/WASdkIntf.framework/Headers/WAIPay.h @@ -19,4 +19,5 @@ -(SKProduct*)getCurrentProduct; -(NSData*)getCurrentReceipt; -(float)getReorderLimitTime; +-(void)payLog:(NSString *)logInfo; @end diff --git a/frameworks/WASdkIntf.framework/Headers/WAIUser.h b/frameworks/WASdkIntf.framework/Headers/WAIUser.h index 5854d76..8251fd5 100644 --- a/frameworks/WASdkIntf.framework/Headers/WAIUser.h +++ b/frameworks/WASdkIntf.framework/Headers/WAIUser.h @@ -39,6 +39,8 @@ sourceApplication:(NSString *)sourceApplication annotation:(id)annotation; +- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options; + -(void)loginWithResult:(WALoginResult*)result delegate:(id<WALoginDelegate>)delegate; -(void)loginWithResult:(WALoginResult*)result extInfo:(NSString*)extInfo delegate:(id<WALoginDelegate>)delegate; diff --git a/frameworks/WASdkIntf.framework/Headers/WAIapProduct.h b/frameworks/WASdkIntf.framework/Headers/WAIapProduct.h index 86c6498..1ba1839 100644 --- a/frameworks/WASdkIntf.framework/Headers/WAIapProduct.h +++ b/frameworks/WASdkIntf.framework/Headers/WAIapProduct.h @@ -19,18 +19,18 @@ @property(nonatomic, strong) NSDecimalNumber *price NS_AVAILABLE_IOS(3_0); -@property(nonatomic, strong) NSLocale *priceLocale NS_AVAILABLE_IOS(3_0); +//@property(nonatomic, strong) NSLocale *priceLocale NS_AVAILABLE_IOS(3_0); @property(nonatomic, strong) NSString *productIdentifier NS_AVAILABLE_IOS(3_0); // YES if this product has content downloadable using SKDownload -@property(nonatomic) BOOL downloadable NS_AVAILABLE_IOS(6_0); +//@property(nonatomic) BOOL downloadable NS_AVAILABLE_IOS(6_0); // Sizes in bytes (NSNumber [long long]) of the downloads available for this product -@property(nonatomic, strong) NSArray<NSNumber *> *downloadContentLengths NS_AVAILABLE_IOS(6_0); +//@property(nonatomic, strong) NSArray<NSNumber *> *downloadContentLengths NS_AVAILABLE_IOS(6_0); // Version of the downloadable content -@property(nonatomic, strong) NSString *downloadContentVersion NS_AVAILABLE_IOS(6_0); +//@property(nonatomic, strong) NSString *downloadContentVersion NS_AVAILABLE_IOS(6_0); // payment method @property(nonatomic, strong) NSArray<WAPayChannel *> *payChannels NS_AVAILABLE_IOS(6_0); diff --git a/frameworks/WASdkIntf.framework/Headers/WALoginResult.h b/frameworks/WASdkIntf.framework/Headers/WALoginResult.h index 0127da8..82cdff2 100644 --- a/frameworks/WASdkIntf.framework/Headers/WALoginResult.h +++ b/frameworks/WASdkIntf.framework/Headers/WALoginResult.h @@ -48,6 +48,28 @@ @abstract 是否绑定手机号 */ @property BOOL isBindMobile; +/**! + @abstract 是否绑定手机号 用户状态(有效用户返回): + * 0:已实名 + * 1:未实名 + */ +@property NSInteger userStatus; +/**! + @abstract 登录实名验证: + * 0:不需要实名验证 + * 1:提示用户实名验证,这里返回的token可作为登录及用户实名验证使用 + * 2:强制用户实名验证,此时返回的仅是token是实名验证token + */ +@property NSInteger loginRna; +/**! + @abstract 支付实名验证: + * 0:不需要实名验证 + * 1:提示用户实名验证 + * 2:强制用户实名验证 + * 注:当有该字段返回时,token可作为登录及用户实名验证使用 + */ +@property NSInteger paymentRna; + -(id)initWithPUserId:(NSString*)userId pToken:(NSString*)token platform:(NSString*)platform; +(id)loginResultWithPUserId:(NSString*)userId pToken:(NSString*)token platform:(NSString*)platform; @end diff --git a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h index 4fdecf8..f51985e 100644 --- a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h +++ b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h @@ -23,4 +23,6 @@ @property(nonatomic,strong)NSNumber* enableNewAccount; @property(nonatomic,strong)NSNumber* enableChangeAccount; @property(nonatomic,strong)NSNumber* isTestDevice; +@property(nonatomic,copy)NSString* userAgreementUrl; +@property(nonatomic,strong)NSNumber* uploadPurchaseLog; @end diff --git a/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h b/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h index 30aac33..c7a23bc 100644 --- a/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h +++ b/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h @@ -73,4 +73,6 @@ */ +(BOOL)isPayServiceAvailable; ++(void)payLog:(NSString *)logInfo; + @end diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h index 1e81c8e..e4147b1 100644 --- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h +++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h @@ -61,4 +61,4 @@ // In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h> -//time:2017/4/25 14:31 ver:3.6.3 +//time:2017/6/12 14:21 ver:3.6.4 diff --git a/frameworks/WASdkIntf.framework/Info.plist b/frameworks/WASdkIntf.framework/Info.plist index 9aa1b8f..55a0e20 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 6224daf..7410ffe 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 c741c3b..beffd11 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 f06ba5e..7e7f5bf 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 bb513f5..e9fb681 100644 --- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources +++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources @@ -42,7 +42,7 @@ </data> <key>Headers/WAConstants.h</key> <data> - mhHJUprsK/rHcMGxd1x/Re7hmSU= + sk2EsQY4gsFB4ZldeI8jDgcp6Fw= </data> <key>Headers/WACore.h</key> <data> @@ -50,7 +50,7 @@ </data> <key>Headers/WACoreProxy.h</key> <data> - V3URXD0gqC0xRmDiDoQbYC+kvpE= + aFM10FeidrinjW2udJD40FV2GIc= </data> <key>Headers/WAError.h</key> <data> @@ -102,7 +102,7 @@ </data> <key>Headers/WAIPay.h</key> <data> - hoReRwkwXoZRAl6H4ah1cI6V7hM= + 4RalHdgApMZTYI7rH6R3i35U9bc= </data> <key>Headers/WAIPush.h</key> <data> @@ -118,11 +118,11 @@ </data> <key>Headers/WAIUser.h</key> <data> - OUlUcqnbqbcoIP+9iSJP5n8tMkk= + veKzF9PLCFhljDGUg5JtHku5bhA= </data> <key>Headers/WAIapProduct.h</key> <data> - 2Jnwjw1wlNRqsF6EQfd0YXO3gpE= + ygerQzkBYhZzbRsQaI3V4LdXAno= </data> <key>Headers/WAIapResult.h</key> <data> @@ -130,11 +130,11 @@ </data> <key>Headers/WALoginResult.h</key> <data> - wV3Olv9z3tBJntMHqGU3PMljKDI= + FIWcjNfSDvMM9LEU0emfl1cqZIc= </data> <key>Headers/WAParamConfigObj.h</key> <data> - rYcGmIpoDQUA0hXomPYM/eOBKSg= + /qVewcf8qcCbDw2EC7cKUTMxyhc= </data> <key>Headers/WAPayChannel.h</key> <data> @@ -142,7 +142,7 @@ </data> <key>Headers/WAPayProxy.h</key> <data> - T7rdAiOZPcaMdHgUyawbStFC4CI= + MEdlM3dP318nBNlV7SYfFK9GR08= </data> <key>Headers/WAPushProxy.h</key> <data> @@ -150,7 +150,7 @@ </data> <key>Headers/WASdkIntf.h</key> <data> - PgmrgqGLR8vkIY6XqPZEG0n7FBM= + 5eJBJmLCfONnuJGDl78DIkb9qac= </data> <key>Headers/WAShareLinkContent.h</key> <data> @@ -194,7 +194,7 @@ </data> <key>Info.plist</key> <data> - sPNtQ3aaNjgoF9DoNlHk95OSY+4= + y1/RvXTGWnZAgUZ9fx4vfeD3L3Q= </data> <key>Modules/module.modulemap</key> <data> @@ -306,11 +306,11 @@ <dict> <key>hash</key> <data> - mhHJUprsK/rHcMGxd1x/Re7hmSU= + sk2EsQY4gsFB4ZldeI8jDgcp6Fw= </data> <key>hash2</key> <data> - LzD4s8pUm+0pjpu71tiKu06kHKNO/jAqdWd4fiS82is= + zEdBGd94gHbnnqFgGCx3N4wHH3RmWuYr0hPPTTUkq34= </data> </dict> <key>Headers/WACore.h</key> @@ -328,11 +328,11 @@ <dict> <key>hash</key> <data> - V3URXD0gqC0xRmDiDoQbYC+kvpE= + aFM10FeidrinjW2udJD40FV2GIc= </data> <key>hash2</key> <data> - 1bNSTNX68Eg8JUr4OhjWuHtMymOh0St2iCLh4cvCQss= + 14xamuKKR0hfE4TTPc/toEL22ul8koAy+dxs6IeZHwI= </data> </dict> <key>Headers/WAError.h</key> @@ -471,11 +471,11 @@ <dict> <key>hash</key> <data> - hoReRwkwXoZRAl6H4ah1cI6V7hM= + 4RalHdgApMZTYI7rH6R3i35U9bc= </data> <key>hash2</key> <data> - g7YbYwvrMk+pKj1SjalZtVPdGBdPoxuZp3Zy5HVtEaw= + +Lhrf9VSquHfW71nXq85xl7tQTo8qm3ga6aRRtcyCbk= </data> </dict> <key>Headers/WAIPush.h</key> @@ -515,22 +515,22 @@ <dict> <key>hash</key> <data> - OUlUcqnbqbcoIP+9iSJP5n8tMkk= + veKzF9PLCFhljDGUg5JtHku5bhA= </data> <key>hash2</key> <data> - qHAmk43lE/PLy6gZrQ2K/bKsmNpCGAYc9ax969K8mwQ= + HqECDHIf/GE31E9dO5smU2pk7/++hztVj3a3+M/HaMw= </data> </dict> <key>Headers/WAIapProduct.h</key> <dict> <key>hash</key> <data> - 2Jnwjw1wlNRqsF6EQfd0YXO3gpE= + ygerQzkBYhZzbRsQaI3V4LdXAno= </data> <key>hash2</key> <data> - ccOwnvFHOQuB6DuIIFjj/Hc1OdNrHbTcGauNFeDUf8U= + lemKsi+crs1aM97wLqWlbPFjwaGIebKdQaJ4fgtrr/c= </data> </dict> <key>Headers/WAIapResult.h</key> @@ -548,22 +548,22 @@ <dict> <key>hash</key> <data> - wV3Olv9z3tBJntMHqGU3PMljKDI= + FIWcjNfSDvMM9LEU0emfl1cqZIc= </data> <key>hash2</key> <data> - 1VeGc3rkkOsF2jAWKZ7nOzpIynq1HkW22gGl1TE/m8M= + 0ujzIlFpCins4hTEjjjYv2yDex4zKh9AG5P84pnppzk= </data> </dict> <key>Headers/WAParamConfigObj.h</key> <dict> <key>hash</key> <data> - rYcGmIpoDQUA0hXomPYM/eOBKSg= + /qVewcf8qcCbDw2EC7cKUTMxyhc= </data> <key>hash2</key> <data> - MNjAgDnMiYTn3/mt4hSlaXJHeqVHBGNT2/Q7GB5T+BY= + DEZdgaPqi6/AD4By4kZVWsgcQgSK/dLOBQP0EVlBZXM= </data> </dict> <key>Headers/WAPayChannel.h</key> @@ -581,11 +581,11 @@ <dict> <key>hash</key> <data> - T7rdAiOZPcaMdHgUyawbStFC4CI= + MEdlM3dP318nBNlV7SYfFK9GR08= </data> <key>hash2</key> <data> - M1dzR4tA7YN9hAx9zszdnsTolW27PIJegxK35wlevBA= + oikPer4Mr2EThj2ly+x+zIsS26CJhamP0Xg8hNaxavo= </data> </dict> <key>Headers/WAPushProxy.h</key> @@ -603,11 +603,11 @@ <dict> <key>hash</key> <data> - PgmrgqGLR8vkIY6XqPZEG0n7FBM= + 5eJBJmLCfONnuJGDl78DIkb9qac= </data> <key>hash2</key> <data> - QcOsKh9gcU4lwKgcqQSQAKqQlzjCqJj1kV1qrKO5ofk= + aAwyOpmrSIltHsN6oHMGl4LWNI5+LDrMrqSifFN0b5c= </data> </dict> <key>Headers/WAShareLinkContent.h</key> diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature index c231692..0587514 100644 --- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature +++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature Binary files differ -- Gitblit v1.8.0