From e395b54eb89ecf58dc5adaf9acd363696a1b2f83 Mon Sep 17 00:00:00 2001 From: hank <hank.zhang@proficientcity.com> Date: Tue, 06 Jun 2017 14:38:09 +0800 Subject: [PATCH] 添加1.1.4 --- WASdkImpl_CN.podspec | 4 localizable/en.plist | 6 + frameworks/WACommon.framework/Headers/WACommConstants.h | 19 ++++ frameworks/WACommon.framework/_CodeSignature/CodeSignature | 0 localizable/ru.plist | 6 + frameworks/WACommon.framework/Headers/WAHelper.h | 1 frameworks/WASdkImpl.framework/WASdkImpl | 0 frameworks/WASdkImpl.framework/Headers/WASdkSandboxHelper.h | 1 config/wa_sdk_impl_config_winga.xml | 2 frameworks/WACommon.framework/WACommon | 0 localizable/base.plist | 6 + frameworks/WASdkImpl.framework/Headers/WASdkImpl.h | 2 frameworks/WASdkImpl.framework/Info.plist | 0 frameworks/WACommon.framework/Headers/WAReachability.h | 102 +++++++++++++++++++++++++ frameworks/WACommon.framework/_CodeSignature/CodeRequirements-1 | 0 frameworks/WASdkImpl.framework/Headers/WASdkAccountSwitchUI.h | 2 frameworks/WACommon.framework/Info.plist | 0 frameworks/WACommon.framework/_CodeSignature/CodeDirectory | 0 frameworks/WACommon.framework/_CodeSignature/CodeResources | 35 ++++++-- localizable/pt-BR.plist | 6 + frameworks/WASdkImpl.framework/Headers/WASdkLoginHandler.h | 2 frameworks/WACommon.framework/Headers/WACommon.h | 5 localizable/zh-Hans.plist | 6 + 23 files changed, 187 insertions(+), 18 deletions(-) diff --git a/WASdkImpl_CN.podspec b/WASdkImpl_CN.podspec index 9dac1d8..c33a973 100644 --- a/WASdkImpl_CN.podspec +++ b/WASdkImpl_CN.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.name = 'WASdkImpl_CN' -s.version = '1.1.3' +s.version = '1.1.4' s.summary = 'WASdkImpl_CN framework in testing environment.' s.license = 'MIT' s.author = { "Hank" => "hank.zhang@gamehollywood.com" } @@ -21,6 +21,6 @@ s.resources = ['config/*.xml','bundle/WASDK-Resource.bundle','localizable/*.plist'] s.libraries = 'sqlite3','z' s.requires_arc = true -s.dependency 'WASdkIntf_CN', '~> 1.1.3' # +s.dependency 'WASdkIntf_CN', '~> 1.1.4' # end \ No newline at end of file diff --git a/config/wa_sdk_impl_config_winga.xml b/config/wa_sdk_impl_config_winga.xml index bd8944b..b2b026b 100644 --- a/config/wa_sdk_impl_config_winga.xml +++ b/config/wa_sdk_impl_config_winga.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <config> - <version val="WA1.1.3"/> + <version val="WA1.1.4"/> <comps> <!-- 用户模块 --> <comp module="USR" plaf="WINGA" mandatory="YES" value="WASdkUser" desc="WINGA用户账户"/> diff --git a/frameworks/WACommon.framework/Headers/WACommConstants.h b/frameworks/WACommon.framework/Headers/WACommConstants.h index a0e1252..5e7fe8d 100644 --- a/frameworks/WACommon.framework/Headers/WACommConstants.h +++ b/frameworks/WACommon.framework/Headers/WACommConstants.h @@ -73,6 +73,7 @@ extern NSString *const WASDK_PARAM_KEY_ORDER_AMOUNT_MICROS; extern NSString *const WASDK_PARAM_KEY_PRODUCT_ID; extern NSString *const WASDK_PARAM_KEY_PRODUCT_NAME; +extern NSString *const WASDK_PARAM_KEY_PRODUCT_DESC; extern NSString *const WASDK_PARAM_KEY_IAP_URL_PRO_LIST; extern NSString *const WASDK_PARAM_KEY_IAP_URL_CREATE_ORDER; extern NSString *const WASDK_PARAM_KEY_IAP_URL_NOTIFY_SERVER; @@ -80,6 +81,9 @@ extern NSString *const WASDK_PARAM_KEY_QUERY_TYPE; extern NSString *const WASDK_PARAM_KEY_IS_REPORTDATA; + +extern NSString *const WASDK_PARAM_KEY_REAL_NAME; +extern NSString *const WASDK_PARAM_KEY_ID_CARD; extern NSString *const WASDK_PARAM_KEY_PRODUCT_LIST; extern NSString *const WASDK_PARAM_KEY_GAME_CURRENCY_AMOUNT; @@ -145,6 +149,9 @@ extern NSString *const WASDK_ACOUNT_BINDING_PREUSERID; extern NSString *const WASDK_ACOUNT_BINDING_PREPLATFORM; +// 消息推送 +extern NSString *const WASDK_ACCESS_TOKEN; +extern NSString *const WASDK_MSG_ID; extern NSString *const WASDK_IAP_URL_PROLIST; extern NSString *const WASDK_IAP_URL_NOTIFY_SERVER; @@ -209,6 +216,18 @@ extern NSString *const WASDK_LOGIN_URL_BIND_MOBILE; // 免密码登录接口 extern NSString *const WASDK_LOGIN_URL_FAST_LOGIN; +// 使用TOKEN实名验证 +extern NSString *const WASDK_REAL_NAME_AUTHENTICATION; + +// 消息推送 +// 更新第三方消息服务的accessToken +extern NSString *const WASDK_LOGIN_URL_MESSAGE_REFRESH_TOKEN; +// 客户端拉取消息 +extern NSString *const WASDK_LOGIN_URL_MESSAGE_CLIENT_PULL; +// 消息推送回执 +extern NSString *const WASDK_LOGIN_URL_MESSAGE_SEND_RECEIPT; +// 消息打开确认 +extern NSString *const WASDK_LOGIN_URL_MESSAGE_OPEN_MESSAGE_CONFIRM; extern NSString *const WASDK_FB_INVITE_FROM_USERID; extern NSString *const WASDK_FB_INVITE_TO_USERID; diff --git a/frameworks/WACommon.framework/Headers/WACommon.h b/frameworks/WACommon.framework/Headers/WACommon.h index a26844e..e5bdfd3 100644 --- a/frameworks/WACommon.framework/Headers/WACommon.h +++ b/frameworks/WACommon.framework/Headers/WACommon.h @@ -21,8 +21,9 @@ #import <WACommon/LocalizedStringUtil.h> #import <WACommon/WASandboxHelper.h> #import <WACommon/WADownloadHandler.h> -#import <WACommon/WACommon.h> +//#import <WACommon/WACommon.h> #import <WACommon/WADevice.h> +#import <WACommon/WAReachability.h> -//time:2017/3/25 11:31 +//time:2017/6/5 10:40 diff --git a/frameworks/WACommon.framework/Headers/WAHelper.h b/frameworks/WACommon.framework/Headers/WAHelper.h index 66fc094..11288d6 100644 --- a/frameworks/WACommon.framework/Headers/WAHelper.h +++ b/frameworks/WACommon.framework/Headers/WAHelper.h @@ -41,6 +41,7 @@ +(NSString*)getIDFV; +(NSString*)getIDFA; +(NSString*)getSimulateIDFA; ++(NSArray*)getSimulateIDFAParams; +(NSString*)getPreferredLanguage; /** * 获取本地时间 diff --git a/frameworks/WACommon.framework/Headers/WAReachability.h b/frameworks/WACommon.framework/Headers/WAReachability.h new file mode 100755 index 0000000..46bbd99 --- /dev/null +++ b/frameworks/WACommon.framework/Headers/WAReachability.h @@ -0,0 +1,102 @@ +/* + Copyright (c) 2011, Tony Million. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + */ + +#import <Foundation/Foundation.h> +#import <SystemConfiguration/SystemConfiguration.h> + +//! Project version number for MacOSReachability. +FOUNDATION_EXPORT double ReachabilityVersionNumber; + +//! Project version string for MacOSReachability. +FOUNDATION_EXPORT const unsigned char ReachabilityVersionString[]; + +/** + * Create NS_ENUM macro if it does not exist on the targeted version of iOS or OS X. + * + * @see http://nshipster.com/ns_enum-ns_options/ + **/ +#ifndef NS_ENUM +#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type +#endif + +extern NSString *const WAReachabilityChangedNotification; + +typedef NS_ENUM(NSInteger, WANetworkStatus) { + // Apple NetworkStatus Compatible Names. + WANotReachable = 0, + WAReachableViaWiFi = 2, + WAReachableViaWWAN = 1 +}; + +@class WAReachability; + +typedef void (^WANetworkReachable)(WAReachability * reachability); +typedef void (^WANetworkUnreachable)(WAReachability * reachability); +typedef void (^WANetworkReachability)(WAReachability * reachability, SCNetworkConnectionFlags flags); + + +@interface WAReachability : NSObject + +@property (nonatomic, copy) WANetworkReachable reachableBlock; +@property (nonatomic, copy) WANetworkUnreachable unreachableBlock; +@property (nonatomic, copy) WANetworkReachability reachabilityBlock; + +@property (nonatomic, assign) BOOL reachableOnWWAN; + + ++(instancetype)reachabilityWithHostname:(NSString*)hostname; +// This is identical to the function above, but is here to maintain +//compatibility with Apples original code. (see .m) ++(instancetype)reachabilityWithHostName:(NSString*)hostname; ++(instancetype)reachabilityForInternetConnection; ++(instancetype)reachabilityWithAddress:(void *)hostAddress; ++(instancetype)reachabilityForLocalWiFi; + +-(instancetype)initWithReachabilityRef:(SCNetworkReachabilityRef)ref; + +-(BOOL)startNotifier; +-(void)stopNotifier; + +-(BOOL)isReachable; +-(BOOL)isReachableViaWWAN; +-(BOOL)isReachableViaWiFi; + +// WWAN may be available, but not active until a connection has been established. +// WiFi may require a connection for VPN on Demand. +-(BOOL)isConnectionRequired; // Identical DDG variant. +-(BOOL)connectionRequired; // Apple's routine. +// Dynamic, on demand connection? +-(BOOL)isConnectionOnDemand; +// Is user intervention required? +-(BOOL)isInterventionRequired; + +-(WANetworkStatus)currentReachabilityStatus; +-(SCNetworkReachabilityFlags)reachabilityFlags; +-(NSString*)currentReachabilityString; +-(NSString*)currentReachabilityFlags; + +@end diff --git a/frameworks/WACommon.framework/Info.plist b/frameworks/WACommon.framework/Info.plist index 49ee6ed..b5def2a 100644 --- a/frameworks/WACommon.framework/Info.plist +++ b/frameworks/WACommon.framework/Info.plist Binary files differ diff --git a/frameworks/WACommon.framework/WACommon b/frameworks/WACommon.framework/WACommon index 12ed0ec..ac083d9 100644 --- a/frameworks/WACommon.framework/WACommon +++ b/frameworks/WACommon.framework/WACommon Binary files differ diff --git a/frameworks/WACommon.framework/_CodeSignature/CodeDirectory b/frameworks/WACommon.framework/_CodeSignature/CodeDirectory index 95f4d53..0746c3a 100644 --- a/frameworks/WACommon.framework/_CodeSignature/CodeDirectory +++ b/frameworks/WACommon.framework/_CodeSignature/CodeDirectory Binary files differ diff --git a/frameworks/WACommon.framework/_CodeSignature/CodeRequirements-1 b/frameworks/WACommon.framework/_CodeSignature/CodeRequirements-1 index daaf14f..a96e698 100644 --- a/frameworks/WACommon.framework/_CodeSignature/CodeRequirements-1 +++ b/frameworks/WACommon.framework/_CodeSignature/CodeRequirements-1 Binary files differ diff --git a/frameworks/WACommon.framework/_CodeSignature/CodeResources b/frameworks/WACommon.framework/_CodeSignature/CodeResources index 3d992d2..9f02a9d 100644 --- a/frameworks/WACommon.framework/_CodeSignature/CodeResources +++ b/frameworks/WACommon.framework/_CodeSignature/CodeResources @@ -10,11 +10,11 @@ </data> <key>Headers/WACommConstants.h</key> <data> - 1RxyFfmLNpqNC0fEcQ6KTu2gfXI= + a0Q5FEUzp4ZHUbbpGF08d8fXdo8= </data> <key>Headers/WACommon.h</key> <data> - Uy/d7yilraJrEUyrJmAco7duhPc= + pP3NqUxwJzOT+KUoV+xIjjIaSho= </data> <key>Headers/WADevice.h</key> <data> @@ -26,11 +26,15 @@ </data> <key>Headers/WAHelper.h</key> <data> - qbZ0Inkiod98JT9MyVli6hY3ZHA= + 9pf4SwhUzjUCU4e04L2WhqraN5M= </data> <key>Headers/WAHttpHelper.h</key> <data> jJD8Rc3DdU0bzLHnV4oNNB8nvKY= + </data> + <key>Headers/WAReachability.h</key> + <data> + UnsLwYZVZaJkBr8ZPzU58YwXJ9c= </data> <key>Headers/WASandboxHelper.h</key> <data> @@ -38,7 +42,7 @@ </data> <key>Info.plist</key> <data> - g4fFo7YpHMi0XGSN8wqr7YCRfwI= + LX8lCLtgSzpFJz9xdgwyyLJKDpY= </data> <key>Modules/module.modulemap</key> <data> @@ -62,22 +66,22 @@ <dict> <key>hash</key> <data> - 1RxyFfmLNpqNC0fEcQ6KTu2gfXI= + a0Q5FEUzp4ZHUbbpGF08d8fXdo8= </data> <key>hash2</key> <data> - s5q0HwyB/UdLoxTXXQThqBMlJGLX8TsflHubfzb6mxU= + UuT8jZMETWjsi8b+4rZSwh0JYAQvuBB08p0YuFn+H84= </data> </dict> <key>Headers/WACommon.h</key> <dict> <key>hash</key> <data> - Uy/d7yilraJrEUyrJmAco7duhPc= + pP3NqUxwJzOT+KUoV+xIjjIaSho= </data> <key>hash2</key> <data> - l7BFc9/BHxXMcgwzHuDYMDwYlUkcCOoMiZREJO/Pkug= + AN9zk3pb3xoNf+ZZCix1a7tq7h/VzEI8OxPTImBv8Rg= </data> </dict> <key>Headers/WADevice.h</key> @@ -106,11 +110,11 @@ <dict> <key>hash</key> <data> - qbZ0Inkiod98JT9MyVli6hY3ZHA= + 9pf4SwhUzjUCU4e04L2WhqraN5M= </data> <key>hash2</key> <data> - aULHpnoZeaWYlQIh122wNAjdkKBOwIQ/44cPYVe3vS8= + MlIBBniQHwacQwqOVgAd5axTVrdngLrOM/0Qdvqp2E0= </data> </dict> <key>Headers/WAHttpHelper.h</key> @@ -124,6 +128,17 @@ SwMIvyB6fQqp8ETWYwZtSyuGP0C+GNAXq7iWCMJgvuU= </data> </dict> + <key>Headers/WAReachability.h</key> + <dict> + <key>hash</key> + <data> + UnsLwYZVZaJkBr8ZPzU58YwXJ9c= + </data> + <key>hash2</key> + <data> + O37PsmvC7/cXEgrCIsSnBaqsDBgNUSaAUtANVEieDcE= + </data> + </dict> <key>Headers/WASandboxHelper.h</key> <dict> <key>hash</key> diff --git a/frameworks/WACommon.framework/_CodeSignature/CodeSignature b/frameworks/WACommon.framework/_CodeSignature/CodeSignature index 216334a..c2464aa 100644 --- a/frameworks/WACommon.framework/_CodeSignature/CodeSignature +++ b/frameworks/WACommon.framework/_CodeSignature/CodeSignature Binary files differ diff --git a/frameworks/WASdkImpl.framework/Headers/WASdkAccountSwitchUI.h b/frameworks/WASdkImpl.framework/Headers/WASdkAccountSwitchUI.h index c6afdb7..2315c87 100644 --- a/frameworks/WASdkImpl.framework/Headers/WASdkAccountSwitchUI.h +++ b/frameworks/WASdkImpl.framework/Headers/WASdkAccountSwitchUI.h @@ -9,6 +9,6 @@ #import <UIKit/UIKit.h> #import <WACommon/WACommon.h> #import "WASdkAccountMainUI.h" -@interface WASdkAccountSwitchUI : UIView +@interface WASdkAccountSwitchUI : UIScrollView @property(nonatomic,weak)WASdkAccountMainUI* mainUI; @end diff --git a/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h b/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h index b01b9da..6b85c66 100644 --- a/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h +++ b/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h @@ -16,4 +16,4 @@ // In this header, you should import all the public headers of your framework using statements like #import <WASdkImpl/PublicHeader.h> -//time:2017/3/28 10:34 ver:1.1.3 +//time:2017/6/5 10:44 ver:1.1.4 diff --git a/frameworks/WASdkImpl.framework/Headers/WASdkLoginHandler.h b/frameworks/WASdkImpl.framework/Headers/WASdkLoginHandler.h index 1c5c45e..dc7a0c6 100644 --- a/frameworks/WASdkImpl.framework/Headers/WASdkLoginHandler.h +++ b/frameworks/WASdkImpl.framework/Headers/WASdkLoginHandler.h @@ -11,7 +11,7 @@ #import <WACommon/WACommon.h> @interface WASdkLoginHandler : NSObject -+(void)loginWithResult:(WALoginResult*)loginResult delegate:(id<WALoginDelegate>)delegate; +//+(void)loginWithResult:(WALoginResult*)loginResult delegate:(id<WALoginDelegate>)delegate; +(void)loginWithResult:(WALoginResult*)loginResult extInfo:(NSString*)extInfo delegate:(id<WALoginDelegate>)delegate; +(void)refreshTokenWithBlock:(void(^)(NSError* error ,NSString* token))block; +(void)getLoginWay:(void(^)(NSError* error ,NSArray* loginWays))block; diff --git a/frameworks/WASdkImpl.framework/Headers/WASdkSandboxHelper.h b/frameworks/WASdkImpl.framework/Headers/WASdkSandboxHelper.h index 120a324..2b2afe4 100644 --- a/frameworks/WASdkImpl.framework/Headers/WASdkSandboxHelper.h +++ b/frameworks/WASdkImpl.framework/Headers/WASdkSandboxHelper.h @@ -28,4 +28,5 @@ +(NSString*)getSDKApwImgCachePath;//SDK应用墙缓存图片路径 +(NSString*)getSDKCrashLogPath;//SDK闪退日志保存路径 +(NSString*)getSDKDatabasePath;//SDK数据库文件目录 ++(NSString*)getSDKPayLogPath;//SDK支付日子报错路径 @end diff --git a/frameworks/WASdkImpl.framework/Info.plist b/frameworks/WASdkImpl.framework/Info.plist index 6de4b43..1bb61e5 100644 --- a/frameworks/WASdkImpl.framework/Info.plist +++ b/frameworks/WASdkImpl.framework/Info.plist Binary files differ diff --git a/frameworks/WASdkImpl.framework/WASdkImpl b/frameworks/WASdkImpl.framework/WASdkImpl index 3c9a95f..5150d49 100644 --- a/frameworks/WASdkImpl.framework/WASdkImpl +++ b/frameworks/WASdkImpl.framework/WASdkImpl Binary files differ diff --git a/localizable/base.plist b/localizable/base.plist index 09863ca..2b57260 100644 --- a/localizable/base.plist +++ b/localizable/base.plist @@ -94,5 +94,11 @@ <string>Notice</string> <key>wasdk_jailbreak_not_purchase</key> <string>You can not do purchase in a jailbreak device.</string> + <key>wasdk_copy</key> + <string>Copy</string> + <key>wasdk_login_twitter</key> + <string>Twitter</string> + <key>wasdk_login_instagram</key> + <string>Instagram</string> </dict> </plist> diff --git a/localizable/en.plist b/localizable/en.plist index 09863ca..84383c2 100644 --- a/localizable/en.plist +++ b/localizable/en.plist @@ -94,5 +94,11 @@ <string>Notice</string> <key>wasdk_jailbreak_not_purchase</key> <string>You can not do purchase in a jailbreak device.</string> + <key>wasdk_copy</key> + <string>copy</string> + <key>wasdk_login_twitter</key> + <string>Twitter</string> + <key>wasdk_login_instagram</key> + <string>Instagram</string> </dict> </plist> diff --git a/localizable/pt-BR.plist b/localizable/pt-BR.plist index f94db3f..75bdeb6 100644 --- a/localizable/pt-BR.plist +++ b/localizable/pt-BR.plist @@ -92,5 +92,11 @@ <string>Aviso</string> <key>wasdk_jailbreak_not_purchase</key> <string>proibido compras em telefones com jailbreak</string> + <key>New item</key> + <string>Copy</string> + <key>wasdk_login_twitter</key> + <string>Twitter</string> + <key>wasdk_login_instagram</key> + <string>Instagram</string> </dict> </plist> diff --git a/localizable/ru.plist b/localizable/ru.plist index 6cb4beb..c195147 100644 --- a/localizable/ru.plist +++ b/localizable/ru.plist @@ -94,5 +94,11 @@ <string>Уведомление</string> <key>wasdk_jailbreak_not_purchase</key> <string>Вы не можете совершать покупки на взломанном устройстве</string> + <key>wasdk_copy</key> + <string>Copy</string> + <key>wasdk_login_twitter</key> + <string>Twitter</string> + <key>wasdk_login_instagram</key> + <string>Instagram</string> </dict> </plist> diff --git a/localizable/zh-Hans.plist b/localizable/zh-Hans.plist index f120a02..4dce933 100644 --- a/localizable/zh-Hans.plist +++ b/localizable/zh-Hans.plist @@ -94,5 +94,11 @@ <string>注意</string> <key>wasdk_jailbreak_not_purchase</key> <string>您不能在越狱的机器上进行购买 </string> + <key>wasdk_copy</key> + <string>复制</string> + <key>wasdk_login_twitter</key> + <string>Twitter</string> + <key>wasdk_login_instagram</key> + <string>Instagram</string> </dict> </plist> -- Gitblit v1.8.0