From c33e5c13ad47acc83736e7a4b8a0a653e2def897 Mon Sep 17 00:00:00 2001
From: lpw <pengwei.li@gamehollywood.com>
Date: Tue, 01 Sep 2020 15:26:35 +0800
Subject: [PATCH] 3.8.5
---
WASdkImpl/3.8.5/WASdkImpl.podspec | 26 ++++++++
localizable/en.plist | 15 ++++
frameworks/WACommon.framework/Headers/WACommConstants.h | 6 ++
localizable/ru.plist | 15 ++++
localizable/id.plist | 15 ++++
frameworks/WASdkImpl.framework/WASdkImpl | 0
config/wa_sdk_impl_config_winga.xml | 2
frameworks/WACommon.framework/WACommon | 0
localizable/base.plist | 11 +++
frameworks/WASdkImpl.framework/Headers/WASdkImpl.h | 2
localizable/es.plist | 15 ++++
localizable/pt-BR.plist | 15 ++++
WASdkImpl.podspec | 2
frameworks/WACommon.framework/Headers/WACommon.h | 2
localizable/zh-Hant.plist | 15 ++++
localizable/zh-Hans.plist | 15 ++++
localizable/th.plist | 15 ++++
17 files changed, 151 insertions(+), 20 deletions(-)
diff --git a/WASdkImpl.podspec b/WASdkImpl.podspec
index a4a2eb8..540c893 100644
--- a/WASdkImpl.podspec
+++ b/WASdkImpl.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkImpl'
-s.version = '3.8.4'
+s.version = '3.8.5'
s.summary = 'WASdkImpl framework in production environment.'
s.license = 'MIT'
s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
diff --git a/WASdkImpl/3.8.5/WASdkImpl.podspec b/WASdkImpl/3.8.5/WASdkImpl.podspec
new file mode 100644
index 0000000..540c893
--- /dev/null
+++ b/WASdkImpl/3.8.5/WASdkImpl.podspec
@@ -0,0 +1,26 @@
+#
+# Be sure to run `pod spec lint WASdkImpl.podspec' to ensure this is a
+# valid spec and to remove all comments including this before submitting the spec.
+#
+# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html
+# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
+#
+
+Pod::Spec.new do |s|
+
+s.name = 'WASdkImpl'
+s.version = '3.8.5'
+s.summary = 'WASdkImpl framework in production environment.'
+s.license = 'MIT'
+s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
+s.homepage = 'http://repo.wingsdk.cn:8082/summary/WASdkImpl.git'
+s.source = { :git => "http://admin@repo.wingsdk.cn:8082/r/WASdkImpl.git" , :tag => s.version}
+s.platform = :ios
+s.ios.deployment_target = "7.0"
+s.vendored_frameworks = 'frameworks/*.framework'
+s.resources = ['config/*.xml','bundle/WASDK-Resource.bundle','localizable/*.plist']
+s.libraries = 'sqlite3','z'
+s.requires_arc = true
+s.dependency 'WASdkIntf'
+
+end
diff --git a/config/wa_sdk_impl_config_winga.xml b/config/wa_sdk_impl_config_winga.xml
index 77032a7..04bcd7c 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.8.4"/>
+ <version val="WA3.8.5"/>
<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 f8ce233..1b28991 100644
--- a/frameworks/WACommon.framework/Headers/WACommConstants.h
+++ b/frameworks/WACommon.framework/Headers/WACommConstants.h
@@ -95,6 +95,8 @@
extern NSString *const WASDK_PARAM_KEY_SEND_SEQ;
extern NSString *const WASDK_PARAM_KEY_APPLE_ABNORMAL;
+extern NSString *const WASDK_PARAM_KEY_URL_TYPE;
+extern NSString *const WASDK_PARAM_KEY_LONG_URL;
extern NSString *const WASDK_PARAM_KEY_QUERY_TYPE;
extern NSString *const WASDK_PARAM_KEY_IS_REPORTDATA;
@@ -274,6 +276,10 @@
// 充值中心-账号生成
extern NSString *const WASDK_AD_URL_GAME_CREATE_WINGA_ACCOUNT;
+//充值中心-短链接申请
+extern NSString *const WASDK_PAYCENTER_URL_GET_SHORT_LINK;
+
+
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 c6507b5..9f206e1 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:2020/05/20 09:16 ver:3.8.4
+//time:2020/09/023 09:16 ver:3.8.5
diff --git a/frameworks/WACommon.framework/WACommon b/frameworks/WACommon.framework/WACommon
index b168c2c..7420381 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 5c44455..cea3a8e 100644
--- a/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h
+++ b/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h
@@ -16,5 +16,5 @@
// In this header, you should import all the public headers of your framework using statements like #import <WASdkImpl/PublicHeader.h>
-//time:2020/05/20 12:00 ver:3.8.4
+//time:2020/09/01 14:00 ver:3.8.5
diff --git a/frameworks/WASdkImpl.framework/WASdkImpl b/frameworks/WASdkImpl.framework/WASdkImpl
index c8a4e9f..5d6003e 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 107838b..8a2bcc4 100644
--- a/localizable/base.plist
+++ b/localizable/base.plist
@@ -132,7 +132,18 @@
<string>OK</string>
<key>wasdk_copied</key>
<string>Copied</string>
+ <key>wasdk_payment_center</key>
+ <string>Payment Center</string>
+ <key>wasdk_pay_way_title</key>
+ <string>How to recharge</string>
+ <key>wasdk_pay_way_1</key>
+ <string>1. Press the button below to copy the url</string>
+ <key>wasdk_pay_way_2</key>
+ <string>2. Paste it on a mobile browser and visit the url
+Recharge with discount</string>
<key>wasdk_login_signinwithapple</key>
<string>Sign in with Apple</string>
+ <key>wasdk_short_link_dated_alert</key>
+ <string>The link is only valid for 5 minutes. Please request a link again once it expires.</string>
</dict>
</plist>
diff --git a/localizable/en.plist b/localizable/en.plist
index 107838b..e32acad 100644
--- a/localizable/en.plist
+++ b/localizable/en.plist
@@ -20,6 +20,8 @@
<string>None</string>
<key>wasdk_login</key>
<string>Login</string>
+ <key>wasdk_login_signinwithapple</key>
+ <string>Sign in with Apple</string>
<key>wasdk_login_facebook</key>
<string>Facebook</string>
<key>wasdk_login_game_center</key>
@@ -132,7 +134,16 @@
<string>OK</string>
<key>wasdk_copied</key>
<string>Copied</string>
- <key>wasdk_login_signinwithapple</key>
- <string>Sign in with Apple</string>
+ <key>wasdk_payment_center</key>
+ <string>Payment Center</string>
+ <key>wasdk_pay_way_title</key>
+ <string>How to recharge</string>
+ <key>wasdk_pay_way_1</key>
+ <string>1. Press the button below to copy the url</string>
+ <key>wasdk_pay_way_2</key>
+ <string>2. Paste it on a mobile browser and visit the url
+Recharge with discount</string>
+ <key>wasdk_short_link_dated_alert</key>
+ <string>The link is only valid for 5 minutes. Please request a link again once it expires.</string>
</dict>
</plist>
diff --git a/localizable/es.plist b/localizable/es.plist
index 9f97144..7a74521 100644
--- a/localizable/es.plist
+++ b/localizable/es.plist
@@ -22,6 +22,8 @@
<string>Conectar</string>
<key>wasdk_login_facebook</key>
<string>Facebook</string>
+ <key>wasdk_login_signinwithapple</key>
+ <string>Sign in with Apple</string>
<key>wasdk_login_game_center</key>
<string>Centro de Juegos</string>
<key>wasdk_login_vk</key>
@@ -132,7 +134,16 @@
<string>OK</string>
<key>wasdk_copied</key>
<string>Copiado</string>
- <key>wasdk_login_signinwithapple</key>
- <string>Sign in with Apple</string>
+ <key>wasdk_payment_center</key>
+ <string>Centro de Pago</string>
+ <key>wasdk_pay_way_2</key>
+ <string>2. Paste it on a mobile browser and visit the url
+Recharge with discount</string>
+ <key>wasdk_pay_way_1</key>
+ <string>1. Press the button below to copy the url</string>
+ <key>wasdk_pay_way_title</key>
+ <string>How to recharge</string>
+ <key>wasdk_short_link_dated_alert</key>
+ <string>The link is only valid for 5 minutes. Please request a link again once it expires.</string>
</dict>
</plist>
diff --git a/localizable/id.plist b/localizable/id.plist
index 1eeeb52..c1a93d6 100644
--- a/localizable/id.plist
+++ b/localizable/id.plist
@@ -28,6 +28,8 @@
<string>VK</string>
<key>wasdk_confirm</key>
<string>Konfirmasi</string>
+ <key>wasdk_login_signinwithapple</key>
+ <string>Sign in with Apple</string>
<key>wasdk_cancel</key>
<string>Batal</string>
<key>wasdk_loading</key>
@@ -132,7 +134,16 @@
<string>OK</string>
<key>wasdk_copied</key>
<string>Copied</string>
- <key>wasdk_login_signinwithapple</key>
- <string>Sign in with Apple</string>
+ <key>wasdk_payment_center</key>
+ <string>Payment Center</string>
+ <key>wasdk_pay_way_title</key>
+ <string>How to recharge</string>
+ <key>wasdk_pay_way_1</key>
+ <string>1. Press the button below to copy the url</string>
+ <key>wasdk_pay_way_2</key>
+ <string>2. Paste it on a mobile browser and visit the url
+Recharge with discount</string>
+ <key>wasdk_short_link_dated_alert</key>
+ <string>The link is only valid for 5 minutes. Please request a link again once it expires.</string>
</dict>
</plist>
diff --git a/localizable/pt-BR.plist b/localizable/pt-BR.plist
index 7dbc1e6..d063ea0 100644
--- a/localizable/pt-BR.plist
+++ b/localizable/pt-BR.plist
@@ -22,6 +22,8 @@
<string>Entrar</string>
<key>wasdk_login_facebook</key>
<string>Facebook</string>
+ <key>wasdk_login_signinwithapple</key>
+ <string>Sign in with Apple</string>
<key>wasdk_login_game_center</key>
<string>Game Center</string>
<key>wasdk_confirm</key>
@@ -128,9 +130,18 @@
<string>Senha Padrão</string>
<key>wasdk_i_know</key>
<string>OK</string>
+ <key>wasdk_pay_way_title</key>
+ <string>Como recarregar</string>
+ <key>wasdk_pay_way_1</key>
+ <string>1. Toque no botão a baixo e copie o endereço</string>
+ <key>wasdk_pay_way_2</key>
+ <string>2. Cole em seu navegador para visitar o endereço
+Recarregue com desconto.</string>
<key>wasdk_copied</key>
<string>Copiado</string>
- <key>wasdk_login_signinwithapple</key>
- <string>Sign in with Apple</string>
+ <key>wasdk_payment_center</key>
+ <string>Central de Pagamento</string>
+ <key>wasdk_short_link_dated_alert</key>
+ <string>O link é válido apenas por 5 minutos. Solicite um link novamente quando expirar.</string>
</dict>
</plist>
diff --git a/localizable/ru.plist b/localizable/ru.plist
index 4247401..f9b6ed2 100644
--- a/localizable/ru.plist
+++ b/localizable/ru.plist
@@ -22,6 +22,8 @@
<string>Вход</string>
<key>wasdk_login_facebook</key>
<string>Facebook</string>
+ <key>wasdk_login_signinwithapple</key>
+ <string>Sign in with Apple</string>
<key>wasdk_login_game_center</key>
<string>Игровой Центр</string>
<key>wasdk_login_vk</key>
@@ -112,8 +114,6 @@
<string>Напоминание о конфиденциальности</string>
<key>wasdk_privacy_policy_alert_content</key>
<string>Прочитайте и согласитесь с Политикой конфиденциальности.</string>
- <key>wasdk_login_signinwithapple</key>
- <string>Sign in with Apple</string>
<key>wasdk_privacy_view details</key>
<string>Ознакомьтесь с Политикой конфиденциальности</string>
<key>wasdk_no_agree</key>
@@ -134,5 +134,16 @@
<string>OK</string>
<key>wasdk_copied</key>
<string>Скопир</string>
+ <key>wasdk_payment_center</key>
+ <string>Мой кошелёк</string>
+ <key>wasdk_pay_way_title</key>
+ <string>How to recharge</string>
+ <key>wasdk_pay_way_1</key>
+ <string>1. Press the button below to copy the url</string>
+ <key>wasdk_pay_way_2</key>
+ <string>2. Paste it on a mobile browser and visit the url
+Recharge with discount</string>
+ <key>wasdk_short_link_dated_alert</key>
+ <string>The link is only valid for 5 minutes. Please request a link again once it expires.</string>
</dict>
</plist>
diff --git a/localizable/th.plist b/localizable/th.plist
index 9fe78f6..7c86633 100644
--- a/localizable/th.plist
+++ b/localizable/th.plist
@@ -26,6 +26,8 @@
<string>Game Center</string>
<key>wasdk_login_vk</key>
<string>VK</string>
+ <key>wasdk_login_signinwithapple</key>
+ <string>Sign in with Apple</string>
<key>wasdk_confirm</key>
<string>ยืนยัน</string>
<key>wasdk_cancel</key>
@@ -86,8 +88,6 @@
<string>เลื่อนลงเพื่อรีเฟรช</string>
<key>wasdk_release_refresh</key>
<string>ปล่อยเพื่อรีเฟรช</string>
- <key>wasdk_login_signinwithapple</key>
- <string>Sign in with Apple</string>
<key>wasdk_purchase</key>
<string>ซื้อ</string>
<key>wasdk_pay_exit_alert</key>
@@ -134,5 +134,16 @@
<string>OK</string>
<key>wasdk_copied</key>
<string>Copied</string>
+ <key>wasdk_payment_center</key>
+ <string>Payment Center</string>
+ <key>wasdk_pay_way_title</key>
+ <string>How to recharge</string>
+ <key>wasdk_pay_way_1</key>
+ <string>1. Press the button below to copy the url</string>
+ <key>wasdk_pay_way_2</key>
+ <string>2. Paste it on a mobile browser and visit the url
+Recharge with discount</string>
+ <key>wasdk_short_link_dated_alert</key>
+ <string>The link is only valid for 5 minutes. Please request a link again once it expires.</string>
</dict>
</plist>
diff --git a/localizable/zh-Hans.plist b/localizable/zh-Hans.plist
index 5ba9778..583d716 100644
--- a/localizable/zh-Hans.plist
+++ b/localizable/zh-Hans.plist
@@ -22,6 +22,8 @@
<string>登录</string>
<key>wasdk_login_facebook</key>
<string>Facebook</string>
+ <key>wasdk_login_signinwithapple</key>
+ <string>Sign in with Apple</string>
<key>wasdk_login_game_center</key>
<string>Game Center</string>
<key>wasdk_login_vk</key>
@@ -130,9 +132,18 @@
<string>初始密码</string>
<key>wasdk_i_know</key>
<string>我知道了</string>
- <key>wasdk_login_signinwithapple</key>
- <string>Sign in with Apple</string>
<key>wasdk_copied</key>
<string>已复制</string>
+ <key>wasdk_payment_center</key>
+ <string>充值中心</string>
+ <key>wasdk_pay_way_title</key>
+ <string>充值流程</string>
+ <key>wasdk_pay_way_1</key>
+ <string>1. 点击下面的按钮复制网址</string>
+ <key>wasdk_pay_way_2</key>
+ <string>2. 打开手机浏览器，粘贴网址并访问
+即可以更优惠的价格购买</string>
+ <key>wasdk_short_link_dated_alert</key>
+ <string>链接有效期为5分钟，逾时需重新获取</string>
</dict>
</plist>
diff --git a/localizable/zh-Hant.plist b/localizable/zh-Hant.plist
index d534f2b..bf2d3b0 100644
--- a/localizable/zh-Hant.plist
+++ b/localizable/zh-Hant.plist
@@ -26,6 +26,8 @@
<string>Game Center</string>
<key>wasdk_login_vk</key>
<string>VK</string>
+ <key>wasdk_login_signinwithapple</key>
+ <string>Sign in with Apple</string>
<key>wasdk_confirm</key>
<string>確定</string>
<key>wasdk_cancel</key>
@@ -98,8 +100,6 @@
<string>複製</string>
<key>wasdk_login_twitter</key>
<string>Twitter</string>
- <key>wasdk_login_signinwithapple</key>
- <string>Sign in with Apple</string>
<key>wasdk_login_instagram</key>
<string>Instagram</string>
<key>wasdk_tip_bind_closed</key>
@@ -134,5 +134,16 @@
<string>我知道了</string>
<key>wasdk_copied</key>
<string>已複製</string>
+ <key>wasdk_payment_center</key>
+ <string>儲值中心</string>
+ <key>wasdk_pay_way_title</key>
+ <string>充值流程</string>
+ <key>wasdk_pay_way_1</key>
+ <string>1、點擊下面的按鈕複製網址</string>
+ <key>wasdk_pay_way_2</key>
+ <string>2. 打開手機瀏覽器，粘貼網址並訪問
+即可以更優惠的價格購買</string>
+ <key>wasdk_short_link_dated_alert</key>
+ <string>鏈接有效期為5分鐘，逾時需重新獲取</string>
</dict>
</plist>
--
Gitblit v1.8.0