From 28ea02d8efbc1cb1eadae017bf5f6a385e122360 Mon Sep 17 00:00:00 2001
From: lipengwei <lipengwei@nianben.com>
Date: Mon, 13 Jan 2020 16:10:02 +0800
Subject: [PATCH] 1.4.0
---
frameworks/WASdkIntf.framework/WASdkIntf | 0
frameworks/WASdkIntf.framework/Headers/WAIUser.h | 3 +
frameworks/WASdkIntf.framework/Headers/WAPayProxy.h | 2
frameworks/WASdkIntf.framework/Headers/WACertificationInfo.h | 31 ++++++++++
frameworks/WASdkIntf.framework/Headers/WAICsc.h | 13 ++++
frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 3
frameworks/WASdkIntf.framework/Info.plist | 0
frameworks/WASdkIntf.framework/Headers/WALoginResult.h | 35 +++++++++--
frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h | 3 +
frameworks/WASdkIntf.framework/Headers/WAUserProxy.h | 4 +
WASdkIntf_CN.podspec | 2
frameworks/WASdkIntf.framework/Headers/WACore.h | 2
WASdkIntf_CN/1.3.0/WASdkIntf_CN.podspec | 2
WASdkIntf_CN/1.4.0/WASdkIntf_CN.podspec | 23 +++++++
frameworks/WASdkIntf.framework/Headers/WAIapResult.h | 2
frameworks/WASdkIntf.framework/Headers/WATrackProxy.h | 2
frameworks/WASdkIntf.framework/Headers/WACscProxy.h | 15 +++++
frameworks/WASdkIntf.framework/Headers/WACoreProxy.h | 2
18 files changed, 134 insertions(+), 10 deletions(-)
diff --git a/WASdkIntf_CN.podspec b/WASdkIntf_CN.podspec
index 207a887..97c449f 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.3.0'
+s.version = '1.4.0'
s.summary = 'WASdkIntf_CN framework in testing environment.'
s.license = 'MIT'
s.author = { "Hank" => "hank.zhang@gamehollywood.com" }
diff --git a/WASdkIntf_CN/1.3.0/WASdkIntf_CN.podspec b/WASdkIntf_CN/1.3.0/WASdkIntf_CN.podspec
index 207a887..97c449f 100644
--- a/WASdkIntf_CN/1.3.0/WASdkIntf_CN.podspec
+++ b/WASdkIntf_CN/1.3.0/WASdkIntf_CN.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkIntf_CN'
-s.version = '1.3.0'
+s.version = '1.4.0'
s.summary = 'WASdkIntf_CN framework in testing environment.'
s.license = 'MIT'
s.author = { "Hank" => "hank.zhang@gamehollywood.com" }
diff --git a/WASdkIntf_CN/1.4.0/WASdkIntf_CN.podspec b/WASdkIntf_CN/1.4.0/WASdkIntf_CN.podspec
new file mode 100644
index 0000000..97c449f
--- /dev/null
+++ b/WASdkIntf_CN/1.4.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 = '1.4.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/WACertificationInfo.h b/frameworks/WASdkIntf.framework/Headers/WACertificationInfo.h
new file mode 100644
index 0000000..c7e1cb0
--- /dev/null
+++ b/frameworks/WASdkIntf.framework/Headers/WACertificationInfo.h
@@ -0,0 +1,31 @@
+//
+// WACertificationInfo.h
+// WASdkIntf
+//
+// Created by LPW on 2019/12/30.
+// Copyright © 2019 GHW-T-01. All rights reserved.
+// 查询用户实名信息返回model
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface WACertificationInfo : NSObject
+/*用户实名认证状态
+ * -1 未开启
+ * 0 已实名
+ * 1 未实名
+ * 2 已实名-未成年
+ */
+@property NSInteger userRealNameStatus;
+
+
+/*用户实名认证状态
+* -1 未开启实名认证 或者 未实名
+*/
+@property NSInteger age;
+
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/frameworks/WASdkIntf.framework/Headers/WACore.h b/frameworks/WASdkIntf.framework/Headers/WACore.h
index eedaccc..0de5845 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACore.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACore.h
@@ -53,4 +53,6 @@
-(void)eventLogWithPlatform:(NSString*)platform eventName:(NSString*)eventName parameters:(NSDictionary*)parameters color:(UIColor*)color;
/** 检测设备是否越狱 */
- (BOOL)isJailBreak;
+
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
index 7a18fa6..3e0330d 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
@@ -285,4 +285,6 @@
*/
+ (BOOL)isJailBreak;
+
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WACscProxy.h b/frameworks/WASdkIntf.framework/Headers/WACscProxy.h
index c3d11b7..41eb0a7 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACscProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACscProxy.h
@@ -62,4 +62,19 @@
*/
+ (void)setLanguage:(nonnull NSString *)language;
+#pragma mark -- 设置SDK方向
+/*
+
+ UIInterfaceOrientationMaskPortrait, // 设备(屏幕)直立
+ UIInterfaceOrientationMaskLandscapeLeft, // 设备(屏幕)向左横置
+ UIInterfaceOrientationMaskLandscapeRight, // 设备(屏幕)向右橫置
+ UIInterfaceOrientationMaskPortraitUpsideDown,// 设备(屏幕)直立，上下顛倒
+ UIInterfaceOrientationMaskLandscape, // 设备(屏幕)横置,包含向左和向右
+ UIInterfaceOrientationMaskAll, // 设备(屏幕)可以支持上下左右四个方向
+ UIInterfaceOrientationMaskAllButUpsideDown //设备(屏幕)可以支持上左右三个个方向，但不支持直立上下颠倒
+
+ */
++ (void)setSDKInterfaceOrientationMask:(NSUInteger)interfaceOrientationMask;
+
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAICsc.h b/frameworks/WASdkIntf.framework/Headers/WAICsc.h
index 3fa3208..9cc34ea 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAICsc.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAICsc.h
@@ -33,5 +33,18 @@
#pragma mark -- 设置SDK语言
- (void)setLanguage:(nonnull NSString *)language;
+#pragma mark -- 设置SDK方向
+/*
+
+ UIInterfaceOrientationMaskPortrait, // 设备(屏幕)直立
+ UIInterfaceOrientationMaskLandscapeLeft, // 设备(屏幕)向左横置
+ UIInterfaceOrientationMaskLandscapeRight, // 设备(屏幕)向右橫置
+ UIInterfaceOrientationMaskPortraitUpsideDown,// 设备(屏幕)直立，上下顛倒
+ UIInterfaceOrientationMaskLandscape, // 设备(屏幕)横置,包含向左和向右
+ UIInterfaceOrientationMaskAll, // 设备(屏幕)可以支持上下左右四个方向
+ UIInterfaceOrientationMaskAllButUpsideDown //设备(屏幕)可以支持上左右三个个方向，但不支持直立上下颠倒
+
+ */
+- (void)setSDKInterfaceOrientationMask:(NSUInteger)interfaceOrientationMask;
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIUser.h b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
index e25dd96..839d6e7 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAIUser.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
@@ -41,6 +41,8 @@
- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options;
+- (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url;
+
-(void)loginWithResult:(WALoginResult*)result delegate:(id<WALoginDelegate>)delegate;
-(void)loginWithResult:(WALoginResult*)result extInfo:(NSString*)extInfo delegate:(id<WALoginDelegate>)delegate;
@@ -54,4 +56,5 @@
- (void)showUserCenterNoticeUI:(id<WAUserCenterNoticeUIDelegate>)delegate;
+-(void)queryUserCertificationInfo:(void(^)(WACertificationInfo *certificationInfo,NSError *error))callBackBlock;
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIapResult.h b/frameworks/WASdkIntf.framework/Headers/WAIapResult.h
index 9dc2772..d5eefae 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAIapResult.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIapResult.h
@@ -59,4 +59,6 @@
*/
@property(nonatomic) long resultCode;
+@property (nonatomic) NSString *message; //成功 or 失败原因
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WALoginResult.h b/frameworks/WASdkIntf.framework/Headers/WALoginResult.h
index 175ecb7..0168098 100644
--- a/frameworks/WASdkIntf.framework/Headers/WALoginResult.h
+++ b/frameworks/WASdkIntf.framework/Headers/WALoginResult.h
@@ -49,26 +49,49 @@
*/
@property BOOL isBindMobile;
/**!
- @abstract 是否绑定手机号 用户状态(有效用户返回)：
+ @abstract 用户实名认证状态(未开启则不返回)：
* 0:已实名
* 1:未实名
+ * 2:已实名-未成年
*/
-@property NSInteger userStatus;
+@property NSInteger userRealNameStatus;
+
+
/**!
- @abstract 登录实名验证：
+ @abstract 是否开启游戏防沉迷(未开启则无数据返回）
+ * 1:开启
+ */
+@property NSInteger gameAddiction;
+
+
+
+/**!
+ @abstract 已实名认证用户的年龄(未开启则无数据返回）
+ */
+@property NSInteger age;
+
+
+
+
+
+/**!
+ @abstract 登录实名验证： v1.4.0 废弃
* 0:不需要实名验证
* 1:提示用户实名验证，这里返回的token可作为登录及用户实名验证使用
* 2:强制用户实名验证，此时返回的仅是token是实名验证token
*/
-@property NSInteger loginRna;
+//@property NSInteger loginRna;
+
/**!
- @abstract 支付实名验证：
+ @abstract 支付实名验证： v1.4.0 废弃
* 0:不需要实名验证
* 1:提示用户实名验证
* 2:强制用户实名验证
* 注：当有该字段返回时，token可作为登录及用户实名验证使用
*/
-@property NSInteger paymentRna;
+//@property NSInteger paymentRna;
+
+
/**!
@abstract 当前用户ID含义标识：
diff --git a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
index 919db14..bb33843 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
@@ -31,5 +31,8 @@
@property(nonatomic,copy)NSString* privacyUrl; // 用户协议url
@property(nonatomic,copy)NSString* privacyUpdateTime; // 用户协议更新时间
@property(nonatomic)NSInteger userCenterStatus; // 用户中心状态 0-关闭，1-打开
+@property(nonatomic)NSInteger isOpenKefu; // 是否开启客服 0 关闭 1 启动机器人客服聊天界面 2 启动人工客服聊天界面 3 启动运营界面 4 展示全部FAQ菜单
+
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h b/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h
index 5b5a423..a0c71fb 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h
@@ -63,7 +63,7 @@
/*!
@abstract 查询渠道商品调用方法
-@param callBackBlock 回掉
+@param callBackBlock 回调
*/
+ (void)queryChannelProduct:(NSString *)channel
callBackBlock:(void(^)(NSArray <WAChannelProduct *>*channelProductsArray,NSError *error))callBackBlock;
diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
index b10ee02..01c130f 100644
--- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
+++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
@@ -39,6 +39,7 @@
#import <WASdkIntf/WAUserCenterResult.h>
#import <WASdkIntf/WAIUser.h>
#import <WASdkIntf/WAUserProxy.h>
+#import <WASdkIntf/WACertificationInfo.h>
#import <WASdkIntf/WAAccount.h>
#import <WASdkIntf/WAClassGenerator.h>
#import <WASdkIntf/WAShareVideo.h>
@@ -67,4 +68,4 @@
// In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h>
-//time:2019/10/09 09:15 ver:1.3.0
+//time:2020/01/08 09:15 ver:1.4.0
diff --git a/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h b/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
index 5bee837..3af77a3 100644
--- a/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
@@ -118,6 +118,8 @@
extern NSString *const WAEventParameterNameStartTime;
extern NSString *const WAEventParameterNameNowTime;
extern NSString *const WAEventParameterNameSessionType;
+extern NSString *const WAEventParameterUnAdult;
+
extern NSString *const WAEventParameterNameTransactionId;
extern NSString *const WAEventParameterNamePaymentType;
extern NSString *const WAEventParameterNameCurrencyAmount;
diff --git a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
index 6b5269d..ec284ec 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
@@ -13,6 +13,7 @@
#import "WAAccount.h"
#import "WAUserCenterResult.h"
#import "WAAppUser.h"
+#import "WACertificationInfo.h"
/*!
@discussion 登录协议
- - -
@@ -295,4 +296,7 @@
@discussion （tip:CP无需关注）获取用户模块组件
*/
+(NSArray*)getUserComponents;
+
++(void)queryUserCertificationInfo:(void(^)(WACertificationInfo *certificationInfo,NSError *error))callBackBlock;
+
@end
diff --git a/frameworks/WASdkIntf.framework/Info.plist b/frameworks/WASdkIntf.framework/Info.plist
index 98c7282..c7f786f 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 c8c0148..c6a7f6a 100644
--- a/frameworks/WASdkIntf.framework/WASdkIntf
+++ b/frameworks/WASdkIntf.framework/WASdkIntf
Binary files differ
--
Gitblit v1.8.0