From 1b47a019664bce9db5d59dc39c4c5304a8eda483 Mon Sep 17 00:00:00 2001
From: hank <hank.zhang@proficientcity.com>
Date: Thu, 01 Nov 2018 09:32:14 +0800
Subject: [PATCH] 添加V1.2.1
---
WASdkImpl_CN.podspec | 4 ++--
localizable/en.plist | 6 +++---
frameworks/WACommon.framework/Headers/WACommConstants.h | 2 ++
localizable/ru.plist | 6 ++++--
frameworks/WASdkImpl.framework/WASdkImpl | 0
bundle/WASDK-Resource.bundle/wasdk-user-login-logo@2x.png | 0
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
localizable/es.plist | 6 ++++--
frameworks/WACommon.framework/Info.plist | 0
localizable/pt-BR.plist | 10 ++++++----
frameworks/WACommon.framework/Headers/WACommon.h | 2 +-
localizable/zh-Hans.plist | 2 +-
16 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/WASdkImpl_CN.podspec b/WASdkImpl_CN.podspec
index 5f05748..8d839ec 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.2.0'
+s.version = '1.2.1'
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.2.0' #
+s.dependency 'WASdkIntf_CN', '~> 1.2.1' #
end
\ No newline at end of file
diff --git a/bundle/WASDK-Resource.bundle/wasdk-user-login-logo@2x.png b/bundle/WASDK-Resource.bundle/wasdk-user-login-logo@2x.png
new file mode 100644
index 0000000..9ff8c6b
--- /dev/null
+++ b/bundle/WASDK-Resource.bundle/wasdk-user-login-logo@2x.png
Binary files differ
diff --git a/config/wa_sdk_impl_config_winga.xml b/config/wa_sdk_impl_config_winga.xml
index 1728add..6fcf0c7 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.2.0"/>
+ <version val="WA1.2.1"/>
<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 a1ee29b..020a9c3 100644
--- a/frameworks/WACommon.framework/Headers/WACommConstants.h
+++ b/frameworks/WACommon.framework/Headers/WACommConstants.h
@@ -164,6 +164,8 @@
extern NSString *const WASDK_ACTION_TYPE;
//extern NSString *const WASDK_IAP_URL_PROLIST;
+//Apple商品消耗
+extern NSString *const WASDK_IAP_URL_FINISH_TRANSACTION;
extern NSString *const WASDK_IAP_URL_NOTIFY_SERVER;
extern NSString *const WASDK_IAP_URL_CREATE_ORDER;
extern NSString *const WASDK_REFRESH_TOKEN;
diff --git a/frameworks/WACommon.framework/Headers/WACommon.h b/frameworks/WACommon.framework/Headers/WACommon.h
index b544940..a7b8d54 100644
--- a/frameworks/WACommon.framework/Headers/WACommon.h
+++ b/frameworks/WACommon.framework/Headers/WACommon.h
@@ -27,5 +27,5 @@
#import <WACommon/WAWebProgressView.h>
#import <WACommon/WAWebViewController.h>
-//time:2018/09/11 15:44
+//time:2018/10/26 10:38
diff --git a/frameworks/WACommon.framework/Info.plist b/frameworks/WACommon.framework/Info.plist
index 12fc9c6..381c48e 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 0ce8a61..430b81f 100644
--- a/frameworks/WACommon.framework/WACommon
+++ b/frameworks/WACommon.framework/WACommon
Binary files differ
diff --git a/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h b/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h
index 5601941..f44dd22 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/09/11 15:43 ver:1.2.0
+//time:2018/10/26 10:38 ver:1.2.1
diff --git a/frameworks/WASdkImpl.framework/Info.plist b/frameworks/WASdkImpl.framework/Info.plist
index ee8c0a5..f7cde98 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 3bca23f..c353fe8 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 d40b199..9941608 100644
--- a/localizable/base.plist
+++ b/localizable/base.plist
@@ -105,15 +105,15 @@
<key>wasdk_tip_unbind_closed</key>
<string>Failed to unbind. </string>
<key>wasdk_loading_error</key>
- <string>Failed to Loading.</string>
+ <string>Network error, please try again later.</string>
<key>wasdk_privacy_policy</key>
<string>Privacy Policy</string>
<key>wasdk_privacy_reminder</key>
<string>A privacy reminder</string>
<key>wasdk_privacy_policy_alert_content</key>
- <string>Thank you for supporting us. Please read and agree to the presented legal agreement.</string>
+ <string>Read and agree to our Privacy Policy.</string>
<key>wasdk_privacy_view details</key>
- <string>Tap to view details</string>
+ <string>Read Privacy Policy</string>
<key>wasdk_no_agree</key>
<string>I do not agree</string>
<key>wasdk_agree</key>
diff --git a/localizable/en.plist b/localizable/en.plist
index d40b199..9941608 100644
--- a/localizable/en.plist
+++ b/localizable/en.plist
@@ -105,15 +105,15 @@
<key>wasdk_tip_unbind_closed</key>
<string>Failed to unbind. </string>
<key>wasdk_loading_error</key>
- <string>Failed to Loading.</string>
+ <string>Network error, please try again later.</string>
<key>wasdk_privacy_policy</key>
<string>Privacy Policy</string>
<key>wasdk_privacy_reminder</key>
<string>A privacy reminder</string>
<key>wasdk_privacy_policy_alert_content</key>
- <string>Thank you for supporting us. Please read and agree to the presented legal agreement.</string>
+ <string>Read and agree to our Privacy Policy.</string>
<key>wasdk_privacy_view details</key>
- <string>Tap to view details</string>
+ <string>Read Privacy Policy</string>
<key>wasdk_no_agree</key>
<string>I do not agree</string>
<key>wasdk_agree</key>
diff --git a/localizable/es.plist b/localizable/es.plist
index ad50a89..594d954 100644
--- a/localizable/es.plist
+++ b/localizable/es.plist
@@ -104,14 +104,16 @@
<string>Error al enlazar</string>
<key>wasdk_tip_unbind_closed</key>
<string>Error al desenlazar</string>
+ <key>wasdk_loading_error</key>
+ <string>Error de conexión. Inténtalo de nuevo más tarde.</string>
<key>wasdk_privacy_policy</key>
<string>Política de Privacidad</string>
<key>wasdk_privacy_reminder</key>
<string>Un recordatorio de privacidad</string>
<key>wasdk_privacy_policy_alert_content</key>
- <string>Gracias por tu apoyo. Lee y acepta el siguente acuerdo legal.</string>
+ <string>He leído y estoy de acuerdo con la Política de Privacidad.</string>
<key>wasdk_privacy_view details</key>
- <string>Pulsa para ver más detalles</string>
+ <string>Leer la Política de Privacidad</string>
<key>wasdk_no_agree</key>
<string>No acepto</string>
<key>wasdk_agree</key>
diff --git a/localizable/pt-BR.plist b/localizable/pt-BR.plist
index 9cd91a4..8b5a8ba 100644
--- a/localizable/pt-BR.plist
+++ b/localizable/pt-BR.plist
@@ -67,9 +67,9 @@
<key>wasdk_tip_bind_fail</key>
<string>Falha ao vincular. Por favor tente mais tarde.</string>
<key>wasdk_tip_bind_fail_other_user</key>
- <string>This account has been bound to another user.</string>
+ <string>Esta conta está vinculada a outro usuário. </string>
<key>wasdk_tip_unbind_succ</key>
- <string>Unbinded successfully!</string>
+ <string>Desvinculada com sucesso!</string>
<key>wasdk_tip_unbind_fail</key>
<string>Falha ao desvincular. Por favor tente mais tarde.</string>
<key>wasdk_tip_create_user_fail</key>
@@ -102,14 +102,16 @@
<string>Falha ao vincular</string>
<key>wasdk_tip_unbind_closed</key>
<string>Falha ao desvincular</string>
+ <key>wasdk_loading_error</key>
+ <string>Erro de rede, por favor tente novamente mais tarde.</string>
<key>wasdk_privacy_policy</key>
<string>Política de Privacidade</string>
<key>wasdk_privacy_reminder</key>
<string>Aviso de Privacidade</string>
<key>wasdk_privacy_policy_alert_content</key>
- <string>Obrigado pelo Suporte. Por favor leia os termos legais.</string>
+ <string>Leia e concorde com nossa Política de Privacidade.</string>
<key>wasdk_privacy_view details</key>
- <string>Toque para ver os detalhes</string>
+ <string>Leia nossa Política de Privacidade</string>
<key>wasdk_no_agree</key>
<string>Discordo</string>
<key>wasdk_agree</key>
diff --git a/localizable/ru.plist b/localizable/ru.plist
index b4c0491..9b5de4f 100644
--- a/localizable/ru.plist
+++ b/localizable/ru.plist
@@ -104,14 +104,16 @@
<string>Не удалось выполнить привязку</string>
<key>wasdk_tip_unbind_closed</key>
<string>Не удалось выполнить отвязку</string>
+ <key>wasdk_loading_error</key>
+ <string>Ошибка сети, пожалуйста попробуйте позже.</string>
<key>wasdk_privacy_policy</key>
<string>политика конфиденциальности</string>
<key>wasdk_privacy_reminder</key>
<string>Напоминание о конфиденциальности</string>
<key>wasdk_privacy_policy_alert_content</key>
- <string>Спасибо Вам за поддержку. Прочтите и согласитесь с представленным юридическим соглашением.</string>
+ <string>Прочитайте и согласитесь с Политикой конфиденциальности.</string>
<key>wasdk_privacy_view details</key>
- <string>Нажмите для просмотра сведений.</string>
+ <string>Ознакомьтесь с Политикой конфиденциальности</string>
<key>wasdk_no_agree</key>
<string>Не согласен</string>
<key>wasdk_agree</key>
diff --git a/localizable/zh-Hans.plist b/localizable/zh-Hans.plist
index 2f9b7cd..2a9a634 100644
--- a/localizable/zh-Hans.plist
+++ b/localizable/zh-Hans.plist
@@ -105,7 +105,7 @@
<key>wasdk_tip_unbind_closed</key>
<string>解绑失败</string>
<key>wasdk_loading_error</key>
- <string>加载失败</string>
+ <string>网络错误，请稍后重试</string>
<key>wasdk_privacy_policy</key>
<string>隐私政策</string>
<key>wasdk_privacy_reminder</key>
--
Gitblit v1.8.0