From 3eecf8888b30c1f97815ed7a2c17257d26e12f55 Mon Sep 17 00:00:00 2001
From: lipengwei <lipengwei@nianben.com>
Date: Thu, 09 Apr 2020 10:49:19 +0800
Subject: [PATCH] 2.0.0
---
WASdkImpl_CN.podspec | 4 ++--
bundle/WASDK-Resource.bundle/wasdk-bind-icon-wx.png | 0
frameworks/WACommon.framework/Headers/WACommConstants.h | 8 ++++++++
frameworks/WASdkImpl.framework/Headers/WASdkAccountBinding.h | 6 ++++++
frameworks/WASdkImpl.framework/WASdkImpl | 0
bundle/WASDK-Resource.bundle/wasdk-bind-icon-qq.png | 0
frameworks/WACommon.framework/Headers/WAHttpHelper.h | 5 +++++
config/wa_sdk_impl_config_winga.xml | 2 +-
frameworks/WACommon.framework/WACommon | 0
frameworks/WASdkImpl.framework/Headers/WASdkImpl.h | 2 +-
frameworks/WASdkImpl.framework/Info.plist | 0
WASdkImpl_CN/2.0.0/WASdkImpl_CN.podspec | 26 ++++++++++++++++++++++++++
frameworks/WACommon.framework/Headers/WACommon.h | 2 +-
bundle/WASDK-Resource.bundle/wasdk-bind-icon-signinwithapple.png | 0
14 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/WASdkImpl_CN.podspec b/WASdkImpl_CN.podspec
index 77ddb5c..3b11511 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.5.0'
+s.version = '2.0.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.5.0'
+s.dependency 'WASdkIntf_CN', '~> 2.0.0'
end
\ No newline at end of file
diff --git a/WASdkImpl_CN/2.0.0/WASdkImpl_CN.podspec b/WASdkImpl_CN/2.0.0/WASdkImpl_CN.podspec
new file mode 100644
index 0000000..3b11511
--- /dev/null
+++ b/WASdkImpl_CN/2.0.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 = '2.0.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', '~> 2.0.0'
+
+end
\ No newline at end of file
diff --git a/bundle/WASDK-Resource.bundle/wasdk-bind-icon-qq.png b/bundle/WASDK-Resource.bundle/wasdk-bind-icon-qq.png
new file mode 100644
index 0000000..004b970
--- /dev/null
+++ b/bundle/WASDK-Resource.bundle/wasdk-bind-icon-qq.png
Binary files differ
diff --git a/bundle/WASDK-Resource.bundle/wasdk-bind-icon-signinwithapple.png b/bundle/WASDK-Resource.bundle/wasdk-bind-icon-signinwithapple.png
new file mode 100644
index 0000000..200b42d
--- /dev/null
+++ b/bundle/WASDK-Resource.bundle/wasdk-bind-icon-signinwithapple.png
Binary files differ
diff --git a/bundle/WASDK-Resource.bundle/wasdk-bind-icon-wx.png b/bundle/WASDK-Resource.bundle/wasdk-bind-icon-wx.png
new file mode 100644
index 0000000..3a97ffa
--- /dev/null
+++ b/bundle/WASDK-Resource.bundle/wasdk-bind-icon-wx.png
Binary files differ
diff --git a/config/wa_sdk_impl_config_winga.xml b/config/wa_sdk_impl_config_winga.xml
index 7a2d448..85e9a2d 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.5.0"/>
+ <version val="WA2.0.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 1845de4..f8ce233 100644
--- a/frameworks/WACommon.framework/Headers/WACommConstants.h
+++ b/frameworks/WACommon.framework/Headers/WACommConstants.h
@@ -11,6 +11,7 @@
#ifndef WASDK_GHWConstants_h
#define WASDK_GHWConstants_h
+#define WAWS(weakSelf) __weak __typeof(self)weakSelf = self;
@@ -79,6 +80,8 @@
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_EXTRA_APPLEAUTHORIZATIONCODE;
+
extern NSString *const WASDK_PARAM_KEY_COLLECTION_INFO;
extern NSString *const WASDK_PARAM_KEY_SDKEXTINFO;
@@ -294,6 +297,11 @@
extern NSString *const WASDK_CACHE_KEY_FB_APP_SECRET;
+
+
+
+
+
@interface WACommConstants : NSObject {
}
diff --git a/frameworks/WACommon.framework/Headers/WACommon.h b/frameworks/WACommon.framework/Headers/WACommon.h
index a5256e6..c6acd62 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/03/05 09:16 ver:1.5.0
+//time:2020/04/05 09:16 ver:2.0.0
diff --git a/frameworks/WACommon.framework/Headers/WAHttpHelper.h b/frameworks/WACommon.framework/Headers/WAHttpHelper.h
index 22f6c4c..e59494b 100755
--- a/frameworks/WACommon.framework/Headers/WAHttpHelper.h
+++ b/frameworks/WACommon.framework/Headers/WAHttpHelper.h
@@ -68,4 +68,9 @@
-(NSMutableURLRequest *) buildPostRequestToURL:(NSString *)aUrl withParameters:(NSDictionary *)params;
-(NSMutableURLRequest *) buildGetRequestToURL:(NSString *)aUrl withParameters:(NSDictionary *)params;
-(NSString *) getParamStringFromParams:(NSDictionary *)params;
+
+//针对打开网页支付时，直接使用get请求
+-(NSMutableURLRequest *) buildWebRequestToURL:(NSString *)aUrl withParameters:(NSDictionary *)params;
+
+
@end
diff --git a/frameworks/WACommon.framework/WACommon b/frameworks/WACommon.framework/WACommon
index 176aec2..9c63b42 100644
--- a/frameworks/WACommon.framework/WACommon
+++ b/frameworks/WACommon.framework/WACommon
Binary files differ
diff --git a/frameworks/WASdkImpl.framework/Headers/WASdkAccountBinding.h b/frameworks/WASdkImpl.framework/Headers/WASdkAccountBinding.h
index a68fdec..b0303e5 100644
--- a/frameworks/WASdkImpl.framework/Headers/WASdkAccountBinding.h
+++ b/frameworks/WASdkImpl.framework/Headers/WASdkAccountBinding.h
@@ -22,4 +22,10 @@
+(void)queryBindedAccountWithCompleteBlock:(void(^)(NSError* error,NSArray* accounts))block;
+(void)unBindAccount:(WAAccount*)account block:(void(^)(NSError* error))block;
+(void)unBindAccount:(NSString*)platform userId:(NSString*)pUserId block:(void(^)(NSError* error))block;
+
+
++(void)bindingCNAccountWithPlatform:(NSString *)platform bindingResult:(WABindingResult*)bindingResult extInfo:(NSString *)extInfo delegate:(id<WAAccountBindingDelegate>)delegate;
+
+//查询国内sdk绑定列表
++(void)queryCNBindedThirdPartyAccountWithCompleteBlock:(void(^)(NSError* error,NSArray<WAAccount *>* accounts))block;
@end
diff --git a/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h b/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h
index f164a3b..c7daa6f 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/03/05 09:16 ver:1.5.0
+//time:2020/04/08 09:16 ver:2.0.0
diff --git a/frameworks/WASdkImpl.framework/Info.plist b/frameworks/WASdkImpl.framework/Info.plist
index 6c3e88e..5d9330f 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 af24ab6..bc1e142 100644
--- a/frameworks/WASdkImpl.framework/WASdkImpl
+++ b/frameworks/WASdkImpl.framework/WASdkImpl
Binary files differ
--
Gitblit v1.8.0