From 5b23db059854e67470c18224a3d376821fe1c340 Mon Sep 17 00:00:00 2001 From: lpw Date: Mon, 22 Aug 2022 19:37:03 +0800 Subject: [PATCH] 3.11.0 --- frameworks/WASdkIntf.framework/WASdkIntf | 0 WASdkIntf.podspec | 2 +- frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 2 +- frameworks/WASdkIntf.framework/Info.plist | 0 frameworks/WASdkIntf.framework/Headers/WATrackProxy.h | 3 ++- frameworks/WASdkIntf.framework/Headers/WACode.h | 5 ++++- WASdkIntf/3.11.0/WASdkIntf.podspec | 23 +++++++++++++++++++++++ frameworks/WASdkIntf.framework/Headers/WALoginResult.h | 3 +++ frameworks/WASdkIntf.framework/Headers/WAUserCenterResult.h | 10 ++++++++++ frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h | 1 + 10 files changed, 45 insertions(+), 4 deletions(-) diff --git a/WASdkIntf.podspec b/WASdkIntf.podspec index 249e4c1..aefd193 100644 --- a/WASdkIntf.podspec +++ b/WASdkIntf.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.name = 'WASdkIntf' -s.version = '3.10.1' +s.version = '3.11.0' s.summary = 'WASdkIntf framework in production environment.' s.license = 'MIT' s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" } diff --git a/WASdkIntf/3.11.0/WASdkIntf.podspec b/WASdkIntf/3.11.0/WASdkIntf.podspec new file mode 100644 index 0000000..aefd193 --- /dev/null +++ b/WASdkIntf/3.11.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.11.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/WACode.h b/frameworks/WASdkIntf.framework/Headers/WACode.h index 07cd5d3..64c8f30 100644 --- a/frameworks/WASdkIntf.framework/Headers/WACode.h +++ b/frameworks/WASdkIntf.framework/Headers/WACode.h @@ -58,7 +58,10 @@ WACodeCurrentIDNotMatch = -211 ,//当前平台账号跟当前WA UserId绑定的平台账号不一致,或者没有绑定该平台账号 WACodeDeviceNotSupported = -401 ,//设备不支持 WACodeNetworkUnavailable = -402 ,//网络不可用 - WACodePayReOrderTimeLimit = -509 //支付流程未完成或者在特定的时间内重复下订单 + WACodePayReOrderTimeLimit = -509 ,//支付流程未完成或者在特定的时间内重复下订单 + + WACodeDeleteAccountLimitLogin =4084, //账号删除中,禁止登录 + }WACode; diff --git a/frameworks/WASdkIntf.framework/Headers/WALoginResult.h b/frameworks/WASdkIntf.framework/Headers/WALoginResult.h index afdaad9..9dc61e1 100644 --- a/frameworks/WASdkIntf.framework/Headers/WALoginResult.h +++ b/frameworks/WASdkIntf.framework/Headers/WALoginResult.h @@ -121,6 +121,9 @@ // cp 使用 @property int isGuestAccount; // 0 不是游客账号 1是游客账号 +@property(copy,nonatomic)NSString *apply_delete_status;//申请删除账号状态 0-未申请删除; 1-已申请删除 +@property(copy,nonatomic)NSString *delete_date; //apply_delete_status=1时有值,返回时间戳。 + -(id)initWithPUserId:(NSString*)userId pToken:(NSString*)token platform:(NSString*)platform; +(id)loginResultWithPUserId:(NSString*)userId pToken:(NSString*)token platform:(NSString*)platform; diff --git a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h index c2b9a7c..85ccf14 100644 --- a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h +++ b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h @@ -36,6 +36,7 @@ @property(nonatomic)NSInteger userCenterStatus; // 用户中心状态 0-关闭,1-打开 +@property(nonatomic)NSInteger userCenterStatusV2; //新版用户中心状态(CharacterID):0-关闭, 1-打开 @property(nonatomic)NSInteger isRechargeCenterPay; // 是否开启充值中心支付:0-关闭,1-打开,2-仅安卓打开,3-仅IOS打开 @property(nonatomic,copy)NSString* rechargeCenterIcon; // 充值中心的支付图片URL @property(nonatomic)NSInteger isOpenKefu; // 是否开启客服 0 关闭 1 启动机器人客服聊天界面 2 启动人工客服聊天界面 3 启动运营界面 4 展示全部FAQ菜单 5 展示全部FAQ菜单(无机器人客服) diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h index bdad61f..ce2a401 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:2022/06/20 09:15 ver:3.10.1 +//time:2022/08/22 09:15 ver:3.11.0 diff --git a/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h b/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h index 629893b..8fc69a3 100644 --- a/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h +++ b/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h @@ -158,7 +158,8 @@ extern NSString *const WAEventParameterNameOS;//系统 extern NSString *const WAEventParameterNameResolution;//分辨率 - +extern NSString *const WAEventParameterNameLoginPlatform ; +extern NSString *const WAEventParameterNamePuserId ; extern NSString *const WAEventParameterNameOsign; diff --git a/frameworks/WASdkIntf.framework/Headers/WAUserCenterResult.h b/frameworks/WASdkIntf.framework/Headers/WAUserCenterResult.h index 8f2a73c..03a7cef 100644 --- a/frameworks/WASdkIntf.framework/Headers/WAUserCenterResult.h +++ b/frameworks/WASdkIntf.framework/Headers/WAUserCenterResult.h @@ -49,6 +49,16 @@ @property(copy,nonatomic)NSString *appName; +/*! + @abstract characterId + */ +@property(copy,nonatomic)NSString *characterId; + +/* + uid + */ +@property(copy,nonatomic)NSString *uid; + @end diff --git a/frameworks/WASdkIntf.framework/Info.plist b/frameworks/WASdkIntf.framework/Info.plist index 7117044..0a879a9 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 ba71faa..7e0042b 100644 --- a/frameworks/WASdkIntf.framework/WASdkIntf +++ b/frameworks/WASdkIntf.framework/WASdkIntf Binary files differ -- Gitblit v1.8.0