From b11815c559e71a6e69d16f07a27592fbed67bc9f Mon Sep 17 00:00:00 2001
From: lipengwei <lipengwei@nianben.com>
Date: Thu, 09 Apr 2020 10:49:54 +0800
Subject: [PATCH] 2.0.0
---
frameworks/WASdkIntf.framework/Headers/WAUserProxy.h | 20 ++++++++++
WASdkIntf_CN.podspec | 2
frameworks/WASdkIntf.framework/WASdkIntf | 0
frameworks/WASdkIntf.framework/Headers/WAIUser.h | 4 ++
frameworks/WASdkIntf.framework/Headers/WAAccount.h | 5 ++
frameworks/WASdkIntf.framework/Headers/WAConstants.h | 24 ++++++++++++
WASdkIntf_CN/2.0.0/WASdkIntf_CN.podspec | 23 +++++++++++
frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 2
frameworks/WASdkIntf.framework/Headers/WALoginResult.h | 6 +++
frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h | 7 +++
10 files changed, 90 insertions(+), 3 deletions(-)
diff --git a/WASdkIntf_CN.podspec b/WASdkIntf_CN.podspec
index 699fa3b..9c61c55 100644
--- a/WASdkIntf_CN.podspec
+++ b/WASdkIntf_CN.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkIntf_CN'
-s.version = '1.5.0'
+s.version = '2.0.0'
s.summary = 'WASdkIntf_CN framework in testing environment.'
s.license = 'MIT'
s.author = { "Hank" => "hank.zhang@gamehollywood.com" }
diff --git a/WASdkIntf_CN/2.0.0/WASdkIntf_CN.podspec b/WASdkIntf_CN/2.0.0/WASdkIntf_CN.podspec
new file mode 100644
index 0000000..9c61c55
--- /dev/null
+++ b/WASdkIntf_CN/2.0.0/WASdkIntf_CN.podspec
@@ -0,0 +1,23 @@
+#
+# Be sure to run `pod spec lint WASdkIntf.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 = 'WASdkIntf_CN'
+s.version = '2.0.0'
+s.summary = 'WASdkIntf_CN framework in testing environment.'
+s.license = 'MIT'
+s.author = { "Hank" => "hank.zhang@gamehollywood.com" }
+s.homepage = 'http://repo.wingsdk.cn:8082/summary/WASdkIntf_CN.git'
+s.source = { :git => "http://admin@repo.wingsdk.cn:8082/r/WASdkIntf_CN.git" , :tag => s.version}
+s.platform = :ios
+s.ios.deployment_target = "7.0"
+s.vendored_frameworks = 'frameworks/WASdkIntf.framework'
+s.resources = ['config/*.plist']
+s.requires_arc = true
+end
\ No newline at end of file
diff --git a/frameworks/WASdkIntf.framework/Headers/WAAccount.h b/frameworks/WASdkIntf.framework/Headers/WAAccount.h
index 572d4de..9c50b95 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAAccount.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAAccount.h
@@ -16,10 +16,15 @@
@abstract 第三方平台openId
*/
@property(nonatomic,copy)NSString* pUserId;//第三方平台openId
+
/*!
@abstract 绑定平台标识 FACEBOOK、APPLE、WINGA
*/
@property(nonatomic,copy)NSString* platform;
+
+@property (nonatomic, strong) NSString *mobile;//wa平台才有此字段
+
+
+(WAAccount*)parserWithDict:(NSDictionary*)dict;
+(NSArray*)parserWithArray:(NSArray*)arr;
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAConstants.h b/frameworks/WASdkIntf.framework/Headers/WAConstants.h
index 2618aa1..3abbfc0 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAConstants.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAConstants.h
@@ -32,6 +32,19 @@
extern NSString *const WA_PLATFORM_BOACOMPRA;
extern NSString *const WA_PLATFORM_VK;
extern NSString *const WA_PLATFORM_WECHAT;
+extern NSString *const WA_PLATFORM_QQ;
+extern NSString *const WA_PLATFORM_SIGNINWITHAPPLE;
+
+
+
+extern NSString *const WA_PLATFORM_QQ_CN_NAME;
+extern NSString *const WA_PLATFORM_SIGNINWITHAPPLE_CN_NAME;
+extern NSString *const WA_PLATFORM_WECHAT_CN_NAME;
+extern NSString *const WA_PLATFORM_WINGA_CN_NAME;
+
+
+
+
extern NSString *const WA_PLATFORM_HUP;
extern NSString *const WA_PLATFORM_APW;
extern NSString *const WA_PLATFORM_PUSH;
@@ -90,6 +103,17 @@
extern const int WA_SDK_TYPE_FR; // 国外
extern const int WA_SDK_TYPE_CN; // 国内
+
+// qq登录通知
+extern NSString *const WAQQLoginSuccessedNSNotification;
+extern NSString *const WAQQkLoginFailedNSNotificationName;
+extern NSString *const WAQQkLoginCancelledNSNotificationName;
+extern NSString *const WAQQkGetUnionIDNSNotificationName;
+extern NSString *const WAQQkLogoutSuccessedNSNotificationName;
+
+
+
+
@interface WAConstants : NSObject {
}
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIUser.h b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
index 839d6e7..673dd56 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAIUser.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
@@ -57,4 +57,8 @@
- (void)showUserCenterNoticeUI:(id<WAUserCenterNoticeUIDelegate>)delegate;
-(void)queryUserCertificationInfo:(void(^)(WACertificationInfo *certificationInfo,NSError *error))callBackBlock;
+
+//查询是否已绑定第三方账号 (国内)
+-(BOOL)isBoundPlatformAccount;
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WALoginResult.h b/frameworks/WASdkIntf.framework/Headers/WALoginResult.h
index 0168098..172c0d1 100644
--- a/frameworks/WASdkIntf.framework/Headers/WALoginResult.h
+++ b/frameworks/WASdkIntf.framework/Headers/WALoginResult.h
@@ -40,6 +40,12 @@
@abstract 第三方平台token(当GUEST登录时为空，当Apple登录时,实际上是将extends转化为NSString)
*/
@property(copy,nonatomic)NSString *pToken;
+
+/*!
+@abstract 第三方平台的刷新refresh_token,如微信
+*/
+@property(copy,nonatomic)NSString *refresh_token;
+
/*!
@abstract 当APPLE登录时有值,否则为空
*/
diff --git a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
index 650b5e7..38730f2 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
@@ -26,7 +26,7 @@
@property(nonatomic,copy)NSString* userAgreementUrl;
@property(nonatomic,strong)NSNumber* uploadPurchaseLog;
@property(nonatomic) NSInteger adVideoCacheCount;
-@property(nonatomic) NSInteger enableBindAccount; // 绑定： 0-关闭， 1-打开
+@property(nonatomic) NSInteger enableBindAccount; // 绑定： 0-关闭， 1-打开 2-强制绑定（国内）
@property(nonatomic) NSInteger enableUnBindAccount; // 解绑： 0-关闭，1-打开
@property(nonatomic,copy)NSString* privacyUrl; // 用户协议url
@property(nonatomic,copy)NSString* privacyUpdateTime; // 用户协议更新时间
@@ -34,6 +34,11 @@
@property(nonatomic)NSInteger isOpenKefu; // 是否开启客服 0 关闭 1 启动机器人客服聊天界面 2 启动人工客服聊天界面 3 启动运营界面 4 展示全部FAQ菜单 5 展示全部FAQ菜单(无机器人客服)
@property (nonatomic, copy) NSDictionary *paymentTip; //付款信息提示 (complete:提示语字段的key)
@property(nonatomic)NSInteger logEventControl; // 事件日志开关 0 关闭 1 全部打开 2 仅android打开 3 仅ios打开
+@property(nonatomic)NSInteger loginRna; // 0 - 关闭，登录后不弹实名认证。 1 - 开启并强制 2开启不强制
+@property(nonatomic)NSInteger paymentRna; // 0 - 关闭，下单前不弹出实名认证。 1 - 开启并强制 2开启不强制
+
+@property(nonatomic)NSInteger autoGuestLogin; // 游客自动登录开关 0 - 开启， 1 - 关闭
+@property(nonatomic)NSInteger guestLoginBindAlert; // 游客登录绑定提醒 0 - 关闭， 1 - 开启
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
index fe2bc53..1f88705 100644
--- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
+++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
@@ -68,4 +68,4 @@
// In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h>
-//time:2020/03/05 09:15 ver:1.5.0
+//time:2020/04/05 09:15 ver:2.0.0
diff --git a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
index ec284ec..69d6f50 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
@@ -93,6 +93,9 @@
-(void)loginViewDidCancel:(WALoginResult*)result;
@end
+
+
+
/*!
@discussion 账号管理界面协议
- - -
@@ -110,6 +113,12 @@
@param result 切换账户的账户信息
*/
-(void)switchAcctDidCompleteWithResult:(WALoginResult*)result;
+
+/*!
+@abstract 绑定账号回调接口
+@param bindResult 绑定账号信息
+*/
+-(void)bindAccountDidCompleteWithResult:(WABindingResult*)bindResult;
@end
/*!
@@ -227,6 +236,17 @@
*/
+(void)openAccountManager:(id<WAAcctManagerDelegate>)delegate;
+
+/*!
+@abstract 调用此方法打开账户管理界面
+@param delegate 委托
+*/
++(void)openAccountCenter:(id<WAAcctManagerDelegate>)delegate;
+
+
+
+
++(BOOL)isBoundPlatformAccount;
/*!
@abstract 获取账户信息
@param platform 平台
diff --git a/frameworks/WASdkIntf.framework/WASdkIntf b/frameworks/WASdkIntf.framework/WASdkIntf
index bca624e..64d629a 100644
--- a/frameworks/WASdkIntf.framework/WASdkIntf
+++ b/frameworks/WASdkIntf.framework/WASdkIntf
Binary files differ
--
Gitblit v1.8.0