From 4b5ee36a00be4bf760c24eb70d7264697fe9fe15 Mon Sep 17 00:00:00 2001
From: hank <hank.zhang@proficientcity.com>
Date: Wed, 03 May 2017 10:40:33 +0800
Subject: [PATCH] 添加3.6.3
---
localizable/en.plist | 2
frameworks/WACommon.framework/Headers/WACommConstants.h | 13 ++++
frameworks/WACommon.framework/_CodeSignature/CodeSignature | 0
localizable/ru.plist | 2
frameworks/WACommon.framework/Headers/WAHelper.h | 1
frameworks/WASdkImpl.framework/WASdkImpl | 0
config/wa_sdk_impl_config_winga.xml | 2
frameworks/WACommon.framework/WACommon | 0
localizable/base.plist | 2
frameworks/WASdkImpl.framework/Headers/WASdkImpl.h | 2
frameworks/WACommon.framework/Headers/WAReachability.h | 102 ++++++++++++++++++++++++++++++++++
frameworks/WACommon.framework/_CodeSignature/CodeRequirements-1 | 0
frameworks/WACommon.framework/_CodeSignature/CodeDirectory | 0
frameworks/WACommon.framework/_CodeSignature/CodeResources | 33 ++++++++---
localizable/pt-BR.plist | 2
WASdkImpl.podspec | 4
frameworks/WACommon.framework/Headers/WACommon.h | 5 +
localizable/zh-Hans.plist | 2
18 files changed, 157 insertions(+), 15 deletions(-)
diff --git a/WASdkImpl.podspec b/WASdkImpl.podspec
index ca32848..9808d80 100644
--- a/WASdkImpl.podspec
+++ b/WASdkImpl.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkImpl'
-s.version = '3.6.2'
+s.version = '3.6.3'
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.2' #此处添加私有库依赖
+s.dependency 'WASdkIntf', '~> 3.6.3' #此处添加私有库依赖
end
diff --git a/config/wa_sdk_impl_config_winga.xml b/config/wa_sdk_impl_config_winga.xml
index da2f49f..245361f 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.2"/>
+ <version val="WA3.6.3"/>
<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..399323f 100644
--- a/frameworks/WACommon.framework/Headers/WACommConstants.h
+++ b/frameworks/WACommon.framework/Headers/WACommConstants.h
@@ -145,6 +145,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;
@@ -210,6 +213,16 @@
// 免密码登录接口
extern NSString *const WASDK_LOGIN_URL_FAST_LOGIN;
+// 消息推送
+// 更新第三方消息服务的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;
extern NSString *const WASDK_FB_INVITE_SERVERID;
diff --git a/frameworks/WACommon.framework/Headers/WACommon.h b/frameworks/WACommon.framework/Headers/WACommon.h
index a26844e..b27b67e 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/4/25 11:31
diff --git a/frameworks/WACommon.framework/Headers/WAHelper.h b/frameworks/WACommon.framework/Headers/WAHelper.h
index 66fc094..4dbca5a 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;
++(NSString*)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/WACommon b/frameworks/WACommon.framework/WACommon
index 12ed0ec..ba9ad2e 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..0915079 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..1085ef6 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..76d3ee6 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=
+ +Q4LNrv7uYnjoM3egRl0xNWhYqk=
</data>
<key>Headers/WACommon.h</key>
<data>
- Uy/d7yilraJrEUyrJmAco7duhPc=
+ +isMsvnov6y0f0cmboPo0hABGfo=
</data>
<key>Headers/WADevice.h</key>
<data>
@@ -26,11 +26,15 @@
</data>
<key>Headers/WAHelper.h</key>
<data>
- qbZ0Inkiod98JT9MyVli6hY3ZHA=
+ 60zc2qfQNN1J4w2hvpwAKqHV4Sw=
</data>
<key>Headers/WAHttpHelper.h</key>
<data>
jJD8Rc3DdU0bzLHnV4oNNB8nvKY=
+ </data>
+ <key>Headers/WAReachability.h</key>
+ <data>
+ UnsLwYZVZaJkBr8ZPzU58YwXJ9c=
</data>
<key>Headers/WASandboxHelper.h</key>
<data>
@@ -62,22 +66,22 @@
<dict>
<key>hash</key>
<data>
- 1RxyFfmLNpqNC0fEcQ6KTu2gfXI=
+ +Q4LNrv7uYnjoM3egRl0xNWhYqk=
</data>
<key>hash2</key>
<data>
- s5q0HwyB/UdLoxTXXQThqBMlJGLX8TsflHubfzb6mxU=
+ 9gzINE6JgUiRqSkixkFV65KXmja7R2XX361G9p82fGo=
</data>
</dict>
<key>Headers/WACommon.h</key>
<dict>
<key>hash</key>
<data>
- Uy/d7yilraJrEUyrJmAco7duhPc=
+ +isMsvnov6y0f0cmboPo0hABGfo=
</data>
<key>hash2</key>
<data>
- l7BFc9/BHxXMcgwzHuDYMDwYlUkcCOoMiZREJO/Pkug=
+ eMm8xeplr/IUE6MkAjm35nMX+uZx8Ql95mtwKmc3Plk=
</data>
</dict>
<key>Headers/WADevice.h</key>
@@ -106,11 +110,11 @@
<dict>
<key>hash</key>
<data>
- qbZ0Inkiod98JT9MyVli6hY3ZHA=
+ 60zc2qfQNN1J4w2hvpwAKqHV4Sw=
</data>
<key>hash2</key>
<data>
- aULHpnoZeaWYlQIh122wNAjdkKBOwIQ/44cPYVe3vS8=
+ dZsWYR6PR8qQ5FmQCj4Majca5NZ9G3znVWIxUmNXGu4=
</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..48cd736 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 cb577f1..2e04635 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:3.6.2
+//time:2017/4/28 10:34 ver:3.6.3
diff --git a/frameworks/WASdkImpl.framework/WASdkImpl b/frameworks/WASdkImpl.framework/WASdkImpl
index 49b3b13..294ce5f 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..e6d2e7e 100644
--- a/localizable/base.plist
+++ b/localizable/base.plist
@@ -94,5 +94,7 @@
<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>
</dict>
</plist>
diff --git a/localizable/en.plist b/localizable/en.plist
index 09863ca..e6d2e7e 100644
--- a/localizable/en.plist
+++ b/localizable/en.plist
@@ -94,5 +94,7 @@
<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>
</dict>
</plist>
diff --git a/localizable/pt-BR.plist b/localizable/pt-BR.plist
index f94db3f..1ed40ee 100644
--- a/localizable/pt-BR.plist
+++ b/localizable/pt-BR.plist
@@ -92,5 +92,7 @@
<string>Aviso</string>
<key>wasdk_jailbreak_not_purchase</key>
<string>proibido compras em telefones com jailbreak</string>
+ <key>wasdk_copy</key>
+ <string>Copy</string>
</dict>
</plist>
diff --git a/localizable/ru.plist b/localizable/ru.plist
index 6cb4beb..156e0a5 100644
--- a/localizable/ru.plist
+++ b/localizable/ru.plist
@@ -94,5 +94,7 @@
<string>Уведомление</string>
<key>wasdk_jailbreak_not_purchase</key>
<string>Вы не можете совершать покупки на взломанном устройстве</string>
+ <key>wasdk_copy</key>
+ <string>Copy</string>
</dict>
</plist>
diff --git a/localizable/zh-Hans.plist b/localizable/zh-Hans.plist
index f120a02..dae7652 100644
--- a/localizable/zh-Hans.plist
+++ b/localizable/zh-Hans.plist
@@ -94,5 +94,7 @@
<string>注意</string>
<key>wasdk_jailbreak_not_purchase</key>
<string>您不能在越狱的机器上进行购买 </string>
+ <key>wasdk_copy</key>
+ <string>复制</string>
</dict>
</plist>
--
Gitblit v1.8.0