From 0778041d2a66cbe29f2e6e99040df86c4c817c45 Mon Sep 17 00:00:00 2001
From: lpw
Date: Tue, 21 Jun 2022 09:19:55 +0800
Subject: [PATCH] 2.6.0
---
frameworks/WASdkIntf.framework/Headers/WAUserProxy.h | 70 ++++++++++++++++-
WASdkIntf_CN.podspec | 2
frameworks/WASdkIntf.framework/WASdkIntf | 0
frameworks/WASdkIntf.framework/Headers/WAIUser.h | 29 +++++++
WASdkIntf_CN/2.6.0/WASdkIntf_CN.podspec | 23 +++++
frameworks/WASdkIntf.framework/Headers/WAConstants.h | 9 ++
frameworks/WASdkIntf.framework/Headers/WADeleteResult.h | 18 ++++
frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 5 +
frameworks/WASdkIntf.framework/Info.plist | 0
frameworks/WASdkIntf.framework/Headers/WADeleteRequestModel.h | 24 ++++++
frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h | 5 +
11 files changed, 177 insertions(+), 8 deletions(-)
diff --git a/WASdkIntf_CN.podspec b/WASdkIntf_CN.podspec
index 1675d29..bd3ae59 100644
--- a/WASdkIntf_CN.podspec
+++ b/WASdkIntf_CN.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkIntf_CN'
-s.version = '2.5.0'
+s.version = '2.6.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.6.0/WASdkIntf_CN.podspec b/WASdkIntf_CN/2.6.0/WASdkIntf_CN.podspec
new file mode 100644
index 0000000..bd3ae59
--- /dev/null
+++ b/WASdkIntf_CN/2.6.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.6.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/WAConstants.h b/frameworks/WASdkIntf.framework/Headers/WAConstants.h
index d2c2f61..b14c9de 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAConstants.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAConstants.h
@@ -121,6 +121,15 @@
extern NSString *const WAPrivacyAgreementURL_ChildrenPrivacyPolicy; //儿童隐私协议
+extern NSString *const deleteAccountProtocolURL_EN; //账号删除协议
+extern NSString *const deleteAccountProtocolURL_CN; //账号删除协议
+
+//账号删除有关
+extern const int WA_ACCOUNT_DELETE_UI_CANCEL;
+extern const int WA_ACCOUNT_DELETE_UI_SUCCESS;
+extern const int WA_ACCOUNT_DELETE_UI_FAILURE; //调用失败，未开启删除权限或者未登录
+
+
@interface WAConstants : NSObject {
diff --git a/frameworks/WASdkIntf.framework/Headers/WADeleteRequestModel.h b/frameworks/WASdkIntf.framework/Headers/WADeleteRequestModel.h
new file mode 100644
index 0000000..34beb3d
--- /dev/null
+++ b/frameworks/WASdkIntf.framework/Headers/WADeleteRequestModel.h
@@ -0,0 +1,24 @@
+//
+// WADeleteRequestModel.h
+// WASdkIntf
+//
+// Created by lpw on 2022/6/9.
+// Copyright © 2022 GHW-T-01. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface WADeleteRequestModel : NSObject
+/*!
+ @abstract 删除平台(Facebook,Apple)
+ */
+@property(copy,nonatomic)NSString *deletePlatform;
+/*!
+ @abstract 删除平台accessToken
+ */
+@property(copy,nonatomic)NSString *deleteToken;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/frameworks/WASdkIntf.framework/Headers/WADeleteResult.h b/frameworks/WASdkIntf.framework/Headers/WADeleteResult.h
new file mode 100644
index 0000000..9ee789c
--- /dev/null
+++ b/frameworks/WASdkIntf.framework/Headers/WADeleteResult.h
@@ -0,0 +1,18 @@
+//
+// WADeleteResult.h
+// WASdkIntf
+//
+// Created by lpw on 2022/6/14.
+// Copyright © 2022 GHW-T-01. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface WADeleteResult : NSObject
+@property(copy,nonatomic)NSString *apply_date; //申请时间（游戏时区）
+@property(copy,nonatomic)NSString *delete_date; //注销时间（游戏时区）
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIUser.h b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
index 39c2894..a40bf7c 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAIUser.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
@@ -9,6 +9,7 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import "WAUserProxy.h"
+#import <WASdkIntf/WASdkIntf.h>
@interface WAIUser : NSObject
-(void)setLoginFlowType:(int)flowType;
-(int)getLoginFlowType;
@@ -17,6 +18,7 @@
-(void)logout;
-(void)bindingAccountWithExtInfo:(NSString*)extInfo delegate:(id<WAAccountBindingDelegate>)delegate;
-(void)bindingAccountWithPlatform:(NSString *const)platform bindingResult:(WABindingResult*)bindingResult extInfo:(NSString *)extInfo delegate:(id<WAAccountBindingDelegate>)delegate;
+
-(void)queryBoundAccountWithCompleteBlock:(void(^)(NSError* error,NSArray<WAAccount *>* accounts))block;
-(void)unBindAccountWithPlatform:(NSString *const)platform platformUserId:(NSString *)pUserId completeBlock:(void (^)(NSError *))completeBlock;
-(void)switchAccountWithPlatform:(NSString *const)platform completeBlock:(void (^)(NSError *, WALoginResult *))completeBlock;
@@ -105,4 +107,31 @@
- (void)openPrivacyAgreementWindow:(void(^)(NSError* error,NSUInteger status))block;
+
+
+
+//****************************************账号删除有关接口*********************************************************************
+/*!
+@discussion 检测是否可调用玩家身份确认接口
+ */
+- (BOOL) canCheckIdentity;
+
+
+
+//玩家身份确认接口
+- (void)identityCheck:(NSString*)realName idCard:(NSString*)idCard completeBlock:(void(^)(NSError* error))block;
+
+//删除账号授权,拿到第三方的token信息，如 signinwithapple拿到authorizationCode
+-(void)deleteAccounAuthorizationWithPlatform:(NSString*)platform completeBlock:(void(^)(NSError* error,WADeleteRequestModel*deleteResult))block;
+
+/*!
+@discussion 账号删除
+ */
+- (void)requestDeleteAccout:(WADeleteRequestModel*)deleteResult completeBlock:(void(^)(NSError* error,WADeleteResult*result))completeBlock;
+// 取消删除
+-(void)cancelRequestDeleteAccoutWithUserid:(NSString*)userid callback:(void (^)(NSError *))completeBlock;
+
+
+
+- (void)requestDeleteAccoutUI:(void(^)(NSError *error, NSUInteger status))completeBlock;
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
index d0030aa..c2b9a7c 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
@@ -47,5 +47,10 @@
@property(nonatomic)NSInteger autoGuestLogin; // 游客自动登录开关 0 - 开启， 1 - 关闭
@property(nonatomic)NSInteger guestLoginBindAlert; // 游客登录绑定提醒 0 - 关闭， 1 - 开启
+@property (nonatomic)NSInteger isOpenAccountDelete; // 账号注销总开关 (0-关闭, 1-ALL, 2-仅Android 3-仅iOS)
+@property (nonatomic)NSInteger accountDeleteBufferDays; // 账号注销缓存天数 (默认 15)
+@property (nonatomic)NSInteger deletingAccountRemind; // 账号注销提醒开关.(0-关闭, 1-开启, 默认关闭) 开启后，当注销中用户登录时，SDK弹出取消注销账号提醒，如用户取消，则SDK自动调用取消删除账号接口
+@property(nonatomic,copy)NSString* deleteAccountProtocolURL; // 删除账号协议
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
index 912fa17..8a6c47c 100644
--- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
+++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
@@ -60,6 +60,9 @@
#import <WASdkIntf/WAError.h>
#import <WASdkIntf/WAErrorCode.h>
#import <WASdkIntf/WASdkIntf.h>
+#import <WASdkIntf/WADeleteRequestModel.h>
+#import <WASdkIntf/WADeleteResult.h>
+
//! Project version number for WASdkIntf.
FOUNDATION_EXPORT double WASdkIntfVersionNumber;
@@ -68,4 +71,4 @@
// In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h>
-//time:2022/01/05 09:15 ver:2.4.1
+//time:2022/06/20 09:15 ver:2.6.0
diff --git a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
index a9e981c..00d420c 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
@@ -8,12 +8,15 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
-#import "WALoginResult.h"
-#import "WABindingResult.h"
-#import "WAAccount.h"
-#import "WAUserCenterResult.h"
-#import "WAAppUser.h"
-#import "WACertificationInfo.h"
+#import <WASdkIntf/WALoginResult.h>
+#import <WASdkIntf/WABindingResult.h>
+#import <WASdkIntf/WAAccount.h>
+#import <WASdkIntf/WAUserCenterResult.h>
+#import <WASdkIntf/WAAppUser.h>
+#import <WASdkIntf/WACertificationInfo.h>
+#import <WASdkIntf/WADeleteRequestModel.h>
+#import <WASdkIntf/WADeleteResult.h>
+
/*!
@discussion 登录协议
- - -
@@ -377,4 +380,59 @@
*/
+ (void)openPrivacyAgreementWindow:(void(^)(NSError* error,NSUInteger status))bloc;
+
+
+
+
+
+
+
+
+
+
+//**************************************删除账号有关start************************************************************
+
+/*!
+@discussion 检测是否可调用玩家身份确认接口
+ */
++ (BOOL)canCheckIdentity;
+
+/*!
+ @discussion 注销账号时，验证当前用户的身份证、id是否匹配，确认是本人操作
+ @param realName 姓名
+ @param idCard 身份证号码
+ */
++ (void)identityCheck:(NSString*)realName idCard:(NSString*)idCard completeBlock:(void(^)(NSError* error))block;
+
+
+//删除账号授权,拿到第三方的token信息，如 signinwithapple拿到authorizationCode
++ (void)deleteAccounAuthorizationWithPlatform:(NSString*)platform completeBlock:(void(^)(NSError* error,WADeleteRequestModel*deleteResult))block;
+
+
+/*!
+@discussion 账号删除接口
+ */
++ (void)requestDeleteAccout:(WADeleteRequestModel*)deleteResult completeBlock:(void(^)(NSError* error,WADeleteResult*result))completeBlock;
+
+/*!
+@discussion 取消删除账号接口
+ */
+
++ (void)cancelRequestDeleteAccoutWithUserid:(NSString*)userid callback:(void (^)(NSError *))completeBlock;
+
+
+// status==1,提交删除账号申请成功
+// status==2，用户取消
++ (void)requestDeleteAccoutUI:(void(^)(NSError *error, NSUInteger status))completeBlock;
+
+
+
+
+//**************************************删除账号有关end************************************************************
+
+
+
+
+
+
@end
diff --git a/frameworks/WASdkIntf.framework/Info.plist b/frameworks/WASdkIntf.framework/Info.plist
index 8460d13..26250db 100644
--- a/frameworks/WASdkIntf.framework/Info.plist
+++ b/frameworks/WASdkIntf.framework/Info.plist
Binary files differ
diff --git a/frameworks/WASdkIntf.framework/WASdkIntf b/frameworks/WASdkIntf.framework/WASdkIntf
index 836d804..942fe84 100644
--- a/frameworks/WASdkIntf.framework/WASdkIntf
+++ b/frameworks/WASdkIntf.framework/WASdkIntf
Binary files differ
--
Gitblit v1.8.0