From 55db1cda656f39b3f941cdb54cd50e640e834221 Mon Sep 17 00:00:00 2001
From: lipengwei <lipengwei@nianben.com>
Date: Wed, 04 Mar 2020 21:37:49 +0800
Subject: [PATCH] 1.5.0
---
WASdkIntf_CN.podspec | 2
frameworks/WASdkIntf.framework/WASdkIntf | 0
frameworks/WASdkIntf.framework/Headers/WAIPay.h | 2 +
frameworks/WASdkIntf.framework/Headers/WAICsc.h | 8 ++++
frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 2
frameworks/WASdkIntf.framework/Headers/WATrackProxy.h | 14 +++++++
WASdkIntf_CN/1.5.0/WASdkIntf_CN.podspec | 23 +++++++++++
frameworks/WASdkIntf.framework/Headers/WACscProxy.h | 10 +++++
frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h | 5 +-
9 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/WASdkIntf_CN.podspec b/WASdkIntf_CN.podspec
index 97c449f..699fa3b 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.4.0'
+s.version = '1.5.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.5.0/WASdkIntf_CN.podspec b/WASdkIntf_CN/1.5.0/WASdkIntf_CN.podspec
new file mode 100644
index 0000000..699fa3b
--- /dev/null
+++ b/WASdkIntf_CN/1.5.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.5.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/WACscProxy.h b/frameworks/WASdkIntf.framework/Headers/WACscProxy.h
index 41eb0a7..8dbb860 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACscProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACscProxy.h
@@ -77,4 +77,14 @@
+ (void)setSDKInterfaceOrientationMask:(NSUInteger)interfaceOrientationMask;
+/*!
+@abstract 检测是否开启aihelp
+*/
++ (BOOL) isOpenAiHelp;
+
+
++ (void) openAiHelp:(NSString * _Nonnull )language;
+
+
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAICsc.h b/frameworks/WASdkIntf.framework/Headers/WAICsc.h
index 9cc34ea..f06a5fa 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAICsc.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAICsc.h
@@ -47,4 +47,12 @@
*/
- (void)setSDKInterfaceOrientationMask:(NSUInteger)interfaceOrientationMask;
+#pragma mark -- 判断是否加载aihelp模块
+- (BOOL) isOpenAiHelp;
+
+#pragma mark -- 打开aihelp
+- (void) openAiHelp:(NSString * _Nonnull )language;
+
+
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIPay.h b/frameworks/WASdkIntf.framework/Headers/WAIPay.h
index be0b470..f8275fe 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAIPay.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIPay.h
@@ -23,4 +23,6 @@
-(NSData*)getCurrentReceipt;
-(float)getReorderLimitTime;
-(void)payLog:(NSString *)logInfo;
+-(void)startRunAppleTransactionObserve;
+-(void)removeAppleTransactionObserve;
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
index bb33843..650b5e7 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
@@ -31,8 +31,9 @@
@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菜单
-
+@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打开
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
index 01c130f..fe2bc53 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/01/08 09:15 ver:1.4.0
+//time:2020/03/05 09:15 ver:1.5.0
diff --git a/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h b/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
index 3af77a3..440ca91 100644
--- a/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
@@ -53,6 +53,9 @@
extern NSString* WAEventParameterNameCustomMethodPrefix;//自定义事件名称前缀
+extern NSString* WAEventParameterNameApplePayLogCustomPrefix;//苹果支付自定义事件名称前缀
+
+
extern NSString *const WAEventLaunch;
extern NSString *const WAEventStartUp;
extern NSString *const WAEventCompleteRegistration;
@@ -87,6 +90,15 @@
extern NSString *const WAEventInitiatedPlatformLogin; // 进行登录之前
extern NSString *const WAEventPostThirdPartyLogin; // 进行第三方渠道登录之后
extern NSString *const WAEventPostWingLogin; // 进行WING平台登录之后
+
+
+//苹果支付事件上报打点事件名20200302
+extern NSString *const WAEventForHandTransaction; //手动消耗事件
+extern NSString *const WAEventForApplePayStateChanged; //苹果支付状态改变
+extern NSString *const WAEventForOrderCheckNoTransaction; //下单检测未消耗事件
+
+
+
extern NSString *const WAEventParameterNameRegistrationMethod;
@@ -192,6 +204,8 @@
+
+
/*!
@discussion WATrackProxy 该类用来做数据收集
- - -
diff --git a/frameworks/WASdkIntf.framework/WASdkIntf b/frameworks/WASdkIntf.framework/WASdkIntf
index c6a7f6a..bca624e 100644
--- a/frameworks/WASdkIntf.framework/WASdkIntf
+++ b/frameworks/WASdkIntf.framework/WASdkIntf
Binary files differ
--
Gitblit v1.8.0