From d0b2dfe6ebd976a41dcce89666771655f0afd41c Mon Sep 17 00:00:00 2001
From: hank <hank.zhang@proficientcity.com>
Date: Mon, 27 Mar 2017 09:25:11 +0800
Subject: [PATCH] 添加V1.1.3
---
frameworks/WASdkIntf.framework/WASdkIntf | 0
config/wa_sdk_track_config.plist | 2
frameworks/WASdkIntf.framework/Headers/WAPayProxy.h | 5 -
frameworks/WASdkIntf.framework/_CodeSignature/CodeResources | 91 +++++++++++++++++------------
frameworks/WASdkIntf.framework/Headers/WAIApw.h | 4
config/wa_sdk.plist | 2
frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory | 0
frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 7 +-
frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature | 0
frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h | 26 ++++++++
WASdkIntf_CN.podspec | 4
frameworks/WASdkIntf.framework/Headers/WACore.h | 2
frameworks/WASdkIntf.framework/Headers/WAUpdateInfo.h | 4
frameworks/WASdkIntf.framework/Headers/WAIHup.h | 4
frameworks/WASdkIntf.framework/Headers/WAConstants.h | 2
frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 | 0
frameworks/WASdkIntf.framework/Headers/WACoreProxy.h | 4 +
17 files changed, 103 insertions(+), 54 deletions(-)
diff --git a/WASdkIntf_CN.podspec b/WASdkIntf_CN.podspec
index bd3d4c8..dc4e752 100644
--- a/WASdkIntf_CN.podspec
+++ b/WASdkIntf_CN.podspec
@@ -9,8 +9,8 @@
Pod::Spec.new do |s|
s.name = 'WASdkIntf_CN'
-s.version = '1.1.2'
-s.summary = 'WASdkIntf framework in production environment.'
+s.version = '1.1.3'
+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'
diff --git a/config/wa_sdk.plist b/config/wa_sdk.plist
index 4383962..9eaf940 100644
--- a/config/wa_sdk.plist
+++ b/config/wa_sdk.plist
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>WaSdkServerUrl</key>
- <string>https://api.wingsdk.cn/sdkapi/</string>
+ <string>http://sdk-test1.wingsdk.cn/sdk_bkd_qa/sdkapi/</string>
<key>appKey</key>
<string>abc</string>
<key>appId</key>
diff --git a/config/wa_sdk_track_config.plist b/config/wa_sdk_track_config.plist
index e3941fc..70497b8 100644
--- a/config/wa_sdk_track_config.plist
+++ b/config/wa_sdk_track_config.plist
@@ -7,7 +7,7 @@
<key>ChannelId</key>
<string>AppleStore</string>
<key>URL</key>
- <string>https://api.wingsdk.cn/data/</string>
+ <string>http://sdk-test1.wingsdk.cn/sdk_bkd_qa/data_collection/data/</string>
<key>Enabled</key>
<true/>
<key>Mapping</key>
diff --git a/frameworks/WASdkIntf.framework/Headers/WAConstants.h b/frameworks/WASdkIntf.framework/Headers/WAConstants.h
index 1e4808b..90330b1 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAConstants.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAConstants.h
@@ -29,6 +29,8 @@
extern NSString *const WA_PLATFORM_BOACOMPRA;
extern NSString *const WA_PLATFORM_VK;
extern NSString *const WA_PLATFORM_WECHAT;
+extern NSString *const WA_PLATFORM_HUP;
+extern NSString *const WA_PLATFORM_APW;
extern NSString *const WA_CONSTANT_GUEST;
diff --git a/frameworks/WASdkIntf.framework/Headers/WACore.h b/frameworks/WASdkIntf.framework/Headers/WACore.h
index 4fd3018..9671bce 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACore.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACore.h
@@ -8,6 +8,7 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
+@class WAParamConfigObj;
@interface WACore : NSObject
-(void)initialize;
-(void)initAppEventTracker;
@@ -37,6 +38,7 @@
-(NSString*)getSdkId;
-(NSString*)getSessionId;
-(NSString*)getDeepLinkWithUrl:(NSURL*)url;
+-(WAParamConfigObj*)getParamConfig;
-(void)fetchDeferredAppLink:(void(^)(NSURL *url, NSError *error))handler;
-(void)addEventContentWithString:(NSString*)string;
-(void)eventLogWithPlatform:(NSString*)platform eventName:(NSString*)eventName parameters:(NSDictionary*)parameters color:(UIColor*)color;
diff --git a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
index 105c89e..0b67eb6 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
@@ -158,6 +158,10 @@
+(void)fetchDeferredAppLink:(void(^)(NSURL *url, NSError *error))handler;
/*!
+ @abstract 获取后台配置参数
+ */
++(WAParamConfigObj*)getParamConfig;
+/*!
@abstract 下面四个方法是关于打印日志的,CP不用关注
*/
+(void)addLogWithString:(NSString*)string;
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIAppWall.h b/frameworks/WASdkIntf.framework/Headers/WAIApw.h
similarity index 80%
rename from frameworks/WASdkIntf.framework/Headers/WAIAppWall.h
rename to frameworks/WASdkIntf.framework/Headers/WAIApw.h
index 2f344a1..e8ea8a2 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAIAppWall.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIApw.h
@@ -1,5 +1,5 @@
//
-// WAAppWall.h
+// WAIApw.h
// WASdkIntfUI
//
// Created by wuyx on 16/3/2.
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
-@interface WAIAppWall : NSObject
+@interface WAIApw : NSObject
-(void)showEntryFlowIcon;
-(void)hideEntryFlowIcon;
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAHotUpdate.h b/frameworks/WASdkIntf.framework/Headers/WAIHup.h
similarity index 87%
rename from frameworks/WASdkIntf.framework/Headers/WAHotUpdate.h
rename to frameworks/WASdkIntf.framework/Headers/WAIHup.h
index 6660573..656912b 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAHotUpdate.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIHup.h
@@ -1,5 +1,5 @@
//
-// WAHotUpdate.h
+// WAIHup.h
// WASdkIntfUI
//
// Created by wuyx on 16/3/2.
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
#import "WAHupProxy.h"
-@interface WAHotUpdate : NSObject
+@interface WAIHup : NSObject
-(void)checkUpdate:(void(^)(NSError* error,WAUpdateInfo* updateInfo))handler;
-(void)startUpdate:(WAUpdateInfo*)updateInfo handler:(void(^)(NSError* error))handler;
-(WAUpdateInfo*)getPatchInfo;
diff --git a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
new file mode 100644
index 0000000..4fdecf8
--- /dev/null
+++ b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
@@ -0,0 +1,26 @@
+//
+// WAParamConfigObj.h
+// WASDKUI
+//
+// Created by wuyx on 15/11/25.
+// Copyright © 2015年 GHW-T-01. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface WAParamConfigObj : NSObject<NSCoding,NSCopying>
+@property(nonatomic)BOOL enableExtend;
+@property(nonatomic)BOOL enableHotPatch;
+@property(nonatomic,copy)NSString* afadAppKey;
+@property(nonatomic,copy)NSString* fbSecretKey;
+@property(nonatomic,copy)NSString* rewardType;
+@property(nonatomic)float reorderLimitTime;
+@property(nonatomic) NSInteger paymentReportTime;
+@property(nonatomic) float heartbeatIntervalTime;
+@property(nonatomic)int eventCacheNumberLimit;
+@property(nonatomic)int eventCacheTimeLimit;
+@property(nonatomic,copy)NSString* eventTypeImmediate;
+@property(nonatomic,strong)NSNumber* enableNewAccount;
+@property(nonatomic,strong)NSNumber* enableChangeAccount;
+@property(nonatomic,strong)NSNumber* isTestDevice;
+@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h b/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h
index d767bc4..cff0ea9 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h
@@ -68,10 +68,9 @@
*/
+(void)payWithProductId:(NSString*)productId extInfo:(NSString*)extInfo delegate:(id<WAPaymentDelegate>)delegate;
/*!
- @abstract 查询是否某个支付平台
- @param platform 支付平台
+ @abstract 查询是否支持支付
@return bool 是否支持某个支付平台
*/
-+(BOOL)isPayServiceAvailableWithPlatform:(NSString *const)platform;
++(BOOL)isPayServiceAvailable;
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
index 7c70166..dbc668f 100644
--- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
+++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
@@ -6,13 +6,14 @@
// Copyright © 2016年 GHW-T-01. All rights reserved.
//
-#import <WASdkIntf/WAIAppWall.h>
+#import <WASdkIntf/WAIApw.h>
#import <WASdkIntf/WAApwProxy.h>
#import <WASdkIntf/WAConstants.h>
#import <WASdkIntf/WAComponent.h>
#import <WASdkIntf/WACore.h>
#import <WASdkIntf/WACoreProxy.h>
-#import <WASdkIntf/WAHotUpdate.h>
+#import <WASdkIntf/WAParamConfigObj.h>
+#import <WASdkIntf/WAIHup.h>
#import <WASdkIntf/WAHupProxy.h>
#import <WASdkIntf/WAUpdateInfo.h>
#import <WASdkIntf/WAIPay.h>
@@ -58,4 +59,4 @@
// In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h>
-//time:2017/1/19 10:08 ver:3.6.1
+//time:2017/3/25 14:31 ver:1.1.3
diff --git a/frameworks/WASdkIntf.framework/Headers/WAUpdateInfo.h b/frameworks/WASdkIntf.framework/Headers/WAUpdateInfo.h
index a854e52..d28a3af 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAUpdateInfo.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAUpdateInfo.h
@@ -1,6 +1,6 @@
//
-// GHWSDKPatchInfo.h
-// GHWSdkUI
+// WAUpdateInfo.h
+// WASdkIntfUI
//
// Created by wuyx on 15/10/21.
// Copyright © 2015年 GHW-T-01. All rights reserved.
diff --git a/frameworks/WASdkIntf.framework/WASdkIntf b/frameworks/WASdkIntf.framework/WASdkIntf
index d0901dc..616d567 100644
--- a/frameworks/WASdkIntf.framework/WASdkIntf
+++ b/frameworks/WASdkIntf.framework/WASdkIntf
Binary files differ
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory b/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory
index 0c82c14..e840023 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory
Binary files differ
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 b/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1
index 8433a30..b8456bc 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1
Binary files differ
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources b/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
index 715753a..be7daf7 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
@@ -42,15 +42,15 @@
</data>
<key>Headers/WAConstants.h</key>
<data>
- WDmenmv/VRToA416MNUaG152NCE=
+ rGxCj6IXjjhS+MimxprY7WF2qCs=
</data>
<key>Headers/WACore.h</key>
<data>
- kxjkBwOjl+iJdtHpoC8sRSeklz4=
+ h+WBWDVPZdn5bjm7oUa9I2T/mco=
</data>
<key>Headers/WACoreProxy.h</key>
<data>
- Kl5Pr28Td7eTaWXs3E18Z0Tyvp8=
+ 6l72fcEeFTizQ8nPfpFXP41/rZk=
</data>
<key>Headers/WAError.h</key>
<data>
@@ -88,17 +88,17 @@
<data>
95Ook+32C0ANb+fcnHV3kPx0f5E=
</data>
- <key>Headers/WAHotUpdate.h</key>
- <data>
- Qz7AV+xZ2ALKCTgT0LwcA3Qk3zk=
- </data>
<key>Headers/WAHupProxy.h</key>
<data>
Pf4DNml5wZ0d42R4tr0cUQ0GrE8=
</data>
- <key>Headers/WAIAppWall.h</key>
+ <key>Headers/WAIApw.h</key>
<data>
- RsOfbNQyPjHI05/SNdYH85dI1CI=
+ msm+3jD6C0mflQBEZ4CZgAsu244=
+ </data>
+ <key>Headers/WAIHup.h</key>
+ <data>
+ cn9+8dqWbuOhGxn3O6A+r+cvdjQ=
</data>
<key>Headers/WAIPay.h</key>
<data>
@@ -128,17 +128,21 @@
<data>
wV3Olv9z3tBJntMHqGU3PMljKDI=
</data>
+ <key>Headers/WAParamConfigObj.h</key>
+ <data>
+ rYcGmIpoDQUA0hXomPYM/eOBKSg=
+ </data>
<key>Headers/WAPayChannel.h</key>
<data>
GGmMq0N+Ph/nQo87qL7GojBVKXk=
</data>
<key>Headers/WAPayProxy.h</key>
<data>
- KynhztMZcNR/wi2nS7+PFa8UlqI=
+ mZdaV1hFWYIp01QPPoBNN5JAiX8=
</data>
<key>Headers/WASdkIntf.h</key>
<data>
- 5ZOk94SO/DGzTqN/9s50j8EBBoI=
+ JdOnrUSqD+w8RIQLZK6m4nO02H4=
</data>
<key>Headers/WAShareLinkContent.h</key>
<data>
@@ -174,7 +178,7 @@
</data>
<key>Headers/WAUpdateInfo.h</key>
<data>
- OZKNhkhoWzJ+BzXAwJ/9RN4w+lM=
+ sB7fDiuqcxTPxjHQNRcwjerWPTo=
</data>
<key>Headers/WAUserProxy.h</key>
<data>
@@ -294,33 +298,33 @@
<dict>
<key>hash</key>
<data>
- WDmenmv/VRToA416MNUaG152NCE=
+ rGxCj6IXjjhS+MimxprY7WF2qCs=
</data>
<key>hash2</key>
<data>
- cFF54Qi81lkFvc+Qaskl9d5l/+3azFYzVJk9gPI/ZRg=
+ a4zov0niNF1BASjtJtQ3faKj/2n7McYNN3MJPm7HV50=
</data>
</dict>
<key>Headers/WACore.h</key>
<dict>
<key>hash</key>
<data>
- kxjkBwOjl+iJdtHpoC8sRSeklz4=
+ h+WBWDVPZdn5bjm7oUa9I2T/mco=
</data>
<key>hash2</key>
<data>
- eHwK328oCkAyepFk5nmn2ow/47/0geOrdJzyyAxMu6Q=
+ pEWvBqGb7u0dtJCNfNY1dzecCSDxtAjkxPbG3w0mlRE=
</data>
</dict>
<key>Headers/WACoreProxy.h</key>
<dict>
<key>hash</key>
<data>
- Kl5Pr28Td7eTaWXs3E18Z0Tyvp8=
+ 6l72fcEeFTizQ8nPfpFXP41/rZk=
</data>
<key>hash2</key>
<data>
- HSoKcNSMJsT+QHvSq2opjomT3nBBhHqYI9URhTwtS9A=
+ rS3Qif5j+JEjRlSH5+vXm9cLcAkjE8KWr8mh9JCcrWo=
</data>
</dict>
<key>Headers/WAError.h</key>
@@ -422,17 +426,6 @@
TxfatqTG2Ddk2VdHaPZOr+beD7eHeKIYaxHlvfhW+RE=
</data>
</dict>
- <key>Headers/WAHotUpdate.h</key>
- <dict>
- <key>hash</key>
- <data>
- Qz7AV+xZ2ALKCTgT0LwcA3Qk3zk=
- </data>
- <key>hash2</key>
- <data>
- Bkxpf8ju3GRgCAcRaEqb4sEliE7FZKCxa2btWMRa6lE=
- </data>
- </dict>
<key>Headers/WAHupProxy.h</key>
<dict>
<key>hash</key>
@@ -444,15 +437,26 @@
qB7NoiFClA7wrn6ROmE1HRX4Ke/dfORVFGINdkCZzx4=
</data>
</dict>
- <key>Headers/WAIAppWall.h</key>
+ <key>Headers/WAIApw.h</key>
<dict>
<key>hash</key>
<data>
- RsOfbNQyPjHI05/SNdYH85dI1CI=
+ msm+3jD6C0mflQBEZ4CZgAsu244=
</data>
<key>hash2</key>
<data>
- 8SWiI09XhQJjByHaqJ4ZLKoP+CuSiktESCyj7eNQ2uc=
+ Bai/VitDGlzmeKLXb+OsV6ZbjqpAXFnpzxv4CLj7uhA=
+ </data>
+ </dict>
+ <key>Headers/WAIHup.h</key>
+ <dict>
+ <key>hash</key>
+ <data>
+ cn9+8dqWbuOhGxn3O6A+r+cvdjQ=
+ </data>
+ <key>hash2</key>
+ <data>
+ pAd3dNQavcnMaaYcVJsYCeNxHnjwCHmSG0dtEpP9pdo=
</data>
</dict>
<key>Headers/WAIPay.h</key>
@@ -532,6 +536,17 @@
1VeGc3rkkOsF2jAWKZ7nOzpIynq1HkW22gGl1TE/m8M=
</data>
</dict>
+ <key>Headers/WAParamConfigObj.h</key>
+ <dict>
+ <key>hash</key>
+ <data>
+ rYcGmIpoDQUA0hXomPYM/eOBKSg=
+ </data>
+ <key>hash2</key>
+ <data>
+ MNjAgDnMiYTn3/mt4hSlaXJHeqVHBGNT2/Q7GB5T+BY=
+ </data>
+ </dict>
<key>Headers/WAPayChannel.h</key>
<dict>
<key>hash</key>
@@ -547,22 +562,22 @@
<dict>
<key>hash</key>
<data>
- KynhztMZcNR/wi2nS7+PFa8UlqI=
+ mZdaV1hFWYIp01QPPoBNN5JAiX8=
</data>
<key>hash2</key>
<data>
- vph3lJumAH9HYbIhzXK4qcoVtLfRh/yQ7LZWRasJRw0=
+ Ka5CH63en6BG9XPGetkorjU34kHt48i8vj4TN+x+BVU=
</data>
</dict>
<key>Headers/WASdkIntf.h</key>
<dict>
<key>hash</key>
<data>
- 5ZOk94SO/DGzTqN/9s50j8EBBoI=
+ JdOnrUSqD+w8RIQLZK6m4nO02H4=
</data>
<key>hash2</key>
<data>
- q7Djk8tyXpViqDv5XBTnltf9+rlDjRyiCQbBiIclydI=
+ PowD2bUqVPWQE6MithVQh2QX0blTlgCjQli4t35UUJA=
</data>
</dict>
<key>Headers/WAShareLinkContent.h</key>
@@ -657,11 +672,11 @@
<dict>
<key>hash</key>
<data>
- OZKNhkhoWzJ+BzXAwJ/9RN4w+lM=
+ sB7fDiuqcxTPxjHQNRcwjerWPTo=
</data>
<key>hash2</key>
<data>
- zbGxUaMuDkjslzjk9E4y8ETOQ1zeUnDaQWEF4fT+Vsc=
+ zDFRlgOTDJCm0cT/1eXT+qEsyXvPpak9MqPTTqV7f3A=
</data>
</dict>
<key>Headers/WAUserProxy.h</key>
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
index e5f7e76..890b91f 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
Binary files differ
--
Gitblit v1.8.0