From e1442476dcb9fb4f46d8aac700adc6392b249317 Mon Sep 17 00:00:00 2001
From: lpw <lpw@lpwdeMac-mini.local>
Date: Tue, 09 Jan 2024 14:55:23 +0800
Subject: [PATCH] 3.17.0
---
frameworks/WASdkImpl.framework/Modules/module.modulemap | 2
localizable/en.plist | 8 ++
frameworks/WACommon.framework/Headers/WACommConstants.h | 3
/dev/null | 18 ------
localizable/ru.plist | 8 ++
localizable/id.plist | 8 ++
frameworks/WACommon.framework/Modules/module.modulemap | 2
frameworks/WASdkImpl.framework/WASdkImpl | 0
config/wa_sdk_impl_config_winga.xml | 2
frameworks/WACommon.framework/WACommon | 0
localizable/base.plist | 8 ++
frameworks/WASdkImpl.framework/Headers/WASdkImpl.h | 2
frameworks/WASdkImpl.framework/Info.plist | 0
WASdkImpl/3.17.0/WASdkImpl.podspec | 26 ++++++++
localizable/es.plist | 8 ++
frameworks/WACommon.framework/Info.plist | 0
localizable/pt-BR.plist | 8 ++
WASdkImpl.podspec | 2
frameworks/WACommon.framework/Headers/WACommon.h | 2
localizable/zh-Hant.plist | 8 ++
localizable/zh-Hans.plist | 8 ++
localizable/th.plist | 8 ++
22 files changed, 105 insertions(+), 26 deletions(-)
diff --git a/WASdkImpl.podspec b/WASdkImpl.podspec
index d093f9e..411024c 100644
--- a/WASdkImpl.podspec
+++ b/WASdkImpl.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkImpl'
-s.version = '3.16.0'
+s.version = '3.17.0'
s.summary = 'WASdkImpl framework in production environment.'
s.license = 'MIT'
s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
diff --git a/WASdkImpl/3.17.0/WASdkImpl.podspec b/WASdkImpl/3.17.0/WASdkImpl.podspec
new file mode 100644
index 0000000..411024c
--- /dev/null
+++ b/WASdkImpl/3.17.0/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.17.0'
+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 04656c2..e4bc9fb 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.16.0"/>
+ <version val="WA3.17.0"/>
<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 3b8f46b..80a55b8 100644
--- a/frameworks/WACommon.framework/Headers/WACommConstants.h
+++ b/frameworks/WACommon.framework/Headers/WACommConstants.h
@@ -238,8 +238,7 @@
// 获取产品及支付方式列表
extern NSString *const WASDK_PAY_URL_PRODUCTS;
-// 提交web支付
-extern NSString *const WASDK_PAY_URL_DO_PAY;
+
// web支付成功
extern NSString *const WASDK_PAY_URL_SUCCESS;
// web支付失败
diff --git a/frameworks/WACommon.framework/Headers/WACommon.h b/frameworks/WACommon.framework/Headers/WACommon.h
index 08f72b3..0a93121 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:2023/07/20 12:29 ver:3.16.0
+//time:2024/01/08 12:29 ver:3.17.0
diff --git a/frameworks/WACommon.framework/Info.plist b/frameworks/WACommon.framework/Info.plist
index b825c79..86e02b3 100644
--- a/frameworks/WACommon.framework/Info.plist
+++ b/frameworks/WACommon.framework/Info.plist
Binary files differ
diff --git a/frameworks/WACommon.framework/Modules/module.modulemap b/frameworks/WACommon.framework/Modules/module.modulemap
index e67d924..9ad38ec 100644
--- a/frameworks/WACommon.framework/Modules/module.modulemap
+++ b/frameworks/WACommon.framework/Modules/module.modulemap
@@ -1,6 +1,6 @@
framework module WACommon {
umbrella header "WACommon.h"
-
export *
+
module * { export * }
}
diff --git a/frameworks/WACommon.framework/WACommon b/frameworks/WACommon.framework/WACommon
index cf74d1d..ebc9d77 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 f9a19f3..23bfd14 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:2023/06/21 12:29 ver:3.16.0
+//time:2024/01/09 12:29 ver:3.17.0
// 2
diff --git a/frameworks/WASdkImpl.framework/Headers/WASdkLoginUI.h b/frameworks/WASdkImpl.framework/Headers/WASdkLoginUI.h
deleted file mode 100644
index 6081dda..0000000
--- a/frameworks/WASdkImpl.framework/Headers/WASdkLoginUI.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// WASDKLoginUI.h
-// WASDKUI
-//
-// Created by wuyx on 16/1/11.
-// Copyright © 2016年 GHW-T-01. All rights reserved.
-// 国外登录窗口
-
-#import <UIKit/UIKit.h>
-#import <WASdkIntf/WASdkIntf.h>
-#import <WACommon/WACommon.h>
-@interface WASdkLoginUI : UIControl
-@property(nonatomic,strong)NSArray* loginWays;
--(instancetype)initWithCacheEnabled:(BOOL)cacheEnabled;
--(void)login:(id<WALoginViewDelegate>)delegate;
--(void)hide;
--(void)isSwichUI;
-@end
diff --git a/frameworks/WASdkImpl.framework/Info.plist b/frameworks/WASdkImpl.framework/Info.plist
index e86fd49..4358c7e 100644
--- a/frameworks/WASdkImpl.framework/Info.plist
+++ b/frameworks/WASdkImpl.framework/Info.plist
Binary files differ
diff --git a/frameworks/WASdkImpl.framework/Modules/module.modulemap b/frameworks/WASdkImpl.framework/Modules/module.modulemap
index c9d6e92..9b8c0b6 100644
--- a/frameworks/WASdkImpl.framework/Modules/module.modulemap
+++ b/frameworks/WASdkImpl.framework/Modules/module.modulemap
@@ -1,6 +1,6 @@
framework module WASdkImpl {
umbrella header "WASdkImpl.h"
-
export *
+
module * { export * }
}
diff --git a/frameworks/WASdkImpl.framework/WASdkImpl b/frameworks/WASdkImpl.framework/WASdkImpl
index 15d9d3d..dc9133d 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 eadd779..66df20e 100644
--- a/localizable/base.plist
+++ b/localizable/base.plist
@@ -307,5 +307,13 @@
<string>Mobile number already exists!</string>
<key>wasdk_login_email_exists</key>
<string>Email already exists!</string>
+ <key>wasdk_more</key>
+ <string>MORE</string>
+ <key>wasdk_login_signupbyemail</key>
+ <string>Register with Email</string>
+ <key>wasdk_login_eamillogin_title</key>
+ <string>Email</string>
+ <key>wasdk_login_phonelogin_title</key>
+ <string>Phone Number</string>
</dict>
</plist>
diff --git a/localizable/en.plist b/localizable/en.plist
index ddeba6d..0026e36 100644
--- a/localizable/en.plist
+++ b/localizable/en.plist
@@ -307,5 +307,13 @@
<string>Mobile number already exists!</string>
<key>wasdk_login_email_exists</key>
<string>Email already exists!</string>
+ <key>wasdk_more</key>
+ <string>MORE</string>
+ <key>wasdk_login_signupbyemail</key>
+ <string>Register with Email</string>
+ <key>wasdk_login_eamillogin_title</key>
+ <string>Email</string>
+ <key>wasdk_login_phonelogin_title</key>
+ <string>Phone Number</string>
</dict>
</plist>
diff --git a/localizable/es.plist b/localizable/es.plist
index fe5a1a2..67b54a2 100644
--- a/localizable/es.plist
+++ b/localizable/es.plist
@@ -303,5 +303,13 @@
<string>¡El número de celular ya existe!</string>
<key>wasdk_login_email_exists</key>
<string>¡El correo electrónico ya existe!</string>
+ <key>wasdk_more</key>
+ <string>MÁS</string>
+ <key>wasdk_login_signupbyemail</key>
+ <string>Registrarse con Email</string>
+ <key>wasdk_login_eamillogin_title</key>
+ <string>Email</string>
+ <key>wasdk_login_phonelogin_title</key>
+ <string>Número de teléfono</string>
</dict>
</plist>
diff --git a/localizable/id.plist b/localizable/id.plist
index fcb7182..785df68 100644
--- a/localizable/id.plist
+++ b/localizable/id.plist
@@ -257,5 +257,13 @@
<string>Nomor ponsel sudah ada!</string>
<key>wasdk_login_email_exists</key>
<string>Email sudah ada!</string>
+ <key>wasdk_more</key>
+ <string>Rincian</string>
+ <key>wasdk_login_signupbyemail</key>
+ <string>Daftar dengan Email</string>
+ <key>wasdk_login_eamillogin_title</key>
+ <string>Email</string>
+ <key>wasdk_login_phonelogin_title</key>
+ <string>Nomor Telepon</string>
</dict>
</plist>
diff --git a/localizable/pt-BR.plist b/localizable/pt-BR.plist
index c3affcf..3bf089e 100644
--- a/localizable/pt-BR.plist
+++ b/localizable/pt-BR.plist
@@ -305,5 +305,13 @@
<string>Número de celular já existente!</string>
<key>wasdk_login_email_exists</key>
<string>E-mail já existente!</string>
+ <key>wasdk_more</key>
+ <string>Mais</string>
+ <key>wasdk_login_signupbyemail</key>
+ <string>Registrar com e-mail</string>
+ <key>wasdk_login_eamillogin_title</key>
+ <string>E-mail</string>
+ <key>wasdk_login_phonelogin_title</key>
+ <string>Número de telefone</string>
</dict>
</plist>
diff --git a/localizable/ru.plist b/localizable/ru.plist
index 52d6553..a716c04 100644
--- a/localizable/ru.plist
+++ b/localizable/ru.plist
@@ -257,5 +257,13 @@
<string>Номер мобильного уже существует!</string>
<key>wasdk_login_email_exists</key>
<string>E-mail уже существует!</string>
+ <key>wasdk_more</key>
+ <string>Еще</string>
+ <key>wasdk_login_signupbyemail</key>
+ <string>Регистрация по электронной почте</string>
+ <key>wasdk_login_eamillogin_title</key>
+ <string>Электронная почта</string>
+ <key>wasdk_login_phonelogin_title</key>
+ <string>Номер телефона</string>
</dict>
</plist>
diff --git a/localizable/th.plist b/localizable/th.plist
index 7bb74e3..5c1c899 100644
--- a/localizable/th.plist
+++ b/localizable/th.plist
@@ -243,5 +243,13 @@
<string>ไม่มีข้อมูล</string>
<key>wasdk_login_read_agree_agreement</key>
<string>ฉันได้อ่านและยอมรับข้อกำหนดในการให้บริการและนโยบายความเป็นส่วนตัว</string>
+ <key>wasdk_more</key>
+ <string>เพิ่มเติม</string>
+ <key>wasdk_login_signupbyemail</key>
+ <string>ลงทะเบียนด้วยอีเมล</string>
+ <key>wasdk_login_eamillogin_title</key>
+ <string>อีเมล</string>
+ <key>wasdk_login_phonelogin_title</key>
+ <string>หมายเลขโทรศัพท์</string>
</dict>
</plist>
diff --git a/localizable/zh-Hans.plist b/localizable/zh-Hans.plist
index 056bf78..5835c5f 100644
--- a/localizable/zh-Hans.plist
+++ b/localizable/zh-Hans.plist
@@ -311,5 +311,13 @@
<string>手机帐号已存在！</string>
<key>wasdk_login_email_exists</key>
<string>邮箱帐号已存在！</string>
+ <key>wasdk_more</key>
+ <string>更多</string>
+ <key>wasdk_login_signupbyemail</key>
+ <string>邮箱注册</string>
+ <key>wasdk_login_eamillogin_title</key>
+ <string>邮箱登录</string>
+ <key>wasdk_login_phonelogin_title</key>
+ <string>手机登录</string>
</dict>
</plist>
diff --git a/localizable/zh-Hant.plist b/localizable/zh-Hant.plist
index 8f45f62..6540d7d 100644
--- a/localizable/zh-Hant.plist
+++ b/localizable/zh-Hant.plist
@@ -305,5 +305,13 @@
<string>手機帳號已存在！</string>
<key>wasdk_login_email_exists</key>
<string>郵箱帳號已存在！</string>
+ <key>wasdk_more</key>
+ <string>更多</string>
+ <key>wasdk_login_signupbyemail</key>
+ <string>登入電郵注册</string>
+ <key>wasdk_login_eamillogin_title</key>
+ <string>電郵地址</string>
+ <key>wasdk_login_phonelogin_title</key>
+ <string>電話號碼</string>
</dict>
</plist>
--
Gitblit v1.8.0