From 8635d6b872b19fb625f7a6eec669608b60412e9a Mon Sep 17 00:00:00 2001
From: hank <hank.zhang@proficientcity.com>
Date: Wed, 14 Jun 2017 14:40:22 +0800
Subject: [PATCH] 添加V3.6.4

---
 localizable/en.plist                                            |    4 ++
 frameworks/WACommon.framework/Headers/WACommConstants.h         |   13 ++++++
 frameworks/WACommon.framework/_CodeSignature/CodeSignature      |    0 
 localizable/ru.plist                                            |    4 ++
 frameworks/WACommon.framework/Headers/WAHelper.h                |    2 
 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                                          |    4 ++
 frameworks/WASdkImpl.framework/Headers/WASdkImpl.h              |    2 
 frameworks/WASdkImpl.framework/Info.plist                       |    0 
 frameworks/WACommon.framework/_CodeSignature/CodeRequirements-1 |    0 
 frameworks/WACommon.framework/Info.plist                        |    0 
 frameworks/WASdkImpl.framework/Headers/WASdkAccountSwitchUI.h   |    2 
 frameworks/WACommon.framework/_CodeSignature/CodeDirectory      |    0 
 frameworks/WACommon.framework/_CodeSignature/CodeResources      |   20 +++++-----
 localizable/pt-BR.plist                                         |    4 ++
 frameworks/WASdkImpl.framework/Headers/WASdkLoginHandler.h      |    2 
 WASdkImpl.podspec                                               |    4 +-
 frameworks/WACommon.framework/Headers/WACommon.h                |    2 
 localizable/zh-Hans.plist                                       |    4 ++
 22 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/WASdkImpl.podspec b/WASdkImpl.podspec
index 9808d80..4a66c1b 100644
--- a/WASdkImpl.podspec
+++ b/WASdkImpl.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
 
 s.name = 'WASdkImpl'
-s.version = '3.6.3'
+s.version = '3.6.4'
 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.3'   #此处添加私有库依赖
+s.dependency 'WASdkIntf', '~> 3.6.4'   #此处添加私有库依赖
 
 end
diff --git a/config/wa_sdk_impl_config_winga.xml b/config/wa_sdk_impl_config_winga.xml
index 245361f..68eac3c 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.3"/>
+	<version val="WA3.6.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 399323f..3d6d14d 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,9 +149,14 @@
 extern NSString *const WASDK_ACOUNT_BINDING_PREUSERID;
 extern NSString *const WASDK_ACOUNT_BINDING_PREPLATFORM;
 
+//绑定账号 支付订单购买日志
+extern NSString *const WASDK_TIME_STAMP;
+extern NSString *const WASDK_LOG_INFO;
+
 // 消息推送
 extern NSString *const WASDK_ACCESS_TOKEN;
 extern NSString *const WASDK_MSG_ID;
+extern NSString *const WASDK_ACTION_TYPE;
 
 extern NSString *const WASDK_IAP_URL_PROLIST;
 extern NSString *const WASDK_IAP_URL_NOTIFY_SERVER;
@@ -184,6 +193,8 @@
 
 // 获取客户端未统计上报的订单列表
 extern NSString *const WASDK_ORDER_LIST;
+// 客户端订单购买日志收集
+extern NSString *const WASDK_CLIENT_PURCHASE_LOG;
 // 更新订单的客户端统计上报状态
 extern NSString *const WASDK_CLT_STATUS_DONE;
 
@@ -212,6 +223,8 @@
 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
diff --git a/frameworks/WACommon.framework/Headers/WACommon.h b/frameworks/WACommon.framework/Headers/WACommon.h
index b27b67e..8222798 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/4/25 11:31
+//time:2017/6/12 14:22
 
diff --git a/frameworks/WACommon.framework/Headers/WAHelper.h b/frameworks/WACommon.framework/Headers/WAHelper.h
index 4dbca5a..11288d6 100644
--- a/frameworks/WACommon.framework/Headers/WAHelper.h
+++ b/frameworks/WACommon.framework/Headers/WAHelper.h
@@ -41,7 +41,7 @@
 +(NSString*)getIDFV;
 +(NSString*)getIDFA;
 +(NSString*)getSimulateIDFA;
-+(NSString*)getSimulateIDFAParams;
++(NSArray*)getSimulateIDFAParams;
 +(NSString*)getPreferredLanguage;
 /**
  *  获取本地时间
diff --git a/frameworks/WACommon.framework/Info.plist b/frameworks/WACommon.framework/Info.plist
index 49ee6ed..c30e476 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 ba9ad2e..f18b308 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 0915079..87854bd 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 1085ef6..6f6a6ef 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 76d3ee6..79e4c3b 100644
--- a/frameworks/WACommon.framework/_CodeSignature/CodeResources
+++ b/frameworks/WACommon.framework/_CodeSignature/CodeResources
@@ -10,11 +10,11 @@
 		</data>
 		<key>Headers/WACommConstants.h</key>
 		<data>
-		+Q4LNrv7uYnjoM3egRl0xNWhYqk=
+		3r/7y4k/aHifisr0MZ9T7asAjCQ=
 		</data>
 		<key>Headers/WACommon.h</key>
 		<data>
-		+isMsvnov6y0f0cmboPo0hABGfo=
+		vRdG4D7B0H86snAwFkneNdJgziY=
 		</data>
 		<key>Headers/WADevice.h</key>
 		<data>
@@ -26,7 +26,7 @@
 		</data>
 		<key>Headers/WAHelper.h</key>
 		<data>
-		60zc2qfQNN1J4w2hvpwAKqHV4Sw=
+		9pf4SwhUzjUCU4e04L2WhqraN5M=
 		</data>
 		<key>Headers/WAHttpHelper.h</key>
 		<data>
@@ -42,7 +42,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		g4fFo7YpHMi0XGSN8wqr7YCRfwI=
+		ViSxvEixJFOpLSFwHqqHEc+hXQo=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -66,22 +66,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			+Q4LNrv7uYnjoM3egRl0xNWhYqk=
+			3r/7y4k/aHifisr0MZ9T7asAjCQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			9gzINE6JgUiRqSkixkFV65KXmja7R2XX361G9p82fGo=
+			UFW/PdH15bGcF1k2R2sivdJKdtc5EIC/LFAdXukqrsU=
 			</data>
 		</dict>
 		<key>Headers/WACommon.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			+isMsvnov6y0f0cmboPo0hABGfo=
+			vRdG4D7B0H86snAwFkneNdJgziY=
 			</data>
 			<key>hash2</key>
 			<data>
-			eMm8xeplr/IUE6MkAjm35nMX+uZx8Ql95mtwKmc3Plk=
+			njJn8IAvTh+zvy3dH5qJarEuxuUKmdx+cr/C7FeqHGQ=
 			</data>
 		</dict>
 		<key>Headers/WADevice.h</key>
@@ -110,11 +110,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			60zc2qfQNN1J4w2hvpwAKqHV4Sw=
+			9pf4SwhUzjUCU4e04L2WhqraN5M=
 			</data>
 			<key>hash2</key>
 			<data>
-			dZsWYR6PR8qQ5FmQCj4Majca5NZ9G3znVWIxUmNXGu4=
+			MlIBBniQHwacQwqOVgAd5axTVrdngLrOM/0Qdvqp2E0=
 			</data>
 		</dict>
 		<key>Headers/WAHttpHelper.h</key>
diff --git a/frameworks/WACommon.framework/_CodeSignature/CodeSignature b/frameworks/WACommon.framework/_CodeSignature/CodeSignature
index 48cd736..716ed1c 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 2e04635..36ecfe9 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/4/28 10:34 ver:3.6.3
+//time:2017/6/12 14:31 ver:3.6.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..aeea60e 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 294ce5f..94a3e4f 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 dc5dd65..58d732c 100644
--- a/localizable/base.plist
+++ b/localizable/base.plist
@@ -96,5 +96,9 @@
 	<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 dc5dd65..09153d6 100644
--- a/localizable/en.plist
+++ b/localizable/en.plist
@@ -96,5 +96,9 @@
 	<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 b2fdf96..2b7a482 100644
--- a/localizable/pt-BR.plist
+++ b/localizable/pt-BR.plist
@@ -94,5 +94,9 @@
 	<string>proibido compras em telefones com jailbreak</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/ru.plist b/localizable/ru.plist
index 1d67029..01b8ece 100644
--- a/localizable/ru.plist
+++ b/localizable/ru.plist
@@ -96,5 +96,9 @@
 	<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 1af0576..a91c41b 100644
--- a/localizable/zh-Hans.plist
+++ b/localizable/zh-Hans.plist
@@ -96,5 +96,9 @@
 	<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