From d814a6bb51fd823746e511fcab25a1c834b4c764 Mon Sep 17 00:00:00 2001
From: lpw
Date: Thu, 20 Jul 2023 15:45:26 +0800
Subject: [PATCH] 添加V3.16.0
---
frameworks/WASdkIntf.framework/Headers/WAUserProxy.h | 21 ++++++++++
frameworks/WASdkIntf.framework/WASdkIntf | 0
frameworks/WASdkIntf.framework/Headers/WAIUser.h | 17 ++++++++
frameworks/WASdkIntf.framework/Headers/WAAccount.h | 2 +
WASdkIntf/3.16.0/WASdkIntf.podspec | 23 +++++++++++
WASdkIntf.podspec | 2
frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 2
frameworks/WASdkIntf.framework/Info.plist | 0
frameworks/WASdkIntf.framework/Headers/WACode.h | 12 ++++++
frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h | 4 +
frameworks/WASdkIntf.framework/Headers/WACoreProxy.h | 16 ++++++++
frameworks/WASdkIntf.framework/Headers/WABindingResult.h | 7 +++
12 files changed, 103 insertions(+), 3 deletions(-)
diff --git a/WASdkIntf.podspec b/WASdkIntf.podspec
index d37e444..d46aa86 100644
--- a/WASdkIntf.podspec
+++ b/WASdkIntf.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkIntf'
-s.version = '3.15.0'
+s.version = '3.16.0'
s.summary = 'WASdkIntf framework in production environment.'
s.license = 'MIT'
s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
diff --git a/WASdkIntf/3.16.0/WASdkIntf.podspec b/WASdkIntf/3.16.0/WASdkIntf.podspec
new file mode 100644
index 0000000..d46aa86
--- /dev/null
+++ b/WASdkIntf/3.16.0/WASdkIntf.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'
+s.version = '3.16.0'
+s.summary = 'WASdkIntf framework in production environment.'
+s.license = 'MIT'
+s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
+s.homepage = 'http://repo.wingsdk.cn:8082/summary/WASdkIntf.git'
+s.source = { :git => "http://admin@repo.wingsdk.cn:8082/r/WASdkIntf.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
diff --git a/frameworks/WASdkIntf.framework/Headers/WAAccount.h b/frameworks/WASdkIntf.framework/Headers/WAAccount.h
index 9c50b95..d30fcc5 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAAccount.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAAccount.h
@@ -24,6 +24,8 @@
@property (nonatomic, strong) NSString *mobile;//wa平台才有此字段
+@property (nonatomic,strong) NSString * email;//WA平台且已绑定邮箱时返回 20230703 绑定帐号列表 V4(增加邮箱返回)
+
+(WAAccount*)parserWithDict:(NSDictionary*)dict;
+(NSArray*)parserWithArray:(NSArray*)arr;
diff --git a/frameworks/WASdkIntf.framework/Headers/WABindingResult.h b/frameworks/WASdkIntf.framework/Headers/WABindingResult.h
index f57a50d..bafd030 100644
--- a/frameworks/WASdkIntf.framework/Headers/WABindingResult.h
+++ b/frameworks/WASdkIntf.framework/Headers/WABindingResult.h
@@ -24,4 +24,11 @@
@abstract 绑定平台accessToken
*/
@property(copy,nonatomic)NSString *accessToken;
+
+/*!
+ @abstract 绑定wa时，是邮箱绑定还是email绑定
+ */
+@property(copy,nonatomic)NSString *email;
+@property(copy,nonatomic)NSString *mobile;
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WACode.h b/frameworks/WASdkIntf.framework/Headers/WACode.h
index 64c8f30..06e8205 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACode.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACode.h
@@ -39,8 +39,20 @@
WACodeThridPlatformAccountExpired = 4047 ,//第三方平台登录过期
WACodePayPlatformClosed = 4026 ,//支付渠道已关闭
WACodeLoginPlatformClosed = 4029 ,//登录渠道已关闭
+
+ WACodeMobileExists=4031,//手机帐号已存在！
+
+ WACodePhoneError = 4032 ,//无效效手机号
+ WACodeCodeError = 4033 ,//无效验证码
+ WACodePhoneMessageLimit =4039, //短信发送超过限制
+
WACodeBindAccountClosed = 4048 ,//账号绑定关闭
WACodeUnBindAccountClosed = 4049 ,//账号解绑关闭
+
+ WACodeEmailExists = 4054 ,//邮箱地址已存在
+
+ WACodeAccountError = 4057 ,//账号错误
+ WACodePasswordError = 4058 ,//账号或密码错误
WACodeUserCenterClosed = 4059 ,//用户中心未开启
WACodeCanNotSwitchToAnonymous = 5001 ,
WACodeFbObjectType = 5002 ,//facebook的objectType不能为空
diff --git a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
index 7d64f67..15a6a05 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
@@ -291,6 +291,22 @@
+ (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler API_AVAILABLE(ios(8.0));
+//当一个新的场景被创建时调用，可以在这个方法中配置场景。
++ (void)scene:(UIScene *_Nonnull)scene willConnectToSession:(UISceneSession *)session options:(UISceneConnectionOptions *_Nonnull)connectionOptions API_AVAILABLE(ios(13.0));
+// 当场景被销毁时调用。
++ (void)sceneDidDisconnect:(UIScene *_Nonnull)scene API_AVAILABLE(ios(13.0));
+//当场景变成活跃状态时调用。
++ (void)sceneDidBecomeActive:(UIScene *_Nonnull)scene API_AVAILABLE(ios(13.0));
+//当场景将要变成非活跃状态时调用。
++ (void)sceneWillResignActive:(UIScene *_Nonnull)scene API_AVAILABLE(ios(13.0));
+//当应用程序即将进入前台时调用。
++ (void)sceneWillEnterForeground:(UIScene *_Nonnull)scene API_AVAILABLE(ios(13.0));
+//当应用程序进入后台时调用。
++ (void)sceneDidEnterBackground:(UIScene *_Nonnull)scene API_AVAILABLE(ios(13.0));
+//当别的APP通过URL地址，打开我们的app时调用
++ (void)scene:(UIScene *_Nonnull)scene openURLContexts:(NSSet<UIOpenURLContext *> *_Nonnull)URLContexts API_AVAILABLE(ios(13.0));
++ (void)scene:(UIScene *)scene continueUserActivity:(NSUserActivity *)userActivity API_AVAILABLE(ios(13.0));
+
/*!
@abstract 设备是否越狱
*/
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIUser.h b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
index 69ffdbe..bb92d26 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAIUser.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
@@ -15,6 +15,8 @@
-(int)getLoginFlowType;
-(WAAppUser*)getAccountInfo;
-(void)loginWithExtInfo:(NSString *)extInfo delegate:(id<WALoginDelegate>)delegate;
+//传递平台，针对一种平台有多种登录方式，如weblogin，wa中的guest和wa登录
+-(void)loginPlatform:(NSString*)platform WithExtInfo:(NSString *)extInfo delegate:(id<WALoginDelegate>)delegate;
-(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;
@@ -44,6 +46,21 @@
- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options;
- (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url;
+//当一个新的场景被创建时调用，可以在这个方法中配置场景。
+- (void)scene:(UIScene *)scene willConnectToSession:(UISceneSession *)session options:(UISceneConnectionOptions *)connectionOptions API_AVAILABLE(ios(13.0));
+// 当场景被销毁时调用。
+- (void)sceneDidDisconnect:(UIScene *)scene API_AVAILABLE(ios(13.0));
+//当场景变成活跃状态时调用。
+- (void)sceneDidBecomeActive:(UIScene *)scene API_AVAILABLE(ios(13.0));
+//当场景将要变成非活跃状态时调用。
+- (void)sceneWillResignActive:(UIScene *)scene API_AVAILABLE(ios(13.0));
+//当应用程序即将进入前台时调用。
+- (void)sceneWillEnterForeground:(UIScene *)scene API_AVAILABLE(ios(13.0));
+//当应用程序进入后台时调用。
+- (void)sceneDidEnterBackground:(UIScene *)scene API_AVAILABLE(ios(13.0));
+//当别的APP通过URL地址，打开我们的app时调用
+- (void)scene:(UIScene *)scene openURLContexts:(NSSet<UIOpenURLContext *> *)URLContexts API_AVAILABLE(ios(13.0));
+- (void)scene:(UIScene *)scene continueUserActivity:(NSUserActivity *)userActivity API_AVAILABLE(ios(13.0));
-(void)loginWithResult:(WALoginResult*)result delegate:(id<WALoginDelegate>)delegate;
-(void)loginWithResult:(WALoginResult*)result extInfo:(NSString*)extInfo delegate:(id<WALoginDelegate>)delegate;
diff --git a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
index 39a7a44..fd66d9d 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
@@ -55,8 +55,10 @@
//3.15.0 add 20230523
@property(nonatomic)NSInteger isOpenKefuV2; // SDK客服开关V2(0-关闭, 1-开启, 默认关闭)
@property(nonatomic,copy)NSString* kefuEntranceId; // aihelp客服入口id
-@property(nonatomic)NSInteger isOpenGameReview_ios; // 游戏评价开关(0-关闭, 1-开启, 默认关闭)
+@property(nonatomic)NSInteger isOpenGameReview; // 游戏评价开关(0-关闭, 1-仅安卓开启，2-仅ios开启，3-全部开启, 默认关闭)
+
@property(nonatomic,copy)NSString* kefuGameReviewEntranceId; //AIHELP游戏评价入口
+@property(nonatomic,copy)NSString * mobile_country;// 优先展示国家
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
index b7a2f79..bb99f81 100644
--- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
+++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
@@ -71,4 +71,4 @@
// In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h>
-//time:2023/06/06 12:29 ver:3.15.0
+//time:2023/06/21 12:29 ver:3.16.0
diff --git a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
index 49ed139..2149703 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
@@ -308,6 +308,27 @@
sourceApplication:(NSString *)sourceApplication
annotation:(id)annotation;
+
+
+//当一个新的场景被创建时调用，可以在这个方法中配置场景。
+- (void)scene:(UIScene *)scene willConnectToSession:(UISceneSession *)session options:(UISceneConnectionOptions *)connectionOptions API_AVAILABLE(ios(13.0));
+// 当场景被销毁时调用。
+- (void)sceneDidDisconnect:(UIScene *)scene API_AVAILABLE(ios(13.0));
+//当场景变成活跃状态时调用。
+- (void)sceneDidBecomeActive:(UIScene *)scene API_AVAILABLE(ios(13.0));
+//当场景将要变成非活跃状态时调用。
+- (void)sceneWillResignActive:(UIScene *)scene API_AVAILABLE(ios(13.0));
+//当应用程序即将进入前台时调用。
+- (void)sceneWillEnterForeground:(UIScene *)scene API_AVAILABLE(ios(13.0));
+//当应用程序进入后台时调用。
+- (void)sceneDidEnterBackground:(UIScene *)scene API_AVAILABLE(ios(13.0));
+//当别的APP通过URL地址，打开我们的app时调用
+- (void)scene:(UIScene *)scene openURLContexts:(NSSet<UIOpenURLContext *> *)URLContexts API_AVAILABLE(ios(13.0));
+- (void)scene:(UIScene *)scene continueUserActivity:(NSUserActivity *)userActivity API_AVAILABLE(ios(13.0));
+
+
+
+
/*!
@discussion （tip:CP无需关注）此方法为成功登录第三方平台之后调用。根据第三方平台的pUserId，pToken，platform构建一个WALoginResult实例作为参数调用此方法。此方法将会调用WindAnalytics的登录接口。
@param result 登录结果
diff --git a/frameworks/WASdkIntf.framework/Info.plist b/frameworks/WASdkIntf.framework/Info.plist
index c2b7832..74e8e9e 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 42e5422..e455fd7 100644
--- a/frameworks/WASdkIntf.framework/WASdkIntf
+++ b/frameworks/WASdkIntf.framework/WASdkIntf
Binary files differ
--
Gitblit v1.8.0