From 15fc5bb4e6bc039bcb908ac0c4c3cb168da1f211 Mon Sep 17 00:00:00 2001
From: lipengwei <lipengwei@nianben.com>
Date: Wed, 04 Mar 2020 21:36:23 +0800
Subject: [PATCH] 1.5.0
---
WASdkImpl_CN.podspec | 4 ++--
frameworks/WACommon.framework/Headers/WACommConstants.h | 14 ++++++++++++++
WASdkImpl_CN/1.5.0/WASdkImpl_CN.podspec | 26 ++++++++++++++++++++++++++
frameworks/WASdkImpl.framework/WASdkImpl | 0
frameworks/WACommon.framework/WACommon | 0
config/wa_sdk_impl_config_winga.xml | 2 +-
frameworks/WACommon.framework/Headers/WACommon.h | 2 +-
frameworks/WASdkImpl.framework/Headers/WASdkImpl.h | 2 +-
8 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/WASdkImpl_CN.podspec b/WASdkImpl_CN.podspec
index f530764..77ddb5c 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.4.0'
+s.version = '1.5.0'
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.4.0'
+s.dependency 'WASdkIntf_CN', '~> 1.5.0'
end
\ No newline at end of file
diff --git a/WASdkImpl_CN/1.5.0/WASdkImpl_CN.podspec b/WASdkImpl_CN/1.5.0/WASdkImpl_CN.podspec
new file mode 100644
index 0000000..77ddb5c
--- /dev/null
+++ b/WASdkImpl_CN/1.5.0/WASdkImpl_CN.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_CN'
+s.version = '1.5.0'
+s.summary = 'WASdkImpl_CN framework in testing environment.'
+s.license = 'MIT'
+s.author = { "Hank" => "hank.zhang@gamehollywood.com" }
+s.homepage = 'http://repo.wingsdk.cn:8082/summary/WASdkImpl_CN.git'
+s.source = { :git => "http://admin@repo.wingsdk.cn:8082/r/WASdkImpl_CN.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_CN', '~> 1.5.0'
+
+end
\ No newline at end of file
diff --git a/config/wa_sdk_impl_config_winga.xml b/config/wa_sdk_impl_config_winga.xml
index d47f400..7a2d448 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.4.0"/>
+ <version val="WA1.5.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 05f3106..1845de4 100644
--- a/frameworks/WACommon.framework/Headers/WACommConstants.h
+++ b/frameworks/WACommon.framework/Headers/WACommConstants.h
@@ -78,6 +78,8 @@
extern NSString *const WASDK_PARAM_KEY_CURRENCY_CODE;
extern NSString *const WASDK_PARAM_KEY_EXT_INFO;
extern NSString *const WASDK_PARAM_KEY_EXTRA;
+extern NSString *const WASDK_PARAM_KEY_EXT_VERIFYINFO;
+
extern NSString *const WASDK_PARAM_KEY_COLLECTION_INFO;
extern NSString *const WASDK_PARAM_KEY_SDKEXTINFO;
extern NSString *const WASDK_PARAM_KEY_ORDER_AMOUNT_MICROS;
@@ -88,6 +90,8 @@
extern NSString *const WASDK_PARAM_KEY_IAP_URL_CREATE_ORDER;
extern NSString *const WASDK_PARAM_KEY_IAP_URL_NOTIFY_SERVER;
extern NSString *const WASDK_PARAM_KEY_SEND_SEQ;
+extern NSString *const WASDK_PARAM_KEY_APPLE_ABNORMAL;
+
extern NSString *const WASDK_PARAM_KEY_QUERY_TYPE;
extern NSString *const WASDK_PARAM_KEY_IS_REPORTDATA;
@@ -127,6 +131,12 @@
extern NSString *const WASDK_RESULT_KEY_IAP_DEF_CCY;
extern NSString *const WASDK_RESULT_KEY_IAP_VCA;
extern NSString *const WASDK_RESULT_KEY_IAP_VCCY;
+
+
+
+
+
+
//热更新
extern NSString *const WASDK_HUP_KEY_PATCH_VERSION;
@@ -173,6 +183,10 @@
extern NSString *const WASDK_IAP_URL_FINISH_TRANSACTION;
extern NSString *const WASDK_IAP_URL_NOTIFY_SERVER;
extern NSString *const WASDK_IAP_URL_CREATE_ORDER;
+// 20200229
+extern NSString *const WASDK_IAP_URL_APPLE_LAST_ORDER;
+extern NSString *const WASDK_IAP_URL_APPLE_ABNORMAL_NOTIFY_SERVER;
+
extern NSString *const WASDK_REFRESH_TOKEN;
extern NSString *const WASDK_LOGIN_WAY;
extern NSString *const WASDK_ONE_CLICK_SIGIN;
diff --git a/frameworks/WACommon.framework/Headers/WACommon.h b/frameworks/WACommon.framework/Headers/WACommon.h
index 37d5f91..a5256e6 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/01/08 09:16 ver:1.4.0
+//time:2020/03/05 09:16 ver:1.5.0
diff --git a/frameworks/WACommon.framework/WACommon b/frameworks/WACommon.framework/WACommon
index 45e8fe4..176aec2 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 39c8be1..f164a3b 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/01/08 09:16 ver:1.4.0
+//time:2020/03/05 09:16 ver:1.5.0
diff --git a/frameworks/WASdkImpl.framework/WASdkImpl b/frameworks/WASdkImpl.framework/WASdkImpl
index fbaf615..6b76265 100644
--- a/frameworks/WASdkImpl.framework/WASdkImpl
+++ b/frameworks/WASdkImpl.framework/WASdkImpl
Binary files differ
--
Gitblit v1.8.0