From b3cda8276941bfdfc142305933ceb0ac39641b7e Mon Sep 17 00:00:00 2001
From: hank <hank.zhang@proficientcity.com>
Date: Thu, 30 Aug 2018 09:11:58 +0800
Subject: [PATCH] 添加V3.7.0
---
localizable/en.plist | 18 ++++++
frameworks/WACommon.framework/Headers/WAWebViewController.h | 16 +++++
frameworks/WACommon.framework/Headers/WAWebProgressView.h | 26 ++++++++
localizable/ru.plist | 16 +++++
frameworks/WASdkImpl.framework/WASdkImpl | 0
config/wa_sdk_impl_config_winga.xml | 2
frameworks/WACommon.framework/WACommon | 0
localizable/base.plist | 22 ++++++
frameworks/WASdkImpl.framework/Headers/WASdkImpl.h | 2
localizable/es.plist | 16 +++++
bundle/WASDK-Resource.bundle/wasdk-check-box-nor@2x.png | 0
bundle/WASDK-Resource.bundle/wasdk-check-box-select@2x.png | 0
localizable/pt-BR.plist | 16 +++++
WASdkImpl.podspec | 4
frameworks/WACommon.framework/Headers/WACommon.h | 4 +
localizable/zh-Hans.plist | 18 ++++++
16 files changed, 153 insertions(+), 7 deletions(-)
diff --git a/WASdkImpl.podspec b/WASdkImpl.podspec
index f19db7a..c482d1d 100644
--- a/WASdkImpl.podspec
+++ b/WASdkImpl.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkImpl'
-s.version = '3.6.9'
+s.version = '3.7.0'
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.9' #此处添加私有库依赖
+s.dependency 'WASdkIntf', '~> 3.7.0' #此处添加私有库依赖
end
diff --git a/bundle/WASDK-Resource.bundle/wasdk-check-box-nor@2x.png b/bundle/WASDK-Resource.bundle/wasdk-check-box-nor@2x.png
new file mode 100755
index 0000000..0cdd7aa
--- /dev/null
+++ b/bundle/WASDK-Resource.bundle/wasdk-check-box-nor@2x.png
Binary files differ
diff --git a/bundle/WASDK-Resource.bundle/wasdk-check-box-select@2x.png b/bundle/WASDK-Resource.bundle/wasdk-check-box-select@2x.png
new file mode 100755
index 0000000..eefb414
--- /dev/null
+++ b/bundle/WASDK-Resource.bundle/wasdk-check-box-select@2x.png
Binary files differ
diff --git a/config/wa_sdk_impl_config_winga.xml b/config/wa_sdk_impl_config_winga.xml
index d368ec5..9505531 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.9"/>
+ <version val="WA3.7.0"/>
<comps>
<!-- 用户模块 -->
<comp module="USR" plaf="WINGA" mandatory="YES" value="WASdkUser" desc="WINGA用户账户"/>
diff --git a/frameworks/WACommon.framework/Headers/WACommon.h b/frameworks/WACommon.framework/Headers/WACommon.h
index 8c400a5..904b474 100644
--- a/frameworks/WACommon.framework/Headers/WACommon.h
+++ b/frameworks/WACommon.framework/Headers/WACommon.h
@@ -24,6 +24,8 @@
//#import <WACommon/WACommon.h>
#import <WACommon/WADevice.h>
#import <WACommon/WAReachability.h>
+#import <WACommon/WAWebProgressView.h>
+#import <WACommon/WAWebViewController.h>
-//time:2018/06/21 10:24
+//time:2018/08/27 14:44
diff --git a/frameworks/WACommon.framework/Headers/WAWebProgressView.h b/frameworks/WACommon.framework/Headers/WAWebProgressView.h
new file mode 100644
index 0000000..8543437
--- /dev/null
+++ b/frameworks/WACommon.framework/Headers/WAWebProgressView.h
@@ -0,0 +1,26 @@
+//
+// WAWebProgressView.h
+// WAWebPayImplUI
+//
+// Created by hank on 16/4/29.
+// Copyright © 2016年 hank. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface WAWebProgressView : UIView
+
+/** 进度值 */
+@property (nonatomic, assign) CGFloat progress;
+/** 背景颜色 */
+@property (nonatomic, strong) UIColor *backgroundColor;
+/** 进度颜色 */
+@property (nonatomic, strong) UIColor *progressColor;
+
+/** 开启网页自动进度效果 */
+- (void)startAnimation;
+
+/** 关闭网页自动进度效果 */
+- (void)stopAnimation;
+
+@end
diff --git a/frameworks/WACommon.framework/Headers/WAWebViewController.h b/frameworks/WACommon.framework/Headers/WAWebViewController.h
new file mode 100644
index 0000000..656edad
--- /dev/null
+++ b/frameworks/WACommon.framework/Headers/WAWebViewController.h
@@ -0,0 +1,16 @@
+//
+// WAWebViewController.h
+// WACommon
+//
+// Created by hank on 2018/8/23.
+// Copyright © 2018年 GHW-T-01. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface WAWebViewController : UIViewController
+
+@property (nonatomic, strong) NSString *url;
+@property (nonatomic, copy) void(^handler)(BOOL isClose);
+
+@end
diff --git a/frameworks/WACommon.framework/WACommon b/frameworks/WACommon.framework/WACommon
index ff7f765..c194ba0 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 aaec1b7..d8935f6 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/06/21 10:26 ver:3.6.9
+//time:2018/08/28 12:07 ver:3.7.0
diff --git a/frameworks/WASdkImpl.framework/WASdkImpl b/frameworks/WASdkImpl.framework/WASdkImpl
index 5bf9ddd..be15dfc 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 2ccc14a..d40b199 100644
--- a/localizable/base.plist
+++ b/localizable/base.plist
@@ -101,8 +101,26 @@
<key>wasdk_login_instagram</key>
<string>Instagram</string>
<key>wasdk_tip_bind_closed</key>
- <string>Failed to bind</string>
+ <string>Failed to bind.</string>
<key>wasdk_tip_unbind_closed</key>
- <string>wasdk_tip_unbind_close</string>
+ <string>Failed to unbind. </string>
+ <key>wasdk_loading_error</key>
+ <string>Failed to Loading.</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>
+ <key>wasdk_privacy_view details</key>
+ <string>Tap to view details</string>
+ <key>wasdk_no_agree</key>
+ <string>I do not agree</string>
+ <key>wasdk_agree</key>
+ <string>I agree</string>
+ <key>wasdk_privacy_policy_agree</key>
+ <string>I have read and agree</string>
+ <key>wasdk_please_agree_privacy_policy</key>
+ <string>Please agree to the Privacy Policy first.</string>
</dict>
</plist>
diff --git a/localizable/en.plist b/localizable/en.plist
index 00149cb..d40b199 100644
--- a/localizable/en.plist
+++ b/localizable/en.plist
@@ -104,5 +104,23 @@
<string>Failed to bind.</string>
<key>wasdk_tip_unbind_closed</key>
<string>Failed to unbind. </string>
+ <key>wasdk_loading_error</key>
+ <string>Failed to Loading.</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>
+ <key>wasdk_privacy_view details</key>
+ <string>Tap to view details</string>
+ <key>wasdk_no_agree</key>
+ <string>I do not agree</string>
+ <key>wasdk_agree</key>
+ <string>I agree</string>
+ <key>wasdk_privacy_policy_agree</key>
+ <string>I have read and agree</string>
+ <key>wasdk_please_agree_privacy_policy</key>
+ <string>Please agree to the Privacy Policy first.</string>
</dict>
</plist>
diff --git a/localizable/es.plist b/localizable/es.plist
index d1ec999..ad50a89 100644
--- a/localizable/es.plist
+++ b/localizable/es.plist
@@ -104,5 +104,21 @@
<string>Error al enlazar</string>
<key>wasdk_tip_unbind_closed</key>
<string>Error al desenlazar</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>
+ <key>wasdk_privacy_view details</key>
+ <string>Pulsa para ver más detalles</string>
+ <key>wasdk_no_agree</key>
+ <string>No acepto</string>
+ <key>wasdk_agree</key>
+ <string>Sí acepto</string>
+ <key>wasdk_privacy_policy_agree</key>
+ <string>Lo he leído y estoy de acuerdo</string>
+ <key>wasdk_please_agree_privacy_policy</key>
+ <string>Acepta la Política de Privacidad para continuar.</string>
</dict>
</plist>
diff --git a/localizable/pt-BR.plist b/localizable/pt-BR.plist
index 68e627b..9cd91a4 100644
--- a/localizable/pt-BR.plist
+++ b/localizable/pt-BR.plist
@@ -102,5 +102,21 @@
<string>Falha ao vincular</string>
<key>wasdk_tip_unbind_closed</key>
<string>Falha ao desvincular</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>
+ <key>wasdk_privacy_view details</key>
+ <string>Toque para ver os detalhes</string>
+ <key>wasdk_no_agree</key>
+ <string>Discordo</string>
+ <key>wasdk_agree</key>
+ <string>Concordo</string>
+ <key>wasdk_privacy_policy_agree</key>
+ <string>Li e concordo</string>
+ <key>wasdk_please_agree_privacy_policy</key>
+ <string>Por favor, concorde com a Política de Privacidade Primeiro.</string>
</dict>
</plist>
diff --git a/localizable/ru.plist b/localizable/ru.plist
index 3a3eae8..b4c0491 100644
--- a/localizable/ru.plist
+++ b/localizable/ru.plist
@@ -104,5 +104,21 @@
<string>Не удалось выполнить привязку</string>
<key>wasdk_tip_unbind_closed</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>
+ <key>wasdk_privacy_view details</key>
+ <string>Нажмите для просмотра сведений.</string>
+ <key>wasdk_no_agree</key>
+ <string>Не согласен</string>
+ <key>wasdk_agree</key>
+ <string>Согласен</string>
+ <key>wasdk_privacy_policy_agree</key>
+ <string>Я прочел и принимаю соглашение</string>
+ <key>wasdk_please_agree_privacy_policy</key>
+ <string>Пожалуйста, согласитесь с Политикой конфиденциальности.</string>
</dict>
</plist>
diff --git a/localizable/zh-Hans.plist b/localizable/zh-Hans.plist
index 50408e8..2f9b7cd 100644
--- a/localizable/zh-Hans.plist
+++ b/localizable/zh-Hans.plist
@@ -104,5 +104,23 @@
<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>
+ <key>wasdk_privacy_view details</key>
+ <string>点击查看隐私政策详情</string>
+ <key>wasdk_no_agree</key>
+ <string>拒绝</string>
+ <key>wasdk_agree</key>
+ <string>同意</string>
+ <key>wasdk_privacy_policy_agree</key>
+ <string>我已经详细阅读并同意</string>
+ <key>wasdk_please_agree_privacy_policy</key>
+ <string>请先同意本产品隐私政策</string>
</dict>
</plist>
--
Gitblit v1.8.0