From a94e95323b0037c39c1785d539ada01091d3b030 Mon Sep 17 00:00:00 2001
From: hank <hank.zhang@proficientcity.com>
Date: Wed, 18 Apr 2018 14:43:48 +0800
Subject: [PATCH] 添加V3.6.7
---
frameworks/AFNetworking.framework/Headers/AFURLResponseSerialization.h | 9 ++--
frameworks/AFNetworking.framework/Headers/AFAutoPurgingImageCache.h | 11 +++++
frameworks/AFNetworking.framework/Headers/AFNetworkReachabilityManager.h | 7 +++
frameworks/WACommon.framework/Headers/WACommConstants.h | 2 +
frameworks/AFNetworking.framework/Headers/AFImageDownloader.h | 14 +++++++
frameworks/WACommon.framework/_CodeSignature/CodeSignature | 0
frameworks/WASdkImpl.framework/WASdkImpl | 0
frameworks/AFNetworking.framework/Info.plist | 0
frameworks/AFNetworking.framework/AFNetworking | 0
frameworks/WACommon.framework/WACommon | 0
config/wa_sdk_impl_config_winga.xml | 2
frameworks/AFNetworking.framework/Headers/AFNetworking.h | 2
frameworks/WASdkImpl.framework/Headers/WASdkImpl.h | 2
frameworks/AFNetworking.framework/Headers/AFHTTPSessionManager.h | 11 +++++
frameworks/WACommon.framework/_CodeSignature/CodeRequirements-1 | 0
frameworks/WACommon.framework/_CodeSignature/CodeResources | 12 +++---
frameworks/WACommon.framework/_CodeSignature/CodeDirectory | 0
frameworks/AFNetworking.framework/Headers/AFURLSessionManager.h | 4 +-
frameworks/WACommon.framework/Headers/WACommon.h | 2
WASdkImpl.podspec | 4 +-
20 files changed, 62 insertions(+), 20 deletions(-)
diff --git a/WASdkImpl.podspec b/WASdkImpl.podspec
index 1b85434..76bdb51 100644
--- a/WASdkImpl.podspec
+++ b/WASdkImpl.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkImpl'
-s.version = '3.6.6'
+s.version = '3.6.7'
s.summary = 'WASdkImpl framework in production environment.'
s.license = 'MIT'
s.author = { "Wuyx" => "wuyixin_gh@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', '~> 3.6.6' #此处添加私有库依赖
+s.dependency 'WASdkIntf', '~> 3.6.7' #此处添加私有库依赖
end
diff --git a/config/wa_sdk_impl_config_winga.xml b/config/wa_sdk_impl_config_winga.xml
index b49d9e9..244f171 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="WA3.6.6"/>
+ <version val="WA3.6.7"/>
<comps>
<!-- 用户模块 -->
<comp module="USR" plaf="WINGA" mandatory="YES" value="WASdkUser" desc="WINGA用户账户"/>
diff --git a/frameworks/AFNetworking.framework/AFNetworking b/frameworks/AFNetworking.framework/AFNetworking
index 31ec617..30b4d15 100644
--- a/frameworks/AFNetworking.framework/AFNetworking
+++ b/frameworks/AFNetworking.framework/AFNetworking
Binary files differ
diff --git a/frameworks/AFNetworking.framework/Headers/AFAutoPurgingImageCache.h b/frameworks/AFNetworking.framework/Headers/AFAutoPurgingImageCache.h
index 9bdc15c..1a27bb4 100755
--- a/frameworks/AFNetworking.framework/Headers/AFAutoPurgingImageCache.h
+++ b/frameworks/AFNetworking.framework/Headers/AFAutoPurgingImageCache.h
@@ -73,6 +73,17 @@
@protocol AFImageRequestCache <AFImageCache>
/**
+ Asks if the image should be cached using an identifier created from the request and additional identifier.
+
+ @param image The image to be cached.
+ @param request The unique URL request identifing the image asset.
+ @param identifier The additional identifier to apply to the URL request to identify the image.
+
+ @return A BOOL indicating whether or not the image should be added to the cache. YES will cache, NO will prevent caching.
+ */
+- (BOOL)shouldCacheImage:(UIImage *)image forRequest:(NSURLRequest *)request withAdditionalIdentifier:(nullable NSString *)identifier;
+
+/**
Adds the image to the cache using an identifier created from the request and additional identifier.
@param image The image to cache.
diff --git a/frameworks/AFNetworking.framework/Headers/AFHTTPSessionManager.h b/frameworks/AFNetworking.framework/Headers/AFHTTPSessionManager.h
index 5ce279a..64ee5a8 100755
--- a/frameworks/AFNetworking.framework/Headers/AFHTTPSessionManager.h
+++ b/frameworks/AFNetworking.framework/Headers/AFHTTPSessionManager.h
@@ -44,7 +44,7 @@
## Methods to Override
- To change the behavior of all data task operation construction, which is also used in the `GET` / `POST` / et al. convenience methods, override `dataTaskWithRequest:completionHandler:`.
+ To change the behavior of all data task operation construction, which is also used in the `GET` / `POST` / et al. convenience methods, override `dataTaskWithRequest:uploadProgress:downloadProgress:completionHandler:`.
## Serialization
@@ -94,6 +94,15 @@
*/
@property (nonatomic, strong) AFHTTPResponseSerializer <AFURLResponseSerialization> * responseSerializer;
+///-------------------------------
+/// @name Managing Security Policy
+///-------------------------------
+
+/**
+ The security policy used by created session to evaluate server trust for secure connections. `AFURLSessionManager` uses the `defaultPolicy` unless otherwise specified. A security policy configured with `AFSSLPinningModePublicKey` or `AFSSLPinningModeCertificate` can only be applied on a session manager initialized with a secure base URL (i.e. https). Applying a security policy with pinning enabled on an insecure session manager throws an `Invalid Security Policy` exception.
+ */
+@property (nonatomic, strong) AFSecurityPolicy *securityPolicy;
+
///---------------------
/// @name Initialization
///---------------------
diff --git a/frameworks/AFNetworking.framework/Headers/AFImageDownloader.h b/frameworks/AFNetworking.framework/Headers/AFImageDownloader.h
index 3903eec..7e25e37 100755
--- a/frameworks/AFNetworking.framework/Headers/AFImageDownloader.h
+++ b/frameworks/AFNetworking.framework/Headers/AFImageDownloader.h
@@ -82,6 +82,11 @@
+ (NSURLCache *)defaultURLCache;
/**
+ The default `NSURLSessionConfiguration` with common usage parameter values.
+ */
++ (NSURLSessionConfiguration *)defaultURLSessionConfiguration;
+
+/**
Default initializer
@return An instance of `AFImageDownloader` initialized with default values.
@@ -89,6 +94,15 @@
- (instancetype)init;
/**
+ Initializer with specific `URLSessionConfiguration`
+
+ @param configuration The `NSURLSessionConfiguration` to be be used
+
+ @return An instance of `AFImageDownloader` initialized with default values and custom `NSURLSessionConfiguration`
+ */
+- (instancetype)initWithSessionConfiguration:(NSURLSessionConfiguration *)configuration;
+
+/**
Initializes the `AFImageDownloader` instance with the given session manager, download prioritization, maximum active download count and image cache.
@param sessionManager The session manager to use to download images.
diff --git a/frameworks/AFNetworking.framework/Headers/AFNetworkReachabilityManager.h b/frameworks/AFNetworking.framework/Headers/AFNetworkReachabilityManager.h
index 0feb18d..72296d4 100755
--- a/frameworks/AFNetworking.framework/Headers/AFNetworkReachabilityManager.h
+++ b/frameworks/AFNetworking.framework/Headers/AFNetworkReachabilityManager.h
@@ -107,6 +107,13 @@
*/
- (instancetype)initWithReachability:(SCNetworkReachabilityRef)reachability NS_DESIGNATED_INITIALIZER;
+/**
+ * Initializes an instance of a network reachability manager
+ *
+ * @return nil as this method is unavailable
+ */
+- (nullable instancetype)init NS_UNAVAILABLE;
+
///--------------------------------------------------
/// @name Starting & Stopping Reachability Monitoring
///--------------------------------------------------
diff --git a/frameworks/AFNetworking.framework/Headers/AFNetworking.h b/frameworks/AFNetworking.framework/Headers/AFNetworking.h
index 468fd72..8662204 100755
--- a/frameworks/AFNetworking.framework/Headers/AFNetworking.h
+++ b/frameworks/AFNetworking.framework/Headers/AFNetworking.h
@@ -1,6 +1,6 @@
// AFNetworking.h
// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
-//
+// 3.2.0
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
diff --git a/frameworks/AFNetworking.framework/Headers/AFURLResponseSerialization.h b/frameworks/AFNetworking.framework/Headers/AFURLResponseSerialization.h
index a9430ad..24800a3 100755
--- a/frameworks/AFNetworking.framework/Headers/AFURLResponseSerialization.h
+++ b/frameworks/AFNetworking.framework/Headers/AFURLResponseSerialization.h
@@ -57,10 +57,7 @@
- (instancetype)init;
-/**
- The string encoding used to serialize data received from the server, when no string encoding is specified by the response. `NSUTF8StringEncoding` by default.
- */
-@property (nonatomic, assign) NSStringEncoding stringEncoding;
+@property (nonatomic, assign) NSStringEncoding stringEncoding DEPRECATED_MSG_ATTRIBUTE("The string encoding is never used. AFHTTPResponseSerializer only validates status codes and content types but does not try to decode the received data in any way.");
/**
Creates and returns a serializer with default configuration.
@@ -111,6 +108,8 @@
- `application/json`
- `text/json`
- `text/javascript`
+
+ In RFC 7159 - Section 8.1, it states that JSON text is required to be encoded in UTF-8, UTF-16, or UTF-32, and the default encoding is UTF-8. NSJSONSerialization provides support for all the encodings listed in the specification, and recommends UTF-8 for efficiency. Using an unsupported encoding will result in serialization error. See the `NSJSONSerialization` documentation for more details.
*/
@interface AFJSONResponseSerializer : AFHTTPResponseSerializer
@@ -166,7 +165,7 @@
- (instancetype)init;
/**
- Input and output options specifically intended for `NSXMLDocument` objects. For possible values, see the `NSJSONSerialization` documentation section "NSJSONReadingOptions". `0` by default.
+ Input and output options specifically intended for `NSXMLDocument` objects. For possible values, see the `NSXMLDocument` documentation section "Input and Output Options". `0` by default.
*/
@property (nonatomic, assign) NSUInteger options;
diff --git a/frameworks/AFNetworking.framework/Headers/AFURLSessionManager.h b/frameworks/AFNetworking.framework/Headers/AFURLSessionManager.h
index 89909fe..d2b28ce 100755
--- a/frameworks/AFNetworking.framework/Headers/AFURLSessionManager.h
+++ b/frameworks/AFNetworking.framework/Headers/AFURLSessionManager.h
@@ -208,7 +208,7 @@
@param completionHandler A block object to be executed when the task finishes. This block has no return value and takes three arguments: the server response, the response object created by that serializer, and the error that occurred, if any.
*/
- (NSURLSessionDataTask *)dataTaskWithRequest:(NSURLRequest *)request
- completionHandler:(nullable void (^)(NSURLResponse *response, id _Nullable responseObject, NSError * _Nullable error))completionHandler;
+ completionHandler:(nullable void (^)(NSURLResponse *response, id _Nullable responseObject, NSError * _Nullable error))completionHandler DEPRECATED_ATTRIBUTE;
/**
Creates an `NSURLSessionDataTask` with the specified request.
@@ -354,7 +354,7 @@
@param block A block object to be executed when an HTTP request is attempting to perform a redirection to a different URL. The block returns the request to be made for the redirection, and takes four arguments: the session, the task, the redirection response, and the request corresponding to the redirection response.
*/
-- (void)setTaskWillPerformHTTPRedirectionBlock:(nullable NSURLRequest * (^)(NSURLSession *session, NSURLSessionTask *task, NSURLResponse *response, NSURLRequest *request))block;
+- (void)setTaskWillPerformHTTPRedirectionBlock:(nullable NSURLRequest * _Nullable (^)(NSURLSession *session, NSURLSessionTask *task, NSURLResponse *response, NSURLRequest *request))block;
/**
Sets a block to be executed when a session task has received a request specific authentication challenge, as handled by the `NSURLSessionTaskDelegate` method `URLSession:task:didReceiveChallenge:completionHandler:`.
diff --git a/frameworks/AFNetworking.framework/Info.plist b/frameworks/AFNetworking.framework/Info.plist
index 7f0e13f..ae13495 100644
--- a/frameworks/AFNetworking.framework/Info.plist
+++ b/frameworks/AFNetworking.framework/Info.plist
Binary files differ
diff --git a/frameworks/WACommon.framework/Headers/WACommConstants.h b/frameworks/WACommon.framework/Headers/WACommConstants.h
index 8f2deb4..bee9616 100644
--- a/frameworks/WACommon.framework/Headers/WACommConstants.h
+++ b/frameworks/WACommon.framework/Headers/WACommConstants.h
@@ -28,6 +28,8 @@
extern NSString *const WASDK_PARAM_KEY_PUSER_ID_LOWER;
extern NSString *const WASDK_PARAM_KEY_PUSER_IDS;
extern NSString *const WASDK_PARAM_KEY_GAMEUSER_ID;
+extern NSString *const WASDK_PARAM_KEY_NICK_NAME;
+extern NSString *const WASDK_PARAM_KEY_PUSER_NAME;
extern NSString *const WASDK_PARAM_KEY_SERVER_ID;
extern NSString *const WASDK_PARAM_KEY_OS;
extern NSString *const WASDK_PARAM_KEY_OS_VERSION;
diff --git a/frameworks/WACommon.framework/Headers/WACommon.h b/frameworks/WACommon.framework/Headers/WACommon.h
index 28ec01c..7cfca2f 100644
--- a/frameworks/WACommon.framework/Headers/WACommon.h
+++ b/frameworks/WACommon.framework/Headers/WACommon.h
@@ -25,5 +25,5 @@
#import <WACommon/WADevice.h>
#import <WACommon/WAReachability.h>
-//time:2017/8/30 09:56
+//time:2018/4/16 10:38
diff --git a/frameworks/WACommon.framework/WACommon b/frameworks/WACommon.framework/WACommon
index e60e817..ca1dc55 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 7ec0122..9c818fc 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 2e7a4f5..9e192f1 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 d5c3369..5d5490c 100644
--- a/frameworks/WACommon.framework/_CodeSignature/CodeResources
+++ b/frameworks/WACommon.framework/_CodeSignature/CodeResources
@@ -10,11 +10,11 @@
</data>
<key>Headers/WACommConstants.h</key>
<data>
- 4wAbuHLPQg4Vqq/j6fdsfPIDgZE=
+ Ky/rcbFVdU3Xe3MCWq9lg9qWcvI=
</data>
<key>Headers/WACommon.h</key>
<data>
- PZZr9NtBCLvzG/zhye/RqAJLkxs=
+ M47nUdyzQFUZmUiP/F7LPc4VYh4=
</data>
<key>Headers/WADevice.h</key>
<data>
@@ -66,22 +66,22 @@
<dict>
<key>hash</key>
<data>
- 4wAbuHLPQg4Vqq/j6fdsfPIDgZE=
+ Ky/rcbFVdU3Xe3MCWq9lg9qWcvI=
</data>
<key>hash2</key>
<data>
- /SnzlFAEKYKuQGIRvGmiVwnhXDwElGTDlPRwL0kUWZg=
+ Bxn5qtKGk9u/5dAy1UvD5QOW7BYqLEr++L1EPaL2BQ0=
</data>
</dict>
<key>Headers/WACommon.h</key>
<dict>
<key>hash</key>
<data>
- PZZr9NtBCLvzG/zhye/RqAJLkxs=
+ M47nUdyzQFUZmUiP/F7LPc4VYh4=
</data>
<key>hash2</key>
<data>
- e+nPTkWdMmIITF6AZkCE/7H4gWsgwu4FJ1KFTtXT+kI=
+ SFH09KbRT76cUQdUMkzGRgdCX9n7KWFi+EzqjgEX2PA=
</data>
</dict>
<key>Headers/WADevice.h</key>
diff --git a/frameworks/WACommon.framework/_CodeSignature/CodeSignature b/frameworks/WACommon.framework/_CodeSignature/CodeSignature
index 53d290c..c5e28a1 100644
--- a/frameworks/WACommon.framework/_CodeSignature/CodeSignature
+++ b/frameworks/WACommon.framework/_CodeSignature/CodeSignature
Binary files differ
diff --git a/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h b/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h
index 47fcf1a..6f4adcd 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:2018/2/24 15:54 ver:3.6.6
+//time:2018/4/11 14:29 ver:3.6.7
diff --git a/frameworks/WASdkImpl.framework/WASdkImpl b/frameworks/WASdkImpl.framework/WASdkImpl
index 26ea51b..75a88e3 100644
--- a/frameworks/WASdkImpl.framework/WASdkImpl
+++ b/frameworks/WASdkImpl.framework/WASdkImpl
Binary files differ
--
Gitblit v1.8.0